Factor JSValueRef exception arguments to _jsccall.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 14a659017ec4855202485ef48334322f95c03153..d35317830296da8fd2dadc1dabd41cb00573c226 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */

 /*
 /*

- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.

  *
  *

- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.

  *
  *

- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License

  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */


@@ -47,11 +47,11 @@
 #include <errno.h>
 #include <unistd.h>
 
 #include <errno.h>
 #include <unistd.h>
 

+#include <sys/socket.h>

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

-
-#include "Cycript.tab.hh"
+#include <netdb.h>

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


@@ -60,11 +60,16 @@
 #include <pwd.h>
 
 #include <apr_getopt.h>
 #include <pwd.h>
 
 #include <apr_getopt.h>

+#include <apr_pools.h>
+#include <apr_strings.h>

 
 #include <dlfcn.h>
 
 
 #include <dlfcn.h>
 

-#include "Replace.hpp"

 #include "Display.hpp"
 #include "Display.hpp"

+#include "Replace.hpp"
+
+#include "Cycript.tab.hh"
+#include "Driver.hpp"

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


@@ -114,7 +119,7 @@ void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) {
 
 static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     const char *json;
 
 static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     const char *json;

-    size_t size;
+    uint32_t size;

 
     if (client == -1) {
         mode_ = Running;
 
     if (client == -1) {
         mode_ = Running;


@@ -131,15 +136,15 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     } else {
         mode_ = Sending;
         size = code.size;
     } else {
         mode_ = Sending;
         size = code.size;

-        CYSendAll(client, &size, sizeof(size));
-        CYSendAll(client, code.data, code.size);
+        _assert(CYSendAll(client, &size, sizeof(size)));
+        _assert(CYSendAll(client, code.data, code.size));

         mode_ = Waiting;
         mode_ = Waiting;

-        CYRecvAll(client, &size, sizeof(size));
-        if (size == _not(size_t))
+        _assert(CYRecvAll(client, &size, sizeof(size)));
+        if (size == _not(uint32_t))

             json = NULL;
         else {
             char *temp(new(pool) char[size + 1]);
             json = NULL;
         else {
             char *temp(new(pool) char[size + 1]);

-            CYRecvAll(client, temp, size);
+            _assert(CYRecvAll(client, temp, size));

             temp[size] = '\0';
             json = temp;
         }
             temp[size] = '\0';
             json = temp;
         }


@@ -383,6 +388,34 @@ static char **Complete(const char *word, int start, int end) {
 static char name_[] = "cycript";
 static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]";
 
 static char name_[] = "cycript";
 static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]";
 

+class History {
+  private:
+    std::string histfile_;
+    size_t histlines_;
+
+  public:
+    History(std::string histfile) :
+        histfile_(histfile),
+        histlines_(0)
+    {
+        read_history(histfile_.c_str());
+    }
+
+    ~History() {
+        if (append_history$ != NULL) {
+            _syscall(close(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600))));
+            _assert((*append_history$)(histlines_, histfile_.c_str()) == 0);
+        } else {
+            _assert(write_history(histfile_.c_str()) == 0);
+        }
+    }
+
+    void operator +=(const std::string &command) {
+        add_history(command_.c_str());
+        ++histlines_;
+    }
+};
+

 static void Console(CYOptions &options) {
     CYPool pool;
 
 static void Console(CYOptions &options) {
     CYPool pool;
 


@@ -392,26 +425,19 @@ static void Console(CYOptions &options) {
     else
         passwd = getpwuid(getuid());
 
     else
         passwd = getpwuid(getuid());
 

-    const char *basedir(apr_psprintf(pool, "%s/.cycript", passwd->pw_dir));
-    const char *histfile(apr_psprintf(pool, "%s/history", basedir));
-    size_t histlines(0);
+    std::string basedir(passwd->pw_dir);
+    basedir += "/.cycript";
+    mkdir(basedir.c_str(), 0700);

 
     rl_initialize();
     rl_readline_name = name_;
 
 
     rl_initialize();
     rl_readline_name = name_;
 

-#if RL_READLINE_VERSION >= 0x0600
-    rl_prep_term_function = CYDisplayStart;
-    rl_redisplay_function = CYDisplayUpdate;
-    rl_deprep_term_function = CYDisplayFinish;
-#endif
-
-    mkdir(basedir, 0700);
-    read_history(histfile);
+    History history(basedir + "/history");

 
     bool bypass(false);
     bool debug(false);
     bool expand(false);
 
     bool bypass(false);
     bool debug(false);
     bool expand(false);

-    bool syntax(false);
+    bool syntax(true);

 
     out_ = &std::cout;
 
 
     out_ = &std::cout;
 


@@ -442,12 +468,27 @@ static void Console(CYOptions &options) {
         }
 
       read:
         }
 
       read:

+
+#if RL_READLINE_VERSION >= 0x0600
+        if (syntax) {
+            rl_prep_term_function = CYDisplayStart;
+            rl_redisplay_function = CYDisplayUpdate;
+            rl_deprep_term_function = CYDisplayFinish;
+        } else {
+            rl_prep_term_function = rl_prep_terminal;
+            rl_redisplay_function = rl_redisplay;
+            rl_deprep_term_function = rl_deprep_terminal;
+        }
+#endif
+

         mode_ = Parsing;
         char *line(readline(prompt));
         mode_ = Working;
         mode_ = Parsing;
         char *line(readline(prompt));
         mode_ = Working;

-        if (line == NULL)
+
+        if (line == NULL) {
+            *out_ << std::endl;

             break;
             break;

-        if (line[0] == '\0')
+        } else if (line[0] == '\0')

             goto read;
 
         if (!extra) {
             goto read;
 
         if (!extra) {


@@ -467,8 +508,7 @@ static void Console(CYOptions &options) {
                     syntax = !syntax;
                     *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl;
                 }
                     syntax = !syntax;
                     *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl;
                 }

-                add_history(line);
-                ++histlines;
+                history += line;

                 goto restart;
             }
         }
                 goto restart;
             }
         }


