diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-02-02 03:28:56 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-02-02 03:28:56 +0100 |
commit | c71b469f5daceb717e31cc9ce46b0e058e2c57b6 (patch) | |
tree | ab428529615091f3d1759ad9fcd254f0cab46b19 /libbb/vfork_daemon_rexec.c | |
parent | 099e528919e2219772265e99ab8a43d188c1b8db (diff) | |
download | busybox-w32-c71b469f5daceb717e31cc9ce46b0e058e2c57b6.tar.gz busybox-w32-c71b469f5daceb717e31cc9ce46b0e058e2c57b6.tar.bz2 busybox-w32-c71b469f5daceb717e31cc9ce46b0e058e2c57b6.zip |
libbb: make BB_EXECVP/LP try to exec real binary if there's no /proc/self/exe
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb/vfork_daemon_rexec.c')
-rw-r--r-- | libbb/vfork_daemon_rexec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c index 5e0fb0d73..cb4781a59 100644 --- a/libbb/vfork_daemon_rexec.c +++ b/libbb/vfork_daemon_rexec.c | |||
@@ -182,17 +182,17 @@ int FAST_FUNC spawn_and_wait(char **argv) | |||
182 | int a = find_applet_by_name(argv[0]); | 182 | int a = find_applet_by_name(argv[0]); |
183 | 183 | ||
184 | if (a >= 0 && (APPLET_IS_NOFORK(a) | 184 | if (a >= 0 && (APPLET_IS_NOFORK(a) |
185 | #if BB_MMU | 185 | # if BB_MMU |
186 | || APPLET_IS_NOEXEC(a) /* NOEXEC trick needs fork() */ | 186 | || APPLET_IS_NOEXEC(a) /* NOEXEC trick needs fork() */ |
187 | #endif | 187 | # endif |
188 | )) { | 188 | )) { |
189 | #if BB_MMU | 189 | # if BB_MMU |
190 | if (APPLET_IS_NOFORK(a)) | 190 | if (APPLET_IS_NOFORK(a)) |
191 | #endif | 191 | # endif |
192 | { | 192 | { |
193 | return run_nofork_applet(a, argv); | 193 | return run_nofork_applet(a, argv); |
194 | } | 194 | } |
195 | #if BB_MMU | 195 | # if BB_MMU |
196 | /* MMU only */ | 196 | /* MMU only */ |
197 | /* a->noexec is true */ | 197 | /* a->noexec is true */ |
198 | rc = fork(); | 198 | rc = fork(); |
@@ -201,7 +201,7 @@ int FAST_FUNC spawn_and_wait(char **argv) | |||
201 | /* child */ | 201 | /* child */ |
202 | xfunc_error_retval = EXIT_FAILURE; | 202 | xfunc_error_retval = EXIT_FAILURE; |
203 | run_applet_no_and_exit(a, argv); | 203 | run_applet_no_and_exit(a, argv); |
204 | #endif | 204 | # endif |
205 | } | 205 | } |
206 | #endif /* FEATURE_PREFER_APPLETS */ | 206 | #endif /* FEATURE_PREFER_APPLETS */ |
207 | rc = spawn(argv); | 207 | rc = spawn(argv); |