X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b15898455c67b0ec79886a244d436ea1097552b8..6a9812501258df26b7c487e50744b91abe8ebe39:/Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 754422e..65eeb4f 100644
--- a/Console.cpp
+++ b/Console.cpp
@@ -1,4 +1,4 @@
-/* Cycript - Remove Execution Server and Disassembler
+/* Cycript - Inlining/Optimizing JavaScript Compiler
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 
@@ -39,6 +39,10 @@
 
 #include "cycript.hpp"
 
+#ifdef CY_EXECUTE
+#include "JavaScript.hpp"
+#endif
+
 #include <cstdio>
 #include <sstream>
 
@@ -66,6 +70,8 @@
 
 #include <apr_getopt.h>
 
+#include <dlfcn.h>
+
 static volatile enum {
     Working,
     Parsing,
@@ -109,15 +115,16 @@ void Setup(CYDriver &driver, cy::parser &parser) {
 void Setup(CYOutput &out, CYDriver &driver) {
     out.pretty_ = pretty_;
 
-    CYContext context(driver.pool_);
+    CYOptions options;
+    CYContext context(driver.pool_, options);
     driver.program_->Replace(context);
 }
 
-void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
+void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
     CYPool pool;
 
     const char *json;
-    if (socket == -1) {
+    if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE
         json = CYExecute(pool, data);
@@ -129,15 +136,15 @@ void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expa
             size = strlen(json);
     } else {
         mode_ = Sending;
-        CYSendAll(socket, &size, sizeof(size));
-        CYSendAll(socket, data, size);
+        CYSendAll(client, &size, sizeof(size));
+        CYSendAll(client, data, size);
         mode_ = Waiting;
-        CYRecvAll(socket, &size, sizeof(size));
+        CYRecvAll(client, &size, sizeof(size));
         if (size == _not(size_t))
             json = NULL;
         else {
             char *temp(new(pool) char[size + 1]);
-            CYRecvAll(socket, temp, size);
+            CYRecvAll(client, temp, size);
             temp[size] = '\0';
             json = temp;
         }
@@ -170,11 +177,13 @@ void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expa
     }
 }
 
-void Run(int socket, std::string &code, FILE *fout = NULL, bool expand = false) {
-    Run(socket, code.c_str(), code.size(), fout, expand);
+void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false) {
+    Run(client, code.c_str(), code.size(), fout, expand);
 }
 
-static void Console(apr_pool_t *pool, int socket) {
+int (*append_history$)(int, const char *);
+
+static void Console(apr_pool_t *pool, int client) {
     passwd *passwd;
     if (const char *username = getenv("LOGNAME"))
         passwd = getpwnam(username);
@@ -222,6 +231,8 @@ static void Console(apr_pool_t *pool, int socket) {
         mode_ = Working;
         if (line == NULL)
             break;
+        if (line[0] == '\0')
+            goto read;
 
         if (!extra) {
             extra = true;
@@ -310,11 +321,12 @@ static void Console(apr_pool_t *pool, int socket) {
             if (driver.program_ == NULL)
                 goto restart;
 
-            if (socket != -1)
+            if (client != -1)
                 code = command;
             else {
                 std::ostringstream str;
-                CYOutput out(str);
+                CYOptions options;
+                CYOutput out(str, options);
                 Setup(out, driver);
                 out << *driver.program_;
                 code = str.str();
@@ -327,11 +339,15 @@ static void Console(apr_pool_t *pool, int socket) {
         if (debug)
             std::cout << code << std::endl;
 
-        Run(socket, code, fout, expand);
+        Run(client, code, fout, expand);
     }
 
-    _syscall(close(_syscall(open(histfile, O_CREAT | O_WRONLY, 0600))));
-    append_history(histlines, histfile);
+    if (append_history$ != NULL) {
+        _syscall(close(_syscall(open(histfile, O_CREAT | O_WRONLY, 0600))));
+        (*append_history$)(histlines, histfile);
+    } else {
+        write_history(histfile);
+    }
 
     fputs("\n", fout);
     fflush(fout);
@@ -354,12 +370,14 @@ static void *Map(const char *path, size_t *psize) {
     return base;
 }
 
-int main(int argc, char const * const argv[], char const * const envp[]) {
-    _aprcall(apr_app_initialize(&argc, &argv, &envp));
+void InjectLibrary(pid_t pid);
 
+int Main(int argc, char const * const argv[], char const * const envp[]) {
     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
 
+    append_history$ = reinterpret_cast<int (*)(int, const char *)>(dlsym(RTLD_DEFAULT, "append_history"));
+
 #ifdef CY_ATTACH
     pid_t pid(_not(pid_t));
 #endif
@@ -388,7 +406,7 @@ int main(int argc, char const * const argv[], char const * const envp[]) {
                 fprintf(stderr,
                     "usage: cycript [-c]"
 #ifdef CY_ATTACH
-                    " [-p <pid>]"
+                    " [-p <pid|name>]"
 #endif
                     " [<script> [<arg>...]]\n"
                 );
@@ -428,10 +446,49 @@ int main(int argc, char const * const argv[], char const * const envp[]) {
             case 'p': {
                 size_t size(strlen(arg));
                 char *end;
+
                 pid = strtoul(arg, &end, 0);
                 if (arg + size != end) {
-                    fprintf(stderr, "invalid pid for -p\n");
-                    return 1;
+                    // 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));
+
+                    if (FILE *pids = popen(command, "r")) {
+                        char value[32];
+                        size = 0;
+
+                        for (;;) {
+                            size_t read(fread(value + size, 1, sizeof(value) - size, pids));
+                            if (read == 0)
+                                break;
+                            else {
+                                size += read;
+                                if (size == sizeof(value)) {
+                                    pid = _not(pid_t);
+                                    goto fail;
+                                }
+                            }
+                        }
+
+                      size:
+                        if (size == 0)
+                            goto fail;
+                        if (value[size - 1] == '\n') {
+                            --size;
+                            goto size;
+                        }
+
+                        value[size] = '\0';
+                        size = strlen(value);
+                        pid = strtoul(value, &end, 0);
+                        if (value + size != end) fail:
+                            pid = _not(pid_t);
+                        _syscall(pclose(pids));
+                    }
+
+                    if (pid == _not(pid_t)) {
+                        fprintf(stderr, "invalid pid for -p\n");
+                        return 1;
+                    }
                 }
             } break;
 #endif
@@ -476,27 +533,42 @@ int main(int argc, char const * const argv[], char const * const envp[]) {
     }
 #endif
 
-    int socket;
+    int client;
 
 #ifdef CY_ATTACH
     if (pid == _not(pid_t))
-        socket = -1;
+        client = -1;
     else {
-        socket = _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", pid);
-
-        _syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
+        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;
+            }
+        } catch (...) {
+            _syscall(close(server));
+            throw;
+        }
     }
 #else
-    socket = -1;
+    client = -1;
 #endif
 
     if (script == NULL && tty)
-        Console(pool, socket);
+        Console(pool, client);
     else {
         CYDriver driver(script ?: "<stdin>");
         cy::parser parser(driver);
@@ -531,20 +603,37 @@ int main(int argc, char const * const argv[], char const * const envp[]) {
             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 (socket != -1)
-                Run(socket, start, end - start, stdout);
-            else {
+            if (client != -1) {
+                std::string code(start, end-start);
+                Run(client, code, stdout);
+            } else {
                 std::ostringstream str;
-                CYOutput out(str);
+                CYOptions options;
+                CYOutput out(str, options);
                 Setup(out, driver);
                 out << *driver.program_;
                 std::string code(str.str());
                 if (compile)
                     std::cout << code;
                 else
-                    Run(socket, code, stdout);
+                    Run(client, code, stdout);
             }
     }
 
     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 {
+        return Main(argc, argv, envp);
+    } catch (const CYException &error) {
+        CYPool pool;
+        fprintf(stderr, "%s\n", error.PoolCString(pool));
+        return 1;
+    }
+}