@@ -522,8 +562,7 @@ static void Console(CYOptions &options) {
                         std::cerr << "  | ";
                         std::cerr << error->message_ << std::endl;
 
                         std::cerr << "  | ";
                         std::cerr << error->message_ << std::endl;
 

-                        add_history(command_.c_str());
-                        ++histlines;
+                        history += command_;

                         goto restart;
                     }
                 }
                         goto restart;
                     }
                 }


@@ -549,8 +588,7 @@ static void Console(CYOptions &options) {
             }
         }
 
             }
         }
 

-        add_history(command_.c_str());
-        ++histlines;
+        history += command_;

 
         if (debug) {
             Write(syntax, code.c_str(), code.size(), std::cout);
 
         if (debug) {
             Write(syntax, code.c_str(), code.size(), std::cout);


@@ -559,15 +597,6 @@ static void Console(CYOptions &options) {
 
         Run(client_, syntax, code, out_, expand);
     }
 
         Run(client_, syntax, code, out_, expand);
     }

-
-    if (append_history$ != NULL) {
-        _syscall(close(_syscall(open(histfile, O_CREAT | O_WRONLY, 0600))));
-        (*append_history$)(histlines, histfile);
-    } else {
-        write_history(histfile);
-    }
-
-    *out_ << std::endl;

 }
 
 static void *Map(const char *path, size_t *psize) {
 }
 
 static void *Map(const char *path, size_t *psize) {


@@ -590,6 +619,11 @@ static void *Map(const char *path, size_t *psize) {
 void InjectLibrary(pid_t pid);
 
 int Main(int argc, char const * const argv[], char const * const envp[]) {
 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);
+

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


@@ -600,7 +634,9 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     pid_t pid(_not(pid_t));
 #endif
 
     pid_t pid(_not(pid_t));
 #endif
 

-    CYPool pool;
+    const char *host(NULL);
+    const char *port(NULL);
+

     apr_getopt_t *state;
     _aprcall(apr_getopt_init(&state, pool, argc, argv));
 
     apr_getopt_t *state;
     _aprcall(apr_getopt_init(&state, pool, argc, argv));
 


@@ -613,6 +649,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 #ifdef CY_ATTACH
             "p:"
 #endif
 #ifdef CY_ATTACH
             "p:"
 #endif

+            "r:"

             "s"
         , &opt, &arg));
 
             "s"
         , &opt, &arg));
 


@@ -626,6 +663,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 #ifdef CY_ATTACH
                     " [-p <pid|name>]"
 #endif
 #ifdef CY_ATTACH
                     " [-p <pid|name>]"
 #endif

+                    " [-r <host:port>]"

                     " [<script> [<arg>...]]\n"
                 );
                 return 1;
                     " [<script> [<arg>...]]\n"
                 );
                 return 1;


@@ -670,7 +708,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                 pid = strtoul(arg, &end, 0);
                 if (arg + size != end) {
                     // XXX: arg needs to be escaped in some horrendous way of doom
                 pid = strtoul(arg, &end, 0);
                 if (arg + size != end) {
                     // XXX: arg needs to be escaped in some horrendous way of doom

-                    const char *command(apr_psprintf(pool, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^%s /{s/^[^ ]* //;q;};};d'", arg));
+                    const char *command(apr_pstrcat(pool, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^", arg, " /{s/^[^ ]* //;q;};};d'", NULL));

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


@@ -713,6 +751,27 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
             } break;
 #endif
 
             } break;
 #endif
 

+            case 'r': {
+                //size_t size(strlen(arg));
+
+                char *colon(strrchr(arg, ':'));
+                if (colon == NULL) {
+                    fprintf(stderr, "missing colon in hostspec\n");
+                    return 1;
+                }
+
+                /*char *end;
+                port = strtoul(colon + 1, &end, 10);
+                if (end != arg + size) {
+                    fprintf(stderr, "invalid port in hostspec\n");
+                    return 1;
+                }*/
+
+                host = arg;
+                *colon = '\0';
+                port = colon + 1;
+            } break;
+

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


@@ -785,6 +844,34 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     client_ = -1;
 #endif
 
     client_ = -1;
 #endif
 

+    if (client_ == -1 && host != NULL && port != NULL) {
+        struct addrinfo hints;
+        memset(&hints, 0, sizeof(hints));
+        hints.ai_family = AF_UNSPEC;
+        hints.ai_socktype = SOCK_STREAM;
+        hints.ai_protocol = 0;
+        hints.ai_flags = 0;
+
+        struct addrinfo *infos;
+        _syscall(getaddrinfo(host, port, &hints, &infos));
+
+        _assert(infos != NULL); try {
+            for (struct addrinfo *info(infos); info != NULL; info = info->ai_next) {
+                int client(_syscall(socket(info->ai_family, info->ai_socktype, info->ai_protocol))); try {
+                    _syscall(connect(client, info->ai_addr, info->ai_addrlen));
+                    client_ = client;
+                    break;
+                } catch (...) {
+                    _syscall(close(client));
+                    throw;
+                }
+            }
+        } catch (...) {
+            freeaddrinfo(infos);
+            throw;
+        }
+    }
+

     if (script == NULL && tty)
         Console(options);
     else {
     if (script == NULL && tty)
         Console(options);
     else {


@@ -842,6 +929,8 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
             }
     }
 
             }
     }
 

+    apr_pool_destroy(pool);
+

     return 0;
 }
 
     return 0;
 }