diff options
| -rw-r--r-- | toys/other/chroot.c | 4 | ||||
| -rw-r--r-- | toys/other/netcat.c | 2 | ||||
| -rw-r--r-- | toys/other/setsid.c | 2 | ||||
| -rw-r--r-- | toys/other/taskset.c | 2 | ||||
| -rw-r--r-- | toys/other/unshare.c | 2 | ||||
| -rw-r--r-- | toys/pending/klogd.c | 2 | ||||
| -rw-r--r-- | toys/posix/nice.c | 2 | ||||
| -rw-r--r-- | toys/posix/nohup.c | 2 | ||||
| -rw-r--r-- | toys/posix/time.c | 2 |
9 files changed, 11 insertions, 9 deletions
diff --git a/toys/other/chroot.c b/toys/other/chroot.c index c9ff10c7..00fb4e7f 100644 --- a/toys/other/chroot.c +++ b/toys/other/chroot.c @@ -18,6 +18,8 @@ config CHROOT void chroot_main(void) { char *binsh[] = {"/bin/sh", "-i", 0}; + if (chdir(*toys.optargs) || chroot(".")) perror_exit("%s", *toys.optargs); - xexec(toys.optargs[1] ? toys.optargs+1 : binsh); + if (toys.optargs[1]) xexec_optargs(1); + else xexec(binsh); } diff --git a/toys/other/netcat.c b/toys/other/netcat.c index a245d119..e41fc4b2 100644 --- a/toys/other/netcat.c +++ b/toys/other/netcat.c @@ -187,7 +187,7 @@ void netcat_main(void) set_alarm(0); if (CFG_NETCAT_LISTEN && (toys.optflags&(FLAG_L|FLAG_l) && toys.optc)) - xexec(toys.optargs); + xexec_optargs(0); // Poll loop copying stdin->socket and socket->stdout. for (;;) { diff --git a/toys/other/setsid.c b/toys/other/setsid.c index 59a1d78f..8f0a0647 100644 --- a/toys/other/setsid.c +++ b/toys/other/setsid.c @@ -24,5 +24,5 @@ void setsid_main(void) setpgid(0,0); tcsetpgrp(0, getpid()); } - xexec(toys.optargs); + xexec_optargs(0); } diff --git a/toys/other/taskset.c b/toys/other/taskset.c index 2b067d4a..bcc03478 100644 --- a/toys/other/taskset.c +++ b/toys/other/taskset.c @@ -90,7 +90,7 @@ void taskset_main(void) if (!(toys.optflags & FLAG_p)) { if (toys.optc < 2) error_exit("Needs 2 args"); do_taskset(getpid(), 1); - xexec(toys.optargs+1); + xexec_optargs(1); } else { char *c; pid_t pid = strtol(toys.optargs[toys.optc-1], &c, 10); diff --git a/toys/other/unshare.c b/toys/other/unshare.c index 9a938186..87db6039 100644 --- a/toys/other/unshare.c +++ b/toys/other/unshare.c @@ -35,5 +35,5 @@ void unshare_main(void) if(unshare(f)) perror_exit("failed"); - xexec(toys.optargs); + xexec_optargs(0); } diff --git a/toys/pending/klogd.c b/toys/pending/klogd.c index 2fa36820..403677c3 100644 --- a/toys/pending/klogd.c +++ b/toys/pending/klogd.c @@ -23,7 +23,7 @@ config KLOGD_SOURCE_RING_BUFFER #define FOR_klogd #include "toys.h" -#include <signal.h> + GLOBALS( long level; int fd; diff --git a/toys/posix/nice.c b/toys/posix/nice.c index 4b587ee6..bc25d358 100644 --- a/toys/posix/nice.c +++ b/toys/posix/nice.c @@ -34,5 +34,5 @@ void nice_main(void) errno = 0; if (nice(TT.priority)==-1 && errno) perror_exit("Can't set priority"); - xexec(toys.optargs); + xexec_optargs(0); } diff --git a/toys/posix/nohup.c b/toys/posix/nohup.c index b936a093..e4354554 100644 --- a/toys/posix/nohup.c +++ b/toys/posix/nohup.c @@ -36,5 +36,5 @@ void nohup_main(void) close(0); open("/dev/null", O_RDONLY); } - xexec(toys.optargs); + xexec_optargs(0); } diff --git a/toys/posix/time.c b/toys/posix/time.c index 0ccba19c..2648cd1c 100644 --- a/toys/posix/time.c +++ b/toys/posix/time.c @@ -27,7 +27,7 @@ void time_main(void) struct timeval tv, tv2; gettimeofday(&tv, NULL); - if (!(pid = fork())) xexec(toys.optargs); + if (!(pid = fork())) xexec_optargs(0); else { int stat; struct rusage ru; |