Only discard optargs in toy_exec() after finding the command to run (otherwise the fallback exevp() segfaults).

1 files changed, 3 insertions, 3 deletions

diff --git a/main.c b/main.c
index 458d4702..a81cfb92 100644
--- a/main.c
+++ b/main.c
@@ -127,15 +127,15 @@ 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;
   if (toys.recursion && (which->flags & TOYFLAG_ROOTONLY) && getuid()) return;
   if (toys.recursion++ > 5) return;
 
+  // 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;
+
   // Run command
   toy_init(which, argv);
   if (toys.which) toys.which->toy_main();