When CYONifying fields, @error encode exceptions.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index e955311e9ed622059e29e4ca6e52b770e2d9ed49..d35317830296da8fd2dadc1dabd41cb00573c226 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -47,11 +47,11 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include <sys/socket.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>
@@ -65,8 +65,11 @@
 
 #include <dlfcn.h>
 
-#include "Replace.hpp"
 #include "Display.hpp"
+#include "Replace.hpp"
+
+#include "Cycript.tab.hh"
+#include "Driver.hpp"
 
 static volatile enum {
     Working,
@@ -133,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;
         }
@@ -385,6 +388,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;
 
@@ -394,15 +425,14 @@ 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);
@@ -455,9 +485,10 @@ static void Console(CYOptions &options) {
         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) {
@@ -477,8 +508,7 @@ static void Console(CYOptions &options) {
                     syntax = !syntax;
                     *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl;
                 }
-                add_history(line);
-                ++histlines;
+                history += line;
                 goto restart;
             }
         }
@@ -532,8 +562,7 @@ static void Console(CYOptions &options) {
                         std::cerr << "  | ";
                         std::cerr << error->message_ << std::endl;
 
-                        add_history(command_.c_str());
-                        ++histlines;
+                        history += command_;
                         goto restart;
                     }
                 }
@@ -559,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);
@@ -569,15 +597,6 @@ static void Console(CYOptions &options) {
 
         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) {
@@ -615,6 +634,9 @@ 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));
 
@@ -627,6 +649,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 #ifdef CY_ATTACH
             "p:"
 #endif
+            "r:"
             "s"
         , &opt, &arg));
 
@@ -640,6 +663,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;
@@ -727,6 +751,27 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
             } 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;
@@ -799,6 +844,34 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     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 {