Fixed a few bugs in the cross-compile and a GNUstep related casting issue.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index c377db2abb3242ac64b4c879de99229e5568c080..77e9759a7e558e7c50e1164070921e57fecae6bc 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -37,9 +37,6 @@
 */
 /* }}} */
 
 */
 /* }}} */
 

-#define _GNU_SOURCE
-
-#include <substrate.h>

 #include "cycript.hpp"
 
 #include <cstdio>
 #include "cycript.hpp"
 
 #include <cstdio>


@@ -65,6 +62,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/un.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/un.h>

+#include <pwd.h>
+
+#include <apr_getopt.h>

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


@@ -95,6 +95,7 @@ static void sigint(int) {
 static bool bison_;
 #endif
 static bool strict_;
 static bool bison_;
 #endif
 static bool strict_;

+static bool pretty_;

 
 void Setup(CYDriver &driver, cy::parser &parser) {
 #if YYDEBUG
 
 void Setup(CYDriver &driver, cy::parser &parser) {
 #if YYDEBUG


@@ -105,27 +106,38 @@ void Setup(CYDriver &driver, cy::parser &parser) {
         driver.strict_ = true;
 }
 
         driver.strict_ = true;
 }
 

-void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
+void Setup(CYOutput &out, CYDriver &driver) {
+    out.pretty_ = pretty_;
+
+    CYContext context(driver.pool_);
+    driver.program_->Replace(context);
+}
+
+void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {

     CYPool pool;
 
     const char *json;
     CYPool pool;
 
     const char *json;

-    if (socket == -1) {
+    if (client == -1) {

         mode_ = Running;
         mode_ = Running;

+#ifdef CY_EXECUTE

         json = CYExecute(pool, data);
         json = CYExecute(pool, data);

+#else
+        json = NULL;
+#endif

         mode_ = Working;
         if (json != NULL)
             size = strlen(json);
     } else {
         mode_ = Sending;
         mode_ = Working;
         if (json != NULL)
             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;
         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]);
         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;
         }
             temp[size] = '\0';
             json = temp;
         }


@@ -158,11 +170,24 @@ 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(int socket) {
+static void Console(apr_pool_t *pool, int client) {
+    passwd *passwd;
+    if (const char *username = getenv("LOGNAME"))
+        passwd = getpwnam(username);
+    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);
+
+    mkdir(basedir, 0700);
+    read_history(histfile);
+

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


@@ -216,6 +241,7 @@ static void Console(int socket) {
                     fflush(fout);
                 }
                 add_history(line);
                     fflush(fout);
                 }
                 add_history(line);

+                ++histlines;

                 goto restart;
             }
         }
                 goto restart;
             }
         }


@@ -256,7 +282,7 @@ static void Console(int socket) {
                             std::cerr << lines[begin.line - 1] << std::endl;
                         }
 
                             std::cerr << lines[begin.line - 1] << std::endl;
                         }
 

-                        std::cerr << "  | ";
+                        std::cerr << "....";

                         for (size_t i(0); i != begin.column - 1; ++i)
                             std::cerr << '.';
                         if (begin.line != end.line || begin.column == end.column)
                         for (size_t i(0); i != begin.column - 1; ++i)
                             std::cerr << '.';
                         if (begin.line != end.line || begin.column == end.column)


@@ -269,6 +295,7 @@ static void Console(int socket) {
                         std::cerr << error->message_ << std::endl;
 
                         add_history(command.c_str());
                         std::cerr << error->message_ << std::endl;
 
                         add_history(command.c_str());

+                        ++histlines;

                         goto restart;
                     }
                 }
                         goto restart;
                     }
                 }


@@ -283,24 +310,29 @@ static void Console(int socket) {
             if (driver.program_ == NULL)
                 goto restart;
 
             if (driver.program_ == NULL)
                 goto restart;
 

-            if (socket != -1)
+            if (client != -1)

                 code = command;
             else {
                 std::ostringstream str;
                 CYOutput out(str);
                 code = command;
             else {
                 std::ostringstream str;
                 CYOutput out(str);

-                driver.program_->Multiple(out);
+                Setup(out, driver);
+                out << *driver.program_;

                 code = str.str();
             }
         }
 
         add_history(command.c_str());
                 code = str.str();
             }
         }
 
         add_history(command.c_str());

+        ++histlines;

 
         if (debug)
             std::cout << code << std::endl;
 
 
         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);
+

     fputs("\n", fout);
     fflush(fout);
 }
     fputs("\n", fout);
     fflush(fout);
 }


@@ -322,52 +354,138 @@ static void *Map(const char *path, size_t *psize) {
     return base;
 }
 
     return base;
 }
 

