In trampoline, make $strlcpy not crash given NULL.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 2a1b0f782ce5df1fab25716ffcc989017b97388a..0840ca5248b61141d90302af5cf81f16a06a0061 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -227,11 +227,14 @@ static CYExpression *ParseExpression(CYUTF8String code) {
     CYOptions options;
     CYContext context(options);
 
     CYOptions options;
     CYContext context(options);
 

-    // XXX: this could be replaced with a CYStatement::Primitive()
-    if (CYExpress *express = dynamic_cast<CYExpress *>(driver.program_->statements_))
-        return express->expression_->Primitive(context);
+    CYStatement *statement(driver.program_->statements_);
+    _assert(statement != NULL);
+    _assert(statement->next_ == NULL);

 
 

-    return NULL;
+    CYExpress *express(dynamic_cast<CYExpress *>(driver.program_->statements_));
+    _assert(express != NULL);
+
+    return express->expression_;

 }
 
 static int client_;
 }
 
 static int client_;


@@ -295,7 +298,7 @@ static char **Complete(const char *word, int start, int end) {
     "       var before = prefix.length;\n"
     "       prefix += word;\n"
     "       var entire = prefix.length;\n"
     "       var before = prefix.length;\n"
     "       prefix += word;\n"
     "       var entire = prefix.length;\n"

-    "       for (name in object)\n"
+    "       for (var name in object)\n"

     "           if (name.substring(0, entire) == prefix)\n"
     "               names.push(name.substr(before));\n"
     "       return names;\n"
     "           if (name.substring(0, entire) == prefix)\n"
     "               names.push(name.substr(before));\n"
     "       return names;\n"


@@ -316,8 +319,7 @@ static char **Complete(const char *word, int start, int end) {
     if (result == NULL)
         return NULL;
 
     if (result == NULL)
         return NULL;
 

-    CYArray *array(dynamic_cast<CYArray *>(result));
-
+    CYArray *array(dynamic_cast<CYArray *>(result->Primitive(context)));

     if (array == NULL) {
         *out_ << '\n';
         Output(false, json, out_);
     if (array == NULL) {
         *out_ << '\n';
         Output(false, json, out_);


@@ -497,6 +499,14 @@ static void Console(CYOptions &options) {
                 } else if (data == "debug") {
                     debug = !debug;
                     *out_ << "debug == " << (debug ? "true" : "false") << std::endl;
                 } else if (data == "debug") {
                     debug = !debug;
                     *out_ << "debug == " << (debug ? "true" : "false") << std::endl;

+                } else if (data == "destroy") {
+                    CYDestroyContext();
+                } else if (data == "gc") {
+                    *out_ << "collecting... " << std::flush;
+                    CYGarbageCollect(CYGetJSContext());
+                    *out_ << "done." << std::endl;
+                } else if (data == "exit") {
+                    return;

                 } else if (data == "expand") {
                     expand = !expand;
                     *out_ << "expand == " << (expand ? "true" : "false") << std::endl;
                 } else if (data == "expand") {
                     expand = !expand;
                     *out_ << "expand == " << (expand ? "true" : "false") << std::endl;


@@ -587,6 +597,7 @@ static void Console(CYOptions &options) {
         history += command_;
 
         if (debug) {
         history += command_;
 
         if (debug) {

+            std::cout << "cy= ";

             Write(syntax, code.c_str(), code.size(), std::cout);
             std::cout << std::endl;
         }
             Write(syntax, code.c_str(), code.size(), std::cout);
             std::cout << std::endl;
         }


@@ -605,6 +616,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
 
     bool tty(isatty(STDIN_FILENO));
     bool compile(false);

+    bool target(false);

     CYOptions options;
 
     append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history"));
     CYOptions options;
 
     append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history"));


@@ -620,17 +632,19 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     _aprcall(apr_getopt_init(&state, pool, argc, argv));
 
     for (;;) {
     _aprcall(apr_getopt_init(&state, pool, argc, argv));
 
     for (;;) {

-        char opt;
+        int opt;

         const char *arg;
 
         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
 #ifdef CY_ATTACH

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

 #endif
 #endif

-            "r:"
-            "s"
-        , &opt, &arg));
+            {NULL, 'r', true, NULL},
+            {NULL, 's', false, NULL},
+        {0, 0, 0, 0}}, &opt, &arg));

 
         switch (status) {
             case APR_EOF:
 
         switch (status) {
             case APR_EOF:


@@ -651,9 +665,22 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
         }
 
         switch (opt) {
         }
 
         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;
             case 'c':
                 compile = true;

-            break;
+            goto target;

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


@@ -725,7 +752,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                         return 1;
                     }
                 }
                         return 1;
                     }
                 }

-            } break;
+            } goto target;

 #endif
 
             case 'r': {
 #endif
 
             case 'r': {


@@ -747,7 +774,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                 host = arg;
                 *colon = '\0';
                 port = colon + 1;
                 host = arg;
                 *colon = '\0';
                 port = colon + 1;

-            } break;
+            } goto target;

 
             case 's':
                 strict_ = true;
 
             case 's':
                 strict_ = true;


@@ -763,11 +790,6 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }
         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)
 #endif
 
     if (ind == argc)


@@ -782,40 +804,53 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
             script = NULL;
     }
 
             script = NULL;
     }
 

-#ifdef CY_ATTACH
-    if (pid != _not(pid_t) && script == NULL && !tty) {
-        fprintf(stderr, "non-terminal attaching to remote console\n");
-        return 1;
-    }
-#endif
-

 #ifdef CY_ATTACH
     if (pid == _not(pid_t))
         client_ = -1;
     else {
 #ifdef CY_ATTACH
     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;