diff options
Diffstat (limited to 'toys/other')
-rw-r--r-- | toys/other/chroot.c | 2 | ||||
-rw-r--r-- | toys/other/netcat.c | 2 | ||||
-rw-r--r-- | toys/other/nsenter.c | 2 | ||||
-rw-r--r-- | toys/other/setsid.c | 2 | ||||
-rw-r--r-- | toys/other/taskset.c | 2 | ||||
-rw-r--r-- | toys/other/timeout.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/toys/other/chroot.c b/toys/other/chroot.c index 00fb4e7f..e82dd803 100644 --- a/toys/other/chroot.c +++ b/toys/other/chroot.c @@ -20,6 +20,6 @@ void chroot_main(void) char *binsh[] = {"/bin/sh", "-i", 0}; if (chdir(*toys.optargs) || chroot(".")) perror_exit("%s", *toys.optargs); - if (toys.optargs[1]) xexec_optargs(1); + if (toys.optargs[1]) xexec(toys.optargs+1); else xexec(binsh); } diff --git a/toys/other/netcat.c b/toys/other/netcat.c index 616822b7..d27aa885 100644 --- a/toys/other/netcat.c +++ b/toys/other/netcat.c @@ -185,7 +185,7 @@ void netcat_main(void) set_alarm(0); if (CFG_NETCAT_LISTEN && (toys.optflags&(FLAG_L|FLAG_l) && toys.optc)) - xexec_optargs(0); + xexec(toys.optargs); // Poll loop copying stdin->socket and socket->stdout. for (;;) { diff --git a/toys/other/nsenter.c b/toys/other/nsenter.c index d53de41e..8f548bf0 100644 --- a/toys/other/nsenter.c +++ b/toys/other/nsenter.c @@ -112,5 +112,5 @@ void unshare_main(void) } } - xexec_optargs(0); + xexec(toys.optargs); } diff --git a/toys/other/setsid.c b/toys/other/setsid.c index 8f0a0647..59a1d78f 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_optargs(0); + xexec(toys.optargs); } diff --git a/toys/other/taskset.c b/toys/other/taskset.c index bcc03478..2b067d4a 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_optargs(1); + xexec(toys.optargs+1); } else { char *c; pid_t pid = strtol(toys.optargs[toys.optc-1], &c, 10); diff --git a/toys/other/timeout.c b/toys/other/timeout.c index f8acabf5..3824376a 100644 --- a/toys/other/timeout.c +++ b/toys/other/timeout.c @@ -60,7 +60,7 @@ void timeout_main(void) if (TT.s_signal && -1 == (TT.nextsig = sig_to_num(TT.s_signal))) error_exit("bad -s: '%s'", TT.s_signal); - if (!(TT.pid = xfork())) xexec_optargs(1); + if (!(TT.pid = xfork())) xexec(toys.optargs+1); else { int status; |