-int main(int argc, char *argv[]) {
+void InjectLibrary(pid_t pid);
+
+int Main(int argc, char const * const argv[], char const * const envp[]) {

     bool tty(isatty(STDIN_FILENO));
     bool tty(isatty(STDIN_FILENO));

-    pid_t pid(_not(pid_t));

     bool compile(false);
 
     bool compile(false);
 

-    for (;;) switch (getopt(argc, argv, "cg:p:s")) {
-        case -1:
-            goto getopt;
-        case '?':
-            fprintf(stderr, "usage: cycript [-c] [-p <pid>] [<script> [<arg>...]]\n");
-            return 1;
+#ifdef CY_ATTACH
+    pid_t pid(_not(pid_t));
+#endif
+
+    CYPool pool;
+    apr_getopt_t *state;
+    _aprcall(apr_getopt_init(&state, pool, argc, argv));

 
 

-        case 'c':
-            compile = true;
-        break;
+    for (;;) {
+        char opt;
+        const char *arg;

 
 

-        case 'g':
-            if (false);
-#if YYDEBUG
-            else if (strcmp(optarg, "bison") == 0)
-                bison_ = true;
+        apr_status_t status(apr_getopt(state,
+            "cg:n:"
+#ifdef CY_ATTACH
+            "p:"

 #endif
 #endif

-            else {
-                fprintf(stderr, "invalid name for -g\n");
-                return 1;
-            }
-        break;
-
-        case 'p': {
-            size_t size(strlen(optarg));
-            char *end;
-            pid = strtoul(optarg, &end, 0);
-            if (optarg + size != end) {
-                fprintf(stderr, "invalid pid for -p\n");
+            "s"
+        , &opt, &arg));
+
+        switch (status) {
+            case APR_EOF:
+                goto getopt;
+            case APR_BADCH:
+            case APR_BADARG:
+                fprintf(stderr,
+                    "usage: cycript [-c]"
+#ifdef CY_ATTACH
+                    " [-p <pid|name>]"
+#endif
+                    " [<script> [<arg>...]]\n"
+                );

                 return 1;
                 return 1;

-            }
-        } break;
+            default:
+                _aprcall(status);
+        }
+
+        switch (opt) {
+            case 'c':
+                compile = true;
+            break;

 
 

-        case 's':
-            strict_ = true;
-        break;
+            case 'g':
+                if (false);
+#if YYDEBUG
+                else if (strcmp(arg, "bison") == 0)
+                    bison_ = true;
+#endif
+                else {
+                    fprintf(stderr, "invalid name for -g\n");
+                    return 1;
+                }
+            break;
+
+            case 'n':
+                if (false);
+                else if (strcmp(arg, "minify") == 0)
+                    pretty_ = true;
+                else {
+                    fprintf(stderr, "invalid name for -n\n");
+                    return 1;
+                }
+            break;
+
+#ifdef CY_ATTACH
+            case 'p': {
+                size_t size(strlen(arg));
+                char *end;
+
+                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));
+
+                    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
+
+            case 's':
+                strict_ = true;
+            break;
+        }

     } getopt:;
 
     const char *script;
     } getopt:;
 
     const char *script;

+    int ind(state->ind);

 
 

-    if (pid != _not(pid_t) && optind < argc - 1) {
+#ifdef CY_ATTACH
+    if (pid != _not(pid_t) && ind < argc - 1) {

         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }
         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }


@@ -376,39 +494,63 @@ int main(int argc, char *argv[]) {
         fprintf(stderr, "-p conflicts with -c\n");
         return 1;
     }
         fprintf(stderr, "-p conflicts with -c\n");
         return 1;
     }

+#endif

 
 

-    if (optind == argc)
+    if (ind == argc)

         script = NULL;
     else {
         script = NULL;
     else {

+#ifdef CY_EXECUTE

         // XXX: const_cast?! wtf gcc :(
         // XXX: const_cast?! wtf gcc :(

-        CYSetArgs(argc - optind - 1, const_cast<const char **>(argv + optind + 1));
-        script = argv[optind];
+        CYSetArgs(argc - ind - 1, const_cast<const char **>(argv + ind + 1));
+#endif
+        script = argv[ind];

         if (strcmp(script, "-") == 0)
             script = NULL;
     }
 
         if (strcmp(script, "-") == 0)
             script = NULL;
     }
 

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

         return 1;
     }
         return 1;
     }

+#endif

 
 

-    int socket;
+    int client;

 
 

+#ifdef CY_ATTACH

     if (pid == _not(pid_t))
     if (pid == _not(pid_t))

-        socket = -1;
+        client = -1;

     else {
     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
+    client = -1;
+#endif

 
     if (script == NULL && tty)
 
     if (script == NULL && tty)

-        Console(socket);
+        Console(pool, client);

     else {
         CYDriver driver(script ?: "<stdin>");
         cy::parser parser(driver);
     else {
         CYDriver driver(script ?: "<stdin>");
         cy::parser parser(driver);


@@ -443,19 +585,34 @@ int main(int argc, char *argv[]) {
             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)
             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);
+            if (client != -1)
+                Run(client, start, end - start, stdout);

             else {
                 std::ostringstream str;
                 CYOutput out(str);
             else {
                 std::ostringstream str;
                 CYOutput out(str);

-                driver.program_->Multiple(out);
+                Setup(out, driver);
+                out << *driver.program_;

                 std::string code(str.str());
                 if (compile)
                     std::cout << code;
                 else
                 std::string code(str.str());
                 if (compile)
                     std::cout << code;
                 else

-                    Run(socket, code);
+                    Run(client, code, stdout);

             }
     }
 
     return 0;
 }
             }
     }
 
     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;
+    }
+}