X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b12a99658d0a609d28ff522b82be8826928107cf..f6fa3c2112ee8b0aa26ab0765674601a9800db77:/Console.cpp?ds=inline

diff --git a/Console.cpp b/Console.cpp
index 3dede2f..0840ca5 100644
--- a/Console.cpp
+++ b/Console.cpp
@@ -26,6 +26,7 @@
 #endif
 
 #include <cstdio>
+#include <fstream>
 #include <sstream>
 
 #include <setjmp.h>
@@ -42,14 +43,14 @@
 #include <readline/history.h>
 #endif
 
-#include <sys/mman.h>
-
 #include <errno.h>
 #include <unistd.h>
 
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <netdb.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -109,10 +110,11 @@ void Setup(CYDriver &driver, cy::parser &parser) {
         driver.strict_ = true;
 }
 
-void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) {
+void Setup(CYOutput &out, CYDriver &driver, CYOptions &options, bool lower) {
     out.pretty_ = pretty_;
     CYContext context(options);
-    driver.program_->Replace(context);
+    if (lower)
+        driver.program_->Replace(context);
 }
 
 static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
@@ -122,7 +124,7 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE
-        json = CYExecute(pool, code);
+        json = CYExecute(CYGetJSContext(), pool, code);
 #else
         json = NULL;
 #endif
@@ -134,15 +136,15 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     } 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;
-        CYRecvAll(client, &size, sizeof(size));
+        _assert(CYRecvAll(client, &size, sizeof(size)));
         if (size == _not(uint32_t))
             json = NULL;
         else {
             char *temp(new(pool) char[size + 1]);
-            CYRecvAll(client, temp, size);
+            _assert(CYRecvAll(client, temp, size));
             temp[size] = '\0';
             json = temp;
         }
@@ -225,11 +227,14 @@ static CYExpression *ParseExpression(CYUTF8String code) {
     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_;
@@ -293,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"
-    "       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"
@@ -314,8 +319,7 @@ static char **Complete(const char *word, int start, int end) {
     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_);
@@ -386,6 +390,34 @@ static char **Complete(const char *word, int start, int end) {
 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;
 
@@ -395,19 +427,19 @@ static void Console(CYOptions &options) {
     else
         passwd = getpwuid(getuid());
 
-    const char *basedir(pool.strcat(passwd->pw_dir, "/.cycript", NULL));
-    const char *histfile(pool.strcat(basedir, "/history", NULL));
-    size_t histlines(0);
+    std::string basedir(passwd->pw_dir);
+    basedir += "/.cycript";
+    mkdir(basedir.c_str(), 0700);
 
     rl_initialize();
     rl_readline_name = name_;
 
-    mkdir(basedir, 0700);
-    read_history(histfile);
+    History history(basedir + "/history");
 
     bool bypass(false);
     bool debug(false);
     bool expand(false);
+    bool lower(true);
     bool syntax(true);
 
     out_ = &std::cout;
@@ -441,24 +473,20 @@ static void Console(CYOptions &options) {
       read:
 
 #if RL_READLINE_VERSION >= 0x0600
-        if (syntax) {
-            rl_prep_term_function = CYDisplayStart;
+        if (syntax)
             rl_redisplay_function = CYDisplayUpdate;
-            rl_deprep_term_function = CYDisplayFinish;
-        } else {
-            rl_prep_term_function = rl_prep_terminal;
+        else
             rl_redisplay_function = rl_redisplay;
-            rl_deprep_term_function = rl_deprep_terminal;
-        }
 #endif
 
         mode_ = Parsing;
         char *line(readline(prompt));
         mode_ = Working;
 
-        if (line == NULL)
+        if (line == NULL) {
+            *out_ << std::endl;
             break;
-        if (line[0] == '\0')
+        } else if (line[0] == '\0')
             goto read;
 
         if (!extra) {
@@ -471,15 +499,26 @@ static void Console(CYOptions &options) {
                 } 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 == "lower") {
+                    lower = !lower;
+                    *out_ << "lower == " << (lower ? "true" : "false") << std::endl;
                 } else if (data == "syntax") {
                     syntax = !syntax;
                     *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl;
                 }
-                add_history(line);
-                ++histlines;
+                command_ = line;
+                history += command_;
                 goto restart;
             }
         }
@@ -533,8 +572,7 @@ static void Console(CYOptions &options) {
                         std::cerr << "  | ";
                         std::cerr << error->message_ << std::endl;
 
-                        add_history(command_.c_str());
-                        ++histlines;
+                        history += command_;
                         goto restart;
                     }
                 }
@@ -549,53 +587,23 @@ static void Console(CYOptions &options) {
             if (driver.program_ == NULL)
                 goto restart;
 
-            if (client_ != -1)
-                code = command_;
-            else {
-                std::ostringstream str;
-                CYOutput out(str, options);
-                Setup(out, driver, options);
-                out << *driver.program_;
-                code = str.str();
-            }
+            std::ostringstream str;
+            CYOutput out(str, options);
+            Setup(out, driver, options, lower);
+            out << *driver.program_;
+            code = str.str();
         }
 
-        add_history(command_.c_str());
-        ++histlines;
+        history += command_;
 
         if (debug) {
+            std::cout << "cy= ";
             Write(syntax, code.c_str(), code.size(), std::cout);
             std::cout << std::endl;
         }
 
         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) {
-    int fd;
-    _syscall(fd = open(path, O_RDONLY));
-
-    struct stat stat;
-    _syscall(fstat(fd, &stat));
-    size_t size(stat.st_size);
-
-    *psize = size;
-
-    void *base;
-    _syscall(base = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0));
-
-    _syscall(close(fd));
-    return base;
 }
 
 void InjectLibrary(pid_t pid);
