Updated todo, license, and title.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 503a3e8c811fd80ab11291c4232e812d6d3dc469..7f979633511ea6c9e6257af20e116cb6799aa7b1 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -63,6 +63,8 @@
 #include <netinet/in.h>
 #include <sys/un.h>
 
 #include <netinet/in.h>
 #include <sys/un.h>
 

+#include <apr_getopt.h>
+

 static volatile enum {
     Working,
     Parsing,
 static volatile enum {
     Working,
     Parsing,


@@ -332,7 +334,9 @@ static void *Map(const char *path, size_t *psize) {
     return base;
 }
 
     return base;
 }
 

-int main(int argc, char *argv[]) {
+int main(int argc, char const * const argv[], char const * const envp[]) {
+    _aprcall(apr_app_initialize(&argc, &argv, &envp));
+

     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
 
     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
 


@@ -340,70 +344,89 @@ int main(int argc, char *argv[]) {
     pid_t pid(_not(pid_t));
 #endif
 
     pid_t pid(_not(pid_t));
 #endif
 

-    for (;;) switch (getopt(argc, argv,
-        "cg:n:"
+    CYPool pool;
+    apr_getopt_t *state;
+    _aprcall(apr_getopt_init(&state, pool, argc, argv));
+
+    for (;;) {
+        char opt;
+        const char *arg;
+
+        apr_status_t status(apr_getopt(state,
+            "cg:n:"

 #ifdef CY_ATTACH
 #ifdef CY_ATTACH

-        "p:"
+            "p:"

 #endif
 #endif

-        "s"
-    )) {
-        case -1:
-            goto getopt;
-        case '?':
-            fprintf(stderr, "usage: cycript [-c]"
+            "s"
+        , &opt, &arg));
+
+        switch (status) {
+            case APR_EOF:
+                goto getopt;
+            case APR_BADCH:
+            case APR_BADARG:
+                fprintf(stderr,
+                    "usage: cycript [-c]"

 #ifdef CY_ATTACH
 #ifdef CY_ATTACH

-            " [-p <pid>]"
+                    " [-p <pid>]"

 #endif
 #endif

-            " [<script> [<arg>...]]\n");
-            return 1;
+                    " [<script> [<arg>...]]\n"
+                );
+                return 1;
+            default:
+                _aprcall(status);
+        }

 
 

-        case 'c':
-            compile = true;
-        break;
+        switch (opt) {
+            case 'c':
+                compile = true;
+            break;

 
 

-        case 'g':
-            if (false);
+            case 'g':
+                if (false);

 #if YYDEBUG
 #if YYDEBUG

-            else if (strcmp(optarg, "bison") == 0)
-                bison_ = true;
+                else if (strcmp(arg, "bison") == 0)
+                    bison_ = true;

 #endif
 #endif

-            else {
-                fprintf(stderr, "invalid name for -g\n");
-                return 1;
-            }
-        break;
+                else {
+                    fprintf(stderr, "invalid name for -g\n");
+                    return 1;
+                }
+            break;

 
 

-        case 'n':
-            if (false);
-            else if (strcmp(optarg, "minify") == 0)
-                pretty_ = true;
-            else {
-                fprintf(stderr, "invalid name for -n\n");
-                return 1;
-            }
-        break;
+            case 'n':
+                if (false);
+                else if (strcmp(arg, "minify") == 0)
+                    pretty_ = true;
+                else {
+                    fprintf(stderr, "invalid name for -n\n");
+                    return 1;
+                }
+            break;

 
 #ifdef CY_ATTACH
 
 #ifdef CY_ATTACH

-        case 'p': {
-            size_t size(strlen(optarg));
-            char *end;
-            pid = strtoul(optarg, &end, 0);
-            if (optarg + size != end) {
-                fprintf(stderr, "invalid pid for -p\n");
-                return 1;
-            }
-        } break;
+            case 'p': {
+                size_t size(strlen(arg));
+                char *end;
+                pid = strtoul(arg, &end, 0);
+                if (arg + size != end) {
+                    fprintf(stderr, "invalid pid for -p\n");
+                    return 1;
+                }
+            } break;

 #endif
 
 #endif
 

-        case 's':
-            strict_ = true;
-        break;
+            case 's':
+                strict_ = true;
+            break;
+        }

     } getopt:;
 
     const char *script;
     } getopt:;
 
     const char *script;

+    int ind(state->ind);

 
 #ifdef CY_ATTACH
 
 #ifdef CY_ATTACH

-    if (pid != _not(pid_t) && optind < argc - 1) {
+    if (pid != _not(pid_t) && ind < argc - 1) {

         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }
         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }


@@ -414,14 +437,14 @@ int main(int argc, char *argv[]) {
     }
 #endif
 
     }
 #endif
 

-    if (optind == argc)
+    if (ind == argc)

         script = NULL;
     else {
 #ifdef CY_EXECUTE
         // XXX: const_cast?! wtf gcc :(
         script = NULL;
     else {
 #ifdef CY_EXECUTE
         // XXX: const_cast?! wtf gcc :(

-        CYSetArgs(argc - optind - 1, const_cast<const char **>(argv + optind + 1));
+        CYSetArgs(argc - ind - 1, const_cast<const char **>(argv + ind + 1));

 #endif
 #endif

-        script = argv[optind];
+        script = argv[ind];

         if (strcmp(script, "-") == 0)
             script = NULL;
     }
         if (strcmp(script, "-") == 0)
             script = NULL;
     }