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 /miscutils | |
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 'miscutils')
-rw-r--r-- | miscutils/devfsd.c | 2 | ||||
-rw-r--r-- | miscutils/setsid.c | 2 | ||||
-rw-r--r-- | miscutils/taskset.c | 2 | ||||
-rw-r--r-- | miscutils/time.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 69c698781..96c172cb8 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
@@ -378,7 +378,7 @@ static void fork_and_execute(int die, char *arg0, char **arg ) | |||
378 | /* Child : if arg0 != NULL do execvp */ | 378 | /* Child : if arg0 != NULL do execvp */ |
379 | if(arg0 != NULL ) | 379 | if(arg0 != NULL ) |
380 | { | 380 | { |
381 | execvp (arg0, arg); | 381 | BB_EXECVP(arg0, arg); |
382 | msg_logger_and_die(LOG_ERR, "execvp"); | 382 | msg_logger_and_die(LOG_ERR, "execvp"); |
383 | } | 383 | } |
384 | } | 384 | } |
diff --git a/miscutils/setsid.c b/miscutils/setsid.c index b4d5ced46..6db07be5f 100644 --- a/miscutils/setsid.c +++ b/miscutils/setsid.c | |||
@@ -36,7 +36,7 @@ int setsid_main(int argc, char *argv[]) | |||
36 | 36 | ||
37 | setsid(); /* no error possible */ | 37 | setsid(); /* no error possible */ |
38 | 38 | ||
39 | execvp(argv[1], argv + 1); | 39 | BB_EXECVP(argv[1], argv + 1); |
40 | 40 | ||
41 | bb_perror_msg_and_die("%s", argv[1]); | 41 | bb_perror_msg_and_die("%s", argv[1]); |
42 | } | 42 | } |
diff --git a/miscutils/taskset.c b/miscutils/taskset.c index cf6a8be99..b3bf4902e 100644 --- a/miscutils/taskset.c +++ b/miscutils/taskset.c | |||
@@ -91,7 +91,7 @@ int taskset_main(int argc, char** argv) | |||
91 | goto print_aff; | 91 | goto print_aff; |
92 | } | 92 | } |
93 | ++argv; | 93 | ++argv; |
94 | execvp(*argv, argv); | 94 | BB_EXECVP(*argv, argv); |
95 | bb_perror_msg_and_die("%s", *argv); | 95 | bb_perror_msg_and_die("%s", *argv); |
96 | } | 96 | } |
97 | #undef OPT_p | 97 | #undef OPT_p |
diff --git a/miscutils/time.c b/miscutils/time.c index 56f1d4ab8..a45919502 100644 --- a/miscutils/time.c +++ b/miscutils/time.c | |||
@@ -410,7 +410,7 @@ static void run_command(char *const *cmd, resource_t * resp) | |||
410 | else if (pid == 0) { /* If child. */ | 410 | else if (pid == 0) { /* If child. */ |
411 | /* Don't cast execvp arguments; that causes errors on some systems, | 411 | /* Don't cast execvp arguments; that causes errors on some systems, |
412 | versus merely warnings if the cast is left off. */ | 412 | versus merely warnings if the cast is left off. */ |
413 | execvp(cmd[0], cmd); | 413 | BB_EXECVP(cmd[0], cmd); |
414 | bb_error_msg("cannot run %s", cmd[0]); | 414 | bb_error_msg("cannot run %s", cmd[0]); |
415 | _exit(errno == ENOENT ? 127 : 126); | 415 | _exit(errno == ENOENT ? 127 : 126); |
416 | } | 416 | } |