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: 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 +++
 1 file changed, 3 insertions(+)

(limited to 'main.c')

diff --git a/main.c b/main.c
index 7f745490..458d4702 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;
-- 
cgit v1.2.3