New option parsing infrastructure (doesn't use getopt). Hook it up to

[android-x86/external-toybox.git] / toys / which.c

diff --git a/toys/which.c b/toys/which.c
index 6d00bc8..16e19d0 100644 (file)
--- a/toys/which.c
+++ b/toys/which.c
@@ -7,7 +7,6 @@
 
 #include "toys.h"
 
-#define OPTIONS "a"
 #define OPT_a   1
 
 // Find an exectuable file either at a path with a slash in it (absolute or
@@ -55,16 +54,12 @@ static int which_in_path(char *filename)
 
 int which_main(void)
 {
-       char **argv;
        int rc = 0;
 
-       // get_optflags(OPTIONS);
-       argv = toys.argv+1;
-
-       if (!*argv) rc++;
+       if (!*toys.optargs) rc++;
        else {
                int i;
-               for (i=0; argv[i]; i++) rc |= which_in_path(argv[i]);
+               for (i=0; toys.optargs[i]; i++) rc |= which_in_path(toys.optargs[i]);
        }
        // if (CFG_TOYS_FREE) free(argv);