aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2020-12-25 19:01:49 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2020-12-25 19:01:49 +0100
commit1237d627e9fd996cc3d96ba72629371739fef776 (patch)
treea287c1c117d5490be91fcd31f8e9643e5f2b1859
parent46a71dc30c62dde71d4e6714790b40187d378e82 (diff)
downloadbusybox-1237d627e9fd996cc3d96ba72629371739fef776.tar.gz
busybox-1237d627e9fd996cc3d96ba72629371739fef776.tar.bz2
hush: fix this case: echo "SCRIPT" | hush
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/ash_test/ash-misc/piped_input.right2
-rwxr-xr-xshell/ash_test/ash-misc/piped_input.tests3
-rw-r--r--shell/hush.c6
-rw-r--r--shell/hush_test/hush-misc/piped_input.right2
-rwxr-xr-xshell/hush_test/hush-misc/piped_input.tests3
5 files changed, 15 insertions, 1 deletions
diff --git a/shell/ash_test/ash-misc/piped_input.right b/shell/ash_test/ash-misc/piped_input.right
new file mode 100644
index 000000000..7b8bf6758
--- /dev/null
+++ b/shell/ash_test/ash-misc/piped_input.right
@@ -0,0 +1,2 @@
+TEST
+One:1
diff --git a/shell/ash_test/ash-misc/piped_input.tests b/shell/ash_test/ash-misc/piped_input.tests
new file mode 100755
index 000000000..ec7e49837
--- /dev/null
+++ b/shell/ash_test/ash-misc/piped_input.tests
@@ -0,0 +1,3 @@
+exed 2>&1
+echo 'echo TEST; false' | $THIS_SH
+echo One:$?
diff --git a/shell/hush.c b/shell/hush.c
index 3bdbe26d8..f9a295e8d 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7787,7 +7787,11 @@ static void restore_redirects(struct squirrel *sq)
free(sq);
}
if (G.HFILE_stdin
- && G.HFILE_stdin->fd != STDIN_FILENO
+ && G.HFILE_stdin->fd > STDIN_FILENO
+ /* we compare > STDIN, not == STDIN, since hfgetc()
+ * closes fd and sets ->fd to -1 if EOF is reached.
+ * Testcase: echo 'pwd' | hush
+ */
) {
/* Testcase: interactive "read r <FILE; echo $r; read r; echo $r".
* Redirect moves ->fd to e.g. 10,
diff --git a/shell/hush_test/hush-misc/piped_input.right b/shell/hush_test/hush-misc/piped_input.right
new file mode 100644
index 000000000..7b8bf6758
--- /dev/null
+++ b/shell/hush_test/hush-misc/piped_input.right
@@ -0,0 +1,2 @@
+TEST
+One:1
diff --git a/shell/hush_test/hush-misc/piped_input.tests b/shell/hush_test/hush-misc/piped_input.tests
new file mode 100755
index 000000000..ec7e49837
--- /dev/null
+++ b/shell/hush_test/hush-misc/piped_input.tests
@@ -0,0 +1,3 @@
+exed 2>&1
+echo 'echo TEST; false' | $THIS_SH
+echo One:$?