diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-04-12 17:59:24 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-04-12 17:59:24 +0000 |
commit | e3efc9230c2f192e2738cee733c6d4fa20a2be2a (patch) | |
tree | 4f31c690a602713220868b2d6f98bf4aaf53eeed /shell/hush.c | |
parent | a08345598d7c6d428db30cdcf8e5e7d317362da0 (diff) | |
download | busybox-w32-e3efc9230c2f192e2738cee733c6d4fa20a2be2a.tar.gz busybox-w32-e3efc9230c2f192e2738cee733c6d4fa20a2be2a.tar.bz2 busybox-w32-e3efc9230c2f192e2738cee733c6d4fa20a2be2a.zip |
Jamie Guinan writes:
It looks like latest uClibc defines ARCH_HAS_MMU, but a few busybox files
test UCLIBC_HAS_MMU, resulting in vfork() getting called instead of
fork(), etc.
Patch below. Only tested for lash.
Cheers,
-Jamie
Diffstat (limited to 'shell/hush.c')
-rw-r--r-- | shell/hush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c index ad5ddf0d5..8f4cc9780 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -1439,7 +1439,7 @@ static int run_pipe_real(struct pipe *pi) | |||
1439 | } | 1439 | } |
1440 | 1440 | ||
1441 | /* XXX test for failed fork()? */ | 1441 | /* XXX test for failed fork()? */ |
1442 | #if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__) | 1442 | #if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__) |
1443 | if (!(child->pid = fork())) | 1443 | if (!(child->pid = fork())) |
1444 | #else | 1444 | #else |
1445 | if (!(child->pid = vfork())) | 1445 | if (!(child->pid = vfork())) |
@@ -2258,7 +2258,7 @@ FILE *generate_stream_from_list(struct pipe *head) | |||
2258 | #if 1 | 2258 | #if 1 |
2259 | int pid, channel[2]; | 2259 | int pid, channel[2]; |
2260 | if (pipe(channel)<0) bb_perror_msg_and_die("pipe"); | 2260 | if (pipe(channel)<0) bb_perror_msg_and_die("pipe"); |
2261 | #if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__) | 2261 | #if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__) |
2262 | pid=fork(); | 2262 | pid=fork(); |
2263 | #else | 2263 | #else |
2264 | pid=vfork(); | 2264 | pid=vfork(); |