diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-09 16:02:39 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-09 16:02:39 +0000 |
| commit | 3fe4f986a055d0bc942dcda0c2fea3ef68e341d7 (patch) | |
| tree | edb986f2879dd8c71d56b31114c84bec043d2197 /shell | |
| parent | 98a6f56d495698a31909afee0acf36f7c9f1d5ee (diff) | |
| download | busybox-w32-3fe4f986a055d0bc942dcda0c2fea3ef68e341d7.tar.gz busybox-w32-3fe4f986a055d0bc942dcda0c2fea3ef68e341d7.tar.bz2 busybox-w32-3fe4f986a055d0bc942dcda0c2fea3ef68e341d7.zip | |
less: fix a case when regexp matches ""
hush: remove wrong comment, expand another one
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/hush.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/shell/hush.c b/shell/hush.c index 9e574c90c..b80468f58 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
| @@ -3218,7 +3218,6 @@ static int redirect_opt_num(o_string *o) | |||
| 3218 | } | 3218 | } |
| 3219 | 3219 | ||
| 3220 | #if ENABLE_HUSH_TICK | 3220 | #if ENABLE_HUSH_TICK |
| 3221 | /* NB: currently disabled on NOMMU */ | ||
| 3222 | static FILE *generate_stream_from_list(struct pipe *head) | 3221 | static FILE *generate_stream_from_list(struct pipe *head) |
| 3223 | { | 3222 | { |
| 3224 | FILE *pf; | 3223 | FILE *pf; |
| @@ -3229,6 +3228,10 @@ static FILE *generate_stream_from_list(struct pipe *head) | |||
| 3229 | /* By using vfork here, we suspend parent till child exits or execs. | 3228 | /* By using vfork here, we suspend parent till child exits or execs. |
| 3230 | * If child will not do it before it fills the pipe, it can block forever | 3229 | * If child will not do it before it fills the pipe, it can block forever |
| 3231 | * in write(STDOUT_FILENO), and parent (shell) will be also stuck. | 3230 | * in write(STDOUT_FILENO), and parent (shell) will be also stuck. |
| 3231 | * Try this script: | ||
| 3232 | * yes "0123456789012345678901234567890" | dd bs=32 count=64k >TESTFILE | ||
| 3233 | * huge=`cat TESTFILE` # will block here forever | ||
| 3234 | * echo OK | ||
| 3232 | */ | 3235 | */ |
| 3233 | pid = BB_MMU ? fork() : vfork(); | 3236 | pid = BB_MMU ? fork() : vfork(); |
| 3234 | if (pid < 0) | 3237 | if (pid < 0) |
