Fix issue in 64-bit choose() reported by heardrwt.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index d91e6d4766c9c20d2caea7f690c2ca3b57caeb4d..0840ca5248b61141d90302af5cf81f16a06a0061 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -616,6 +616,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
+    bool target(false);
     CYOptions options;
 
     append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history"));
@@ -631,17 +632,19 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     _aprcall(apr_getopt_init(&state, pool, argc, argv));
 
     for (;;) {
-        char opt;
+        int opt;
         const char *arg;
 
-        apr_status_t status(apr_getopt(state,
-            "cg:n:"
+        apr_status_t status(apr_getopt_long(state, (apr_getopt_option_t[]) {
+            {NULL, 'c', false, NULL},
+            {NULL, 'g', true, NULL},
+            {NULL, 'n', true, NULL},
 #ifdef CY_ATTACH
-            "p:"
+            {NULL, 'p', true, NULL},
 #endif
-            "r:"
-            "s"
-        , &opt, &arg));
+            {NULL, 'r', true, NULL},
+            {NULL, 's', false, NULL},
+        {0, 0, 0, 0}}, &opt, &arg));
 
         switch (status) {
             case APR_EOF:
@@ -662,9 +665,22 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
         }
 
         switch (opt) {
+            target:
+                if (!target)
+                    target = true;
+                else {
+                    fprintf(stderr, "only one of -[c"
+#ifdef CY_ATTACH
+                    "p"
+#endif
+                    "r] may be used at a time\n");
+                    return 1;
+                }
+            break;
+
             case 'c':
                 compile = true;
-            break;
+            goto target;
 
             case 'g':
                 if (false);
@@ -736,7 +752,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                         return 1;
                     }
                 }
-            } break;
+            } goto target;
 #endif
 
             case 'r': {
@@ -758,7 +774,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                 host = arg;
                 *colon = '\0';
                 port = colon + 1;
-            } break;
+            } goto target;
 
             case 's':
                 strict_ = true;
@@ -774,11 +790,6 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }
-
-    if (pid != _not(pid_t) && compile) {
-        fprintf(stderr, "-p conflicts with -c\n");
-        return 1;
-    }
 #endif
 
     if (ind == argc)
@@ -797,29 +808,49 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     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;