@@ -608,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"));
@@ -616,20 +625,26 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     pid_t pid(_not(pid_t));
 #endif
 
+    const char *host(NULL);
+    const char *port(NULL);
+
     apr_getopt_t *state;
     _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
-            "s"
-        , &opt, &arg));
+            {NULL, 'r', true, NULL},
+            {NULL, 's', false, NULL},
+        {0, 0, 0, 0}}, &opt, &arg));
 
         switch (status) {
             case APR_EOF:
@@ -641,6 +656,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 #ifdef CY_ATTACH
                     " [-p <pid|name>]"
 #endif
+                    " [-r <host:port>]"
                     " [<script> [<arg>...]]\n"
                 );
                 return 1;
@@ -649,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);
@@ -697,10 +726,8 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                                 break;
                             else {
                                 size += read;
-                                if (size == sizeof(value)) {
-                                    pid = _not(pid_t);
+                                if (size == sizeof(value))
                                     goto fail;
-                                }
                             }
                         }
 
@@ -721,13 +748,34 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                     }
 
                     if (pid == _not(pid_t)) {
-                        fprintf(stderr, "invalid pid for -p\n");
+                        fprintf(stderr, "unable to find process `%s' using ps\n", arg);
                         return 1;
                     }
                 }
-            } break;
+            } goto target;
 #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;
+            } goto target;
+
             case 's':
                 strict_ = true;
             break;
@@ -742,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)
@@ -761,100 +804,118 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
             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 {
-        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;
 #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 {
         CYLocalPool pool;
 
-        char *start, *end;
-        std::istream *indirect;
-
+        std::istream *stream;
         if (script == NULL) {
-            start = NULL;
-            end = NULL;
-            indirect = &std::cin;
+            stream = &std::cin;
+            script = "<stdin>";
         } else {
-            size_t size;
-            start = reinterpret_cast<char *>(Map(script, &size));
-            end = start + size;
-
-            if (size >= 2 && start[0] == '#' && start[1] == '!') {
-                start += 2;
-
-                if (void *line = memchr(start, '\n', end - start))
-                    start = reinterpret_cast<char *>(line);
-                else
-                    start = end;
-            }
-
-            indirect = NULL;
+            stream = new std::fstream(script, std::ios::in | std::ios::binary);
+            _assert(!stream->fail());
         }
 
-        CYStream direct(start, end);
-        std::istream &stream(indirect == NULL ? direct : *indirect);
-        CYDriver driver(stream, script ?: "<stdin>");
-
+        CYDriver driver(*stream, script);
         cy::parser parser(driver);
         Setup(driver, parser);
 
         if (parser.parse() != 0 || !driver.errors_.empty()) {
             for (CYDriver::Errors::const_iterator i(driver.errors_.begin()); i != driver.errors_.end(); ++i)
                 std::cerr << i->location_.begin << ": " << i->message_ << std::endl;
-        } else if (driver.program_ != NULL)
-            if (client_ != -1) {
-                // XXX: this code means that you can't pipe to another process
-                std::string code(start, end-start);
+        } else if (driver.program_ != NULL) {
+            std::ostringstream str;
+            CYOutput out(str, options);
+            Setup(out, driver, options, true);
+            out << *driver.program_;
+            std::string code(str.str());
+            if (compile)
+                std::cout << code;
+            else
                 Run(client_, false, code, &std::cout);
-            } else {
-                std::ostringstream str;
-                CYOutput out(str, options);
-                Setup(out, driver, options);
-                out << *driver.program_;
-                std::string code(str.str());
-                if (compile)
-                    std::cout << code;
-                else
-                    Run(client_, false, code, &std::cout);
-            }
+        }
     }
 
     apr_pool_destroy(pool);