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 /runit | |
| 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 'runit')
| -rw-r--r-- | runit/chpst.c | 10 | ||||
| -rw-r--r-- | runit/runsvdir.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/runit/chpst.c b/runit/chpst.c index 053051d1d..7b907845f 100644 --- a/runit/chpst.c +++ b/runit/chpst.c | |||
| @@ -310,7 +310,7 @@ int chpst_main(int argc, char **argv) | |||
| 310 | if (OPT_nostdin) close(0); | 310 | if (OPT_nostdin) close(0); |
| 311 | if (OPT_nostdout) close(1); | 311 | if (OPT_nostdout) close(1); |
| 312 | if (OPT_nostderr) close(2); | 312 | if (OPT_nostderr) close(2); |
| 313 | execvp(argv[0], argv); | 313 | BB_EXECVP(argv[0], argv); |
| 314 | bb_perror_msg_and_die("exec %s", argv[0]); | 314 | bb_perror_msg_and_die("exec %s", argv[0]); |
| 315 | } | 315 | } |
| 316 | 316 | ||
| @@ -322,7 +322,7 @@ static void setuidgid(int argc, char **argv) | |||
| 322 | if (!account) bb_show_usage(); | 322 | if (!account) bb_show_usage(); |
| 323 | if (!*++argv) bb_show_usage(); | 323 | if (!*++argv) bb_show_usage(); |
| 324 | suidgid((char*)account); | 324 | suidgid((char*)account); |
| 325 | execvp(argv[0], argv); | 325 | BB_EXECVP(argv[0], argv); |
| 326 | bb_perror_msg_and_die("exec %s", argv[0]); | 326 | bb_perror_msg_and_die("exec %s", argv[0]); |
| 327 | } | 327 | } |
| 328 | 328 | ||
| @@ -334,7 +334,7 @@ static void envuidgid(int argc, char **argv) | |||
| 334 | if (!account) bb_show_usage(); | 334 | if (!account) bb_show_usage(); |
| 335 | if (!*++argv) bb_show_usage(); | 335 | if (!*++argv) bb_show_usage(); |
| 336 | euidgid((char*)account); | 336 | euidgid((char*)account); |
| 337 | execvp(argv[0], argv); | 337 | BB_EXECVP(argv[0], argv); |
| 338 | bb_perror_msg_and_die("exec %s", argv[0]); | 338 | bb_perror_msg_and_die("exec %s", argv[0]); |
| 339 | } | 339 | } |
| 340 | 340 | ||
| @@ -346,7 +346,7 @@ static void envdir(int argc, char **argv) | |||
| 346 | if (!dir) bb_show_usage(); | 346 | if (!dir) bb_show_usage(); |
| 347 | if (!*++argv) bb_show_usage(); | 347 | if (!*++argv) bb_show_usage(); |
| 348 | edir(dir); | 348 | edir(dir); |
| 349 | execvp(argv[0], argv); | 349 | BB_EXECVP(argv[0], argv); |
| 350 | bb_perror_msg_and_die("exec %s", argv[0]); | 350 | bb_perror_msg_and_die("exec %s", argv[0]); |
| 351 | } | 351 | } |
| 352 | 352 | ||
| @@ -369,6 +369,6 @@ static void softlimit(int argc, char **argv) | |||
| 369 | argv += optind; | 369 | argv += optind; |
| 370 | if (!argv[0]) bb_show_usage(); | 370 | if (!argv[0]) bb_show_usage(); |
| 371 | slimit(); | 371 | slimit(); |
| 372 | execvp(argv[0], argv); | 372 | BB_EXECVP(argv[0], argv); |
| 373 | bb_perror_msg_and_die("exec %s", argv[0]); | 373 | bb_perror_msg_and_die("exec %s", argv[0]); |
| 374 | } | 374 | } |
diff --git a/runit/runsvdir.c b/runit/runsvdir.c index d9053ad6a..2d2b5db31 100644 --- a/runit/runsvdir.c +++ b/runit/runsvdir.c | |||
| @@ -73,7 +73,7 @@ static void runsv(int no, const char *name) | |||
| 73 | sig_uncatch(SIGHUP); | 73 | sig_uncatch(SIGHUP); |
| 74 | sig_uncatch(SIGTERM); | 74 | sig_uncatch(SIGTERM); |
| 75 | if (pgrp) setsid(); | 75 | if (pgrp) setsid(); |
| 76 | execvp(prog[0], prog); | 76 | BB_EXECVP(prog[0], prog); |
| 77 | //pathexec_run(*prog, prog, (char* const*)environ); | 77 | //pathexec_run(*prog, prog, (char* const*)environ); |
| 78 | fatal2_cannot("start runsv ", name); | 78 | fatal2_cannot("start runsv ", name); |
| 79 | } | 79 | } |