aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-10 23:32:37 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-10 23:32:37 +0000
commitcffcf1f5d26d0b01fcdbd03d179576e8dc06d68f (patch)
tree6b2f3cabea3c78a1f13a1beb30074881f643707d /libbb
parentaf0dfd1b9fbb1ba8ccba9f220018e6819180149e (diff)
downloadbusybox-w32-cffcf1f5d26d0b01fcdbd03d179576e8dc06d68f.tar.gz
busybox-w32-cffcf1f5d26d0b01fcdbd03d179576e8dc06d68f.tar.bz2
busybox-w32-cffcf1f5d26d0b01fcdbd03d179576e8dc06d68f.zip
random NOMMU fixes. compressed --help really does work for NOMMU! /me happy
git-svn-id: svn://busybox.net/trunk/busybox@18395 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb')
-rw-r--r--libbb/vfork_daemon_rexec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 214b645c5..64952225d 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -158,12 +158,15 @@ int spawn_and_wait(char **argv)
158 if (rc) 158 if (rc)
159 goto w; 159 goto w;
160 /* child */ 160 /* child */
161 xfunc_error_retval = EXIT_FAILURE;
161 current_applet = a; 162 current_applet = a;
162 run_current_applet_and_exit(argc, argv); 163 run_current_applet_and_exit(argc, argv);
163#endif 164#endif
164 } 165 }
165 rc = spawn(argv); 166 rc = spawn(argv);
167#ifndef BB_NOMMU
166 w: 168 w:
169#endif
167 return wait4pid(rc); 170 return wait4pid(rc);
168#else /* !FEATURE_PREFER_APPLETS */ 171#else /* !FEATURE_PREFER_APPLETS */
169 return wait4pid(spawn(argv)); 172 return wait4pid(spawn(argv));