summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenis Vlasenko2007-06-13 06:47:47 +0000
committerDenis Vlasenko2007-06-13 06:47:47 +0000
commitd67cef2425fb5e75b75d52d9a308da6d29cd7a0d (patch)
tree5d034f518dfae9a933a701e8c42da4acbf0cb42d /shell
parentf5f75c5e82d47613847c356664e47c4be69e73aa (diff)
downloadbusybox-d67cef2425fb5e75b75d52d9a308da6d29cd7a0d.zip
busybox-d67cef2425fb5e75b75d52d9a308da6d29cd7a0d.tar.gz
hush: fix read builtin to not read ahead past eol and to not use
insane amounts of stack. Testsuite updated.
Diffstat (limited to 'shell')
-rw-r--r--shell/README3
-rw-r--r--shell/ash.c4
-rw-r--r--shell/hush.c16
-rw-r--r--shell/hush_test/hush-misc/read.right4
-rwxr-xr-xshell/hush_test/hush-misc/read.tests4
5 files changed, 16 insertions, 15 deletions
diff --git a/shell/README b/shell/README
index a09353d..b86f96c 100644
--- a/shell/README
+++ b/shell/README
@@ -1,5 +1,8 @@
Various bits of what is known about busybox shells, in no particular order.
+2007-06-13
+hush: exec <"$1" doesn't do parameter subst
+
2007-05-24
hush: environment-related memory leak plugged, with net code size
decrease.
diff --git a/shell/ash.c b/shell/ash.c
index ae078e6..173beb1 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -11567,8 +11567,8 @@ readcmd(int argc, char **argv)
#endif
#if ENABLE_ASH_READ_TIMEOUT
if (ts.tv_sec || ts.tv_usec) {
- FD_ZERO (&set);
- FD_SET (0, &set);
+ FD_ZERO(&set);
+ FD_SET(0, &set);
i = select(FD_SETSIZE, &set, NULL, NULL, &ts);
if (!i) {
diff --git a/shell/hush.c b/shell/hush.c
index 40bcafd..e6fa3d9 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -942,21 +942,11 @@ static int builtin_pwd(char **argv ATTRIBUTE_UNUSED)
/* built-in 'read VAR' handler */
static int builtin_read(char **argv)
{
- char string[BUFSIZ];
- char *p;
+ char *string;
const char *name = argv[1] ? argv[1] : "REPLY";
- int name_len = strlen(name);
- if (name_len >= sizeof(string) - 2)
- return EXIT_FAILURE;
- strcpy(string, name);
- p = string + name_len;
- *p++ = '=';
- *p = '\0'; /* In case stdin has only EOF */
- /* read string. name_len+1 chars are already used by 'name=' */
- fgets(p, sizeof(string) - 1 - name_len, stdin);
- chomp(p);
- return set_local_var(xstrdup(string), 0);
+ string = xmalloc_reads(STDIN_FILENO, xasprintf("%s=", name));
+ return set_local_var(string, 0);
}
/* built-in 'set [VAR=value]' handler */
diff --git a/shell/hush_test/hush-misc/read.right b/shell/hush_test/hush-misc/read.right
new file mode 100644
index 0000000..0e50e2a
--- /dev/null
+++ b/shell/hush_test/hush-misc/read.right
@@ -0,0 +1,4 @@
+read
+cat
+echo "REPLY=$REPLY"
+REPLY=exec <read.tests
diff --git a/shell/hush_test/hush-misc/read.tests b/shell/hush_test/hush-misc/read.tests
new file mode 100755
index 0000000..ff1acbd
--- /dev/null
+++ b/shell/hush_test/hush-misc/read.tests
@@ -0,0 +1,4 @@
+exec <read.tests
+read
+cat
+echo "REPLY=$REPLY"