diff options
| author | Rob Landley <rob@landley.net> | 2015-02-07 16:17:44 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2015-02-07 16:17:44 -0600 |
| commit | c0045207a7cd3bc11aace920d895c69b027c16af (patch) | |
| tree | 5cee9d0fc3013c62800c0402f52f6f8cac9405cd /toys/pending | |
| parent | a48cfba9520a8ad9bf1308dcbac3fc6ee23894ba (diff) | |
| download | toybox-c0045207a7cd3bc11aace920d895c69b027c16af.tar.gz | |
Make toy_exec() check if argc is in optargs and deal with it there so we don't need a separate xexec_optargs().
Diffstat (limited to 'toys/pending')
| -rw-r--r-- | toys/pending/bootchartd.c | 2 | ||||
| -rw-r--r-- | toys/pending/tcpsvd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/toys/pending/bootchartd.c b/toys/pending/bootchartd.c index b29d4f05..d903405f 100644 --- a/toys/pending/bootchartd.c +++ b/toys/pending/bootchartd.c @@ -309,7 +309,7 @@ void bootchartd_main() if (bchartd_opt == 1 && toys.optargs[1]) { pid_t prog_pid; - if (!(prog_pid = xfork())) xexec_optargs(1); + if (!(prog_pid = xfork())) xexec(toys.optargs+1); waitpid(prog_pid, NULL, 0); kill(lgr_pid, SIGUSR1); } diff --git a/toys/pending/tcpsvd.c b/toys/pending/tcpsvd.c index 585ae733..16110e53 100644 --- a/toys/pending/tcpsvd.c +++ b/toys/pending/tcpsvd.c @@ -392,7 +392,7 @@ void tcpsvd_main(void) close(1); dup2(newfd, 0); dup2(newfd, 1); - xexec_optargs(2); //skip IP PORT + xexec(toys.optargs+2); //skip IP PORT } else { insert(&pids, pid, addr); xclose(newfd); //close and reopen for next client. |