Correct "error: taking address of temporary array".

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index f93e090784629ccc10a3868e979cc8fcc559e353..2b68eddeed2ec07106383cb3fca261fd54e8bad1 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -44,6 +44,8 @@
 #endif
 
 #include <errno.h>
 #endif
 
 #include <errno.h>

+#include <getopt.h>
+#include <signal.h>

 #include <unistd.h>
 
 #include <sys/socket.h>
 #include <unistd.h>
 
 #include <sys/socket.h>


@@ -58,10 +60,6 @@
 #include <sys/un.h>
 #include <pwd.h>
 
 #include <sys/un.h>
 #include <pwd.h>
 

-#include <apr_getopt.h>
-#include <apr_pools.h>
-#include <apr_strings.h>
-

 #include <dlfcn.h>
 
 #include "Display.hpp"
 #include <dlfcn.h>
 
 #include "Display.hpp"


@@ -240,7 +238,7 @@ static CYExpression *ParseExpression(CYUTF8String code) {
 static int client_;
 
 static char **Complete(const char *word, int start, int end) {
 static int client_;
 
 static char **Complete(const char *word, int start, int end) {

-    rl_attempted_completion_over = TRUE;
+    rl_attempted_completion_over = ~0;

 
     CYLocalPool pool;
 
 
     CYLocalPool pool;
 


@@ -405,7 +403,8 @@ class History {
 
     ~History() {
         if (append_history$ != NULL) {
 
     ~History() {
         if (append_history$ != NULL) {

-            _syscall(close(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600))));
+            int fd(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600)));
+            _syscall(close(fd));

             _assert((*append_history$)(histlines_, histfile_.c_str()) == 0);
         } else {
             _assert(write_history(histfile_.c_str()) == 0);
             _assert((*append_history$)(histlines_, histfile_.c_str()) == 0);
         } else {
             _assert(write_history(histfile_.c_str()) == 0);


@@ -608,12 +607,7 @@ static void Console(CYOptions &options) {
 
 void InjectLibrary(pid_t pid);
 
 
 void InjectLibrary(pid_t pid);
 

-int Main(int argc, char const * const argv[], char const * const envp[]) {
-    _aprcall(apr_initialize());
-
-    apr_pool_t *pool;
-    apr_pool_create(&pool, NULL);
-
+int Main(int argc, char * const argv[], char const * const envp[]) {

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


@@ -628,29 +622,35 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     const char *host(NULL);
     const char *port(NULL);
 
     const char *host(NULL);
     const char *port(NULL);
 

-    apr_getopt_t *state;
-    _aprcall(apr_getopt_init(&state, pool, argc, argv));
+    optind = 1;

 
     for (;;) {
 
     for (;;) {

-        int opt;
-        const char *arg;
-
-        apr_status_t status(apr_getopt_long(state, (apr_getopt_option_t[]) {
-            {NULL, 'c', false, NULL},
-            {NULL, 'g', true, NULL},
-            {NULL, 'n', true, NULL},
+        int option(getopt_long(argc, argv,
+            "c"
+            "g:"
+            "n:"

 #ifdef CY_ATTACH
 #ifdef CY_ATTACH

-            {NULL, 'p', true, NULL},
+            "p:"

 #endif
 #endif

-            {NULL, 'r', true, NULL},
-            {NULL, 's', false, NULL},
-        {0, 0, 0, 0}}, &opt, &arg));
+            "r:"
+            "s"
+        , (const struct option[]) {
+            {NULL, no_argument, NULL, 'c'},
+            {NULL, required_argument, NULL, 'g'},
+            {NULL, required_argument, NULL, 'n'},
+#ifdef CY_ATTACH
+            {NULL, required_argument, NULL, 'p'},
+#endif
+            {NULL, required_argument, NULL, 'r'},
+            {NULL, no_argument, NULL, 's'},
+        {0, 0, 0, 0}}, NULL));

 
 

-        switch (status) {
-            case APR_EOF:
+        switch (option) {
+            case -1:

                 goto getopt;
                 goto getopt;

-            case APR_BADCH:
-            case APR_BADARG:
+
+            case ':':
+            case '?':

                 fprintf(stderr,
                     "usage: cycript [-c]"
 #ifdef CY_ATTACH
                 fprintf(stderr,
                     "usage: cycript [-c]"
 #ifdef CY_ATTACH


@@ -660,11 +660,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                     " [<script> [<arg>...]]\n"
                 );
                 return 1;
                     " [<script> [<arg>...]]\n"
                 );
                 return 1;

-            default:
-                _aprcall(status);
-        }

 
 

-        switch (opt) {

             target:
                 if (!target)
                     target = true;
             target:
                 if (!target)
                     target = true;


@@ -684,10 +680,10 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
             case 'g':
                 if (false);
 
             case 'g':
                 if (false);

-                else if (strcmp(arg, "rename") == 0)
+                else if (strcmp(optarg, "rename") == 0)

                     options.verbose_ = true;
 #if YYDEBUG
                     options.verbose_ = true;
 #if YYDEBUG

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

                     bison_ = true;
 #endif
                 else {
                     bison_ = true;
 #endif
                 else {


@@ -698,7 +694,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
             case 'n':
                 if (false);
 
             case 'n':
                 if (false);

-                else if (strcmp(arg, "minify") == 0)
+                else if (strcmp(optarg, "minify") == 0)

                     pretty_ = true;
                 else {
                     fprintf(stderr, "invalid name for -n\n");
                     pretty_ = true;
                 else {
                     fprintf(stderr, "invalid name for -n\n");


@@ -708,13 +704,15 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
 #ifdef CY_ATTACH
             case 'p': {
 
 #ifdef CY_ATTACH
             case 'p': {

-                size_t size(strlen(arg));
+                size_t size(strlen(optarg));

                 char *end;
 
                 char *end;
 

-                pid = strtoul(arg, &end, 0);
-                if (arg + size != end) {
+                pid = strtoul(optarg, &end, 0);
+                if (optarg + size != end) {

                     // XXX: arg needs to be escaped in some horrendous way of doom
                     // XXX: arg needs to be escaped in some horrendous way of doom

-                    const char *command(apr_pstrcat(pool, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^", arg, " /{s/^[^ ]* //;q;};};d'", NULL));
+                    // XXX: this is a memory leak now because I just don't care enough
+                    char *command;
+                    asprintf(&command, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^%s /{s/^[^ ]* //;q;};};d'", optarg);

 
                     if (FILE *pids = popen(command, "r")) {
                         char value[32];
 
                     if (FILE *pids = popen(command, "r")) {
                         char value[32];


@@ -748,7 +746,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                     }
 
                     if (pid == _not(pid_t)) {
                     }
 
                     if (pid == _not(pid_t)) {

-                        fprintf(stderr, "unable to find process `%s' using ps\n", arg);
+                        fprintf(stderr, "unable to find process `%s' using ps\n", optarg);

                         return 1;
                     }
                 }
                         return 1;
                     }
                 }


@@ -756,9 +754,9 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 #endif
 
             case 'r': {
 #endif
 
             case 'r': {

-                //size_t size(strlen(arg));
+                //size_t size(strlen(optarg));

 
 

-                char *colon(strrchr(arg, ':'));
+                char *colon(strrchr(optarg, ':'));

                 if (colon == NULL) {
                     fprintf(stderr, "missing colon in hostspec\n");
                     return 1;
                 if (colon == NULL) {
                     fprintf(stderr, "missing colon in hostspec\n");
                     return 1;


@@ -766,12 +764,12 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
                 /*char *end;
                 port = strtoul(colon + 1, &end, 10);
 
                 /*char *end;
                 port = strtoul(colon + 1, &end, 10);

-                if (end != arg + size) {
+                if (end != optarg + size) {

                     fprintf(stderr, "invalid port in hostspec\n");
                     return 1;
                 }*/
 
                     fprintf(stderr, "invalid port in hostspec\n");
                     return 1;
                 }*/
 

-                host = arg;
+                host = optarg;

                 *colon = '\0';
                 port = colon + 1;
             } goto target;
                 *colon = '\0';
                 port = colon + 1;
             } goto target;


@@ -779,27 +777,33 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
             case 's':
                 strict_ = true;
             break;
             case 's':
                 strict_ = true;
             break;

+
+            default:
+                _assert(false);

         }
         }

-    } getopt:;
+    }
+
+  getopt:
+    argc -= optind;
+    argv += optind;

 
     const char *script;
 
     const char *script;

-    int ind(state->ind);

 
 #ifdef CY_ATTACH
 
 #ifdef CY_ATTACH

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

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

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

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

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

 #endif
 #endif

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

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


@@ -808,29 +812,49 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     if (pid == _not(pid_t))
         client_ = -1;
     else {
     if (pid == _not(pid_t))
         client_ = -1;
     else {

-        int server(_syscall(socket(PF_UNIX, SOCK_STREAM, 0))); try {
-            struct sockaddr_un address;
-            memset(&address, 0, sizeof(address));
-            address.sun_family = AF_UNIX;
-
-            sprintf(address.sun_path, "/tmp/.s.cy.%u", getpid());
-
-            _syscall(bind(server, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
-            _syscall(chmod(address.sun_path, 0777));
-
-            try {
-                _syscall(listen(server, 1));
-                InjectLibrary(pid);
-                client_ = _syscall(accept(server, NULL, NULL));
-            } catch (...) {
-                // XXX: exception?
-                unlink(address.sun_path);
-                throw;
+        struct Socket {
+            int fd_;
+
+            Socket(int fd) :
+                fd_(fd)
+            {

             }
             }

-        } catch (...) {
-            _syscall(close(server));
-            throw;
-        }
+
+            ~Socket() {
+                close(fd_);
+            }
+
+            operator int() {
+                return fd_;
+            }
+        } server(_syscall(socket(PF_UNIX, SOCK_STREAM, 0)));
+
+        struct sockaddr_un address;
+        memset(&address, 0, sizeof(address));
+        address.sun_family = AF_UNIX;
+
+        sprintf(address.sun_path, "/tmp/.s.cy.%u", getpid());
+        unlink(address.sun_path);
+
+        struct File {
+            const char *path_;
+
+            File(const char *path) :
+                path_(path)
+            {
+            }
+
+            ~File() {
+                unlink(path_);
+            }
+        } file(address.sun_path);
+
+        _syscall(bind(server, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
+        _syscall(chmod(address.sun_path, 0777));
+
+        _syscall(listen(server, 1));
+        InjectLibrary(pid);
+        client_ = _syscall(accept(server, NULL, NULL));

     }
 #else
     client_ = -1;
     }
 #else
     client_ = -1;


@@ -898,18 +922,11 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
         }
     }
 
         }
     }
 

-    apr_pool_destroy(pool);
-

     return 0;
 }
 
     return 0;
 }
 

-int main(int argc, char const * const argv[], char const * const envp[]) {
-    apr_status_t status(apr_app_initialize(&argc, &argv, &envp));
-
-    if (status != APR_SUCCESS) {
-        fprintf(stderr, "apr_app_initialize() != APR_SUCCESS\n");
-        return 1;
-    } else try {
+int main(int argc, char * const argv[], char const * const envp[]) {
+    try {

         return Main(argc, argv, envp);
     } catch (const CYException &error) {
         CYPool pool;
         return Main(argc, argv, envp);
     } catch (const CYException &error) {
         CYPool pool;