From c0045207a7cd3bc11aace920d895c69b027c16af Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sat, 7 Feb 2015 16:17:44 -0600
Subject: [PATCH] Make toy_exec() check if argc is in optargs and deal with it
 there so we don't need a separate xexec_optargs().

---
 main.c                    | 3 +++
 toys/other/chroot.c       | 2 +-
 toys/other/netcat.c       | 2 +-
 toys/other/nsenter.c      | 2 +-
 toys/other/setsid.c       | 2 +-
 toys/other/taskset.c      | 2 +-
 toys/other/timeout.c      | 2 +-
 toys/pending/bootchartd.c | 2 +-
 toys/pending/tcpsvd.c     | 2 +-
 toys/posix/nice.c         | 2 +-
 toys/posix/nohup.c        | 2 +-
 toys/posix/time.c         | 2 +-
 12 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/main.c b/main.c
index 7f74549..458d470 100644
--- a/main.c
+++ b/main.c
@@ -127,6 +127,9 @@ void toy_exec(char *argv[])
 {
   struct toy_list *which;
 
+  // don't blank old optargs if our new argc lives in the old optargs.
+  if (argv>=toys.optargs && argv<=toys.optargs+toys.optc) toys.optargs = 0;
+
   // Return if we can't find it, or need to re-exec to acquire root,
   // or if stack depth is getting silly.
   if (!(which = toy_find(argv[0]))) return;
diff --git a/toys/other/chroot.c b/toys/other/chroot.c
index 00fb4e7..e82dd80 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 616822b..d27aa88 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 d53de41..8f548bf 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 8f0a064..59a1d78 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 bcc0347..2b067d4 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 f8acabf..3824376 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;
 
diff --git a/toys/pending/bootchartd.c b/toys/pending/bootchartd.c
index b29d4f0..d903405 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 585ae73..16110e5 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.
diff --git a/toys/posix/nice.c b/toys/posix/nice.c
index bc25d35..4b587ee 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_optargs(0);
+  xexec(toys.optargs);
 }
diff --git a/toys/posix/nohup.c b/toys/posix/nohup.c
index df264da..658ab93 100644
--- a/toys/posix/nohup.c
+++ b/toys/posix/nohup.c
@@ -38,5 +38,5 @@ void nohup_main(void)
     close(0);
     open("/dev/null", O_RDONLY);
   }
-  xexec_optargs(0);
+  xexec(toys.optargs);
 }
diff --git a/toys/posix/time.c b/toys/posix/time.c
index 0159205..01da971 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 = xfork())) xexec_optargs(0);
+  if (!(pid = xfork())) xexec(toys.optargs);
   else {
     int stat;
     struct rusage ru;
-- 
2.7.4