diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-02-06 01:20:12 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-02-06 01:20:12 +0000 |
| commit | 1d76f439da81d3a05f0e0fdde3f81ec56fb20836 (patch) | |
| tree | f3e2e2185d092f87843fe4bbc9d1098185a5bdbd /coreutils | |
| parent | cc24419e98853aede7c652edb3c1c79a9865bdda (diff) | |
| download | busybox-w32-1d76f439da81d3a05f0e0fdde3f81ec56fb20836.tar.gz busybox-w32-1d76f439da81d3a05f0e0fdde3f81ec56fb20836.tar.bz2 busybox-w32-1d76f439da81d3a05f0e0fdde3f81ec56fb20836.zip | |
EXEC_PREFER_APPLETS support by Gabriel L. Somlo <somlo@cmu.edu>
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/chroot.c | 2 | ||||
| -rw-r--r-- | coreutils/env.c | 2 | ||||
| -rw-r--r-- | coreutils/install.c | 2 | ||||
| -rw-r--r-- | coreutils/nice.c | 2 | ||||
| -rw-r--r-- | coreutils/nohup.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/coreutils/chroot.c b/coreutils/chroot.c index 16c743fef..fcd70f21a 100644 --- a/coreutils/chroot.c +++ b/coreutils/chroot.c | |||
| @@ -33,6 +33,6 @@ int chroot_main(int argc, char **argv) | |||
| 33 | argv[1] = (char *) "-i"; | 33 | argv[1] = (char *) "-i"; |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | execvp(*argv, argv); | 36 | BB_EXECVP(*argv, argv); |
| 37 | bb_perror_msg_and_die("cannot execute %s", *argv); | 37 | bb_perror_msg_and_die("cannot execute %s", *argv); |
| 38 | } | 38 | } |
diff --git a/coreutils/env.c b/coreutils/env.c index 04279f3e0..7be0c63a5 100644 --- a/coreutils/env.c +++ b/coreutils/env.c | |||
| @@ -81,7 +81,7 @@ int env_main(int argc, char** argv) | |||
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | if (*argv) { | 83 | if (*argv) { |
| 84 | execvp(*argv, argv); | 84 | BB_EXECVP(*argv, argv); |
| 85 | /* SUSv3-mandated exit codes. */ | 85 | /* SUSv3-mandated exit codes. */ |
| 86 | xfunc_error_retval = (errno == ENOENT) ? 127 : 126; | 86 | xfunc_error_retval = (errno == ENOENT) ? 127 : 126; |
| 87 | bb_perror_msg_and_die("%s", *argv); | 87 | bb_perror_msg_and_die("%s", *argv); |
diff --git a/coreutils/install.c b/coreutils/install.c index dd73fb693..c105addc5 100644 --- a/coreutils/install.c +++ b/coreutils/install.c | |||
| @@ -126,7 +126,7 @@ int install_main(int argc, char **argv) | |||
| 126 | ret = EXIT_FAILURE; | 126 | ret = EXIT_FAILURE; |
| 127 | } | 127 | } |
| 128 | if (flags & OPT_STRIP) { | 128 | if (flags & OPT_STRIP) { |
| 129 | if (execlp("strip", "strip", dest, NULL) == -1) { | 129 | if (BB_EXECLP("strip", "strip", dest, NULL) == -1) { |
| 130 | bb_perror_msg("strip"); | 130 | bb_perror_msg("strip"); |
| 131 | ret = EXIT_FAILURE; | 131 | ret = EXIT_FAILURE; |
| 132 | } | 132 | } |
diff --git a/coreutils/nice.c b/coreutils/nice.c index b7bff6a52..328531528 100644 --- a/coreutils/nice.c +++ b/coreutils/nice.c | |||
| @@ -47,7 +47,7 @@ int nice_main(int argc, char **argv) | |||
| 47 | } | 47 | } |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | execvp(*argv, argv); /* Now exec the desired program. */ | 50 | BB_EXECVP(*argv, argv); /* Now exec the desired program. */ |
| 51 | 51 | ||
| 52 | /* The exec failed... */ | 52 | /* The exec failed... */ |
| 53 | xfunc_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */ | 53 | xfunc_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */ |
diff --git a/coreutils/nohup.c b/coreutils/nohup.c index a9944b7f4..6a6c70e13 100644 --- a/coreutils/nohup.c +++ b/coreutils/nohup.c | |||
| @@ -53,7 +53,7 @@ int nohup_main(int argc, char **argv) | |||
| 53 | close(nullfd); | 53 | close(nullfd); |
| 54 | signal(SIGHUP, SIG_IGN); | 54 | signal(SIGHUP, SIG_IGN); |
| 55 | 55 | ||
| 56 | execvp(argv[1], argv+1); | 56 | BB_EXECVP(argv[1], argv+1); |
| 57 | if (ENABLE_FEATURE_CLEAN_UP && home) | 57 | if (ENABLE_FEATURE_CLEAN_UP && home) |
| 58 | free((char*)nohupout); | 58 | free((char*)nohupout); |
| 59 | bb_perror_msg_and_die("%s", argv[1]); | 59 | bb_perror_msg_and_die("%s", argv[1]); |