emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hush: fix this case: echo "SCRIPT" | hush

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-12-25 19:01:49 +01:00
parent 46a71dc30c
commit 1237d627e9
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/ash_test/ash-misc/piped_input.right Normal file
View File

@ -0,0 +1,2 @@
TEST
One:1

3
shell/ash_test/ash-misc/piped_input.tests Executable file
View File

@ -0,0 +1,3 @@
exed 2>&1
echo 'echo TEST; false' | $THIS_SH
echo One:$?

6
shell/hush.c
View File

@ -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,

2
shell/hush_test/hush-misc/piped_input.right Normal file
View File

@ -0,0 +1,2 @@
TEST
One:1

3
shell/hush_test/hush-misc/piped_input.tests Executable file
View File

@ -0,0 +1,3 @@
exed 2>&1
echo 'echo TEST; false' | $THIS_SH
echo One:$?