X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/9cad30fab188a57c3db8df0912a1691099468e64..3fc53550b37bd61d5e4fde77f71c71976b105041:/Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 44cadc7..c2c46f9 100644
--- a/Console.cpp
+++ b/Console.cpp
@@ -1,40 +1,22 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
 */
 
-/* Modified BSD License {{{ */
+/* GNU General Public License, Version 3 {{{ */
 /*
- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * 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.
  *
- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
+ * 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.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/
 /* }}} */
 
 #include "cycript.hpp"
@@ -44,23 +26,31 @@
 #endif
 
 #include <cstdio>
+#include <fstream>
 #include <sstream>
 
 #include <setjmp.h>
 
+#ifdef HAVE_READLINE_H
+#include <readline.h>
+#else
 #include <readline/readline.h>
-#include <readline/history.h>
+#endif
 
-#include <sys/mman.h>
+#ifdef HAVE_HISTORY_H
+#include <history.h>
+#else
+#include <readline/history.h>
+#endif
 
 #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>
@@ -69,9 +59,17 @@
 #include <pwd.h>
 
 #include <apr_getopt.h>
+#include <apr_pools.h>
+#include <apr_strings.h>
 
 #include <dlfcn.h>
 
+#include "Display.hpp"
+#include "Replace.hpp"
+
+#include "Cycript.tab.hh"
+#include "Driver.hpp"
+
 static volatile enum {
     Working,
     Parsing,
@@ -112,97 +110,344 @@ void Setup(CYDriver &driver, cy::parser &parser) {
         driver.strict_ = true;
 }
 
-void Setup(CYOutput &out, CYDriver &driver) {
+void Setup(CYOutput &out, CYDriver &driver, CYOptions &options, bool lower) {
     out.pretty_ = pretty_;
-
-    CYContext context(driver.pool_);
-    driver.program_->Replace(context);
+    CYContext context(options);
+    if (lower)
+        driver.program_->Replace(context);
 }
 
-void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
-    CYPool pool;
-
+static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     const char *json;
+    uint32_t size;
+
     if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE
-        json = CYExecute(pool, data);
+        json = CYExecute(CYGetJSContext(), pool, code);
 #else
         json = NULL;
 #endif
         mode_ = Working;
-        if (json != NULL)
+        if (json == NULL)
+            size = 0;
+        else
             size = strlen(json);
     } else {
         mode_ = Sending;
-        CYSendAll(client, &size, sizeof(size));
-        CYSendAll(client, data, size);
+        size = code.size;
+        _assert(CYSendAll(client, &size, sizeof(size)));
+        _assert(CYSendAll(client, code.data, code.size));
         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]);
-            CYRecvAll(client, temp, size);
+            _assert(CYRecvAll(client, temp, size));
             temp[size] = '\0';
             json = temp;
         }
         mode_ = Working;
     }
 
-    if (json != NULL && fout != NULL) {
-        if (!expand || json[0] != '"' && json[0] != '\'')
-            fputs(json, fout);
-        else for (size_t i(0); i != size; ++i)
-            if (json[i] != '\\')
-                fputc(json[i], fout);
-            else switch(json[++i]) {
-                case '\0': goto done;
-                case '\\': fputc('\\', fout); break;
-                case '\'': fputc('\'', fout); break;
-                case '"': fputc('"', fout); break;
-                case 'b': fputc('\b', fout); break;
-                case 'f': fputc('\f', fout); break;
-                case 'n': fputc('\n', fout); break;
-                case 'r': fputc('\r', fout); break;
-                case 't': fputc('\t', fout); break;
-                case 'v': fputc('\v', fout); break;
-                default: fputc('\\', fout); --i; break;
-            }
+    return CYUTF8String(json, size);
+}
 
-      done:
-        fputs("\n", fout);
-        fflush(fout);
-    }
+static CYUTF8String Run(CYPool &pool, int client, const std::string &code) {
+    return Run(pool, client, CYUTF8String(code.c_str(), code.size()));
+}
+
+static std::ostream *out_;
+
+static void Write(bool syntax, const char *data, size_t size, std::ostream &out) {
+    if (syntax)
+        CYLexerHighlight(data, size, out);
+    else
+        out.write(data, size);
+}
+
+static void Output(bool syntax, CYUTF8String json, std::ostream *out, bool expand = false) {
+    const char *data(json.data);
+    size_t size(json.size);
+
+    if (data == NULL || out == NULL)
+        return;
+
+    if (!expand ||
+        data[0] != '@' && data[0] != '"' && data[0] != '\'' ||
+        data[0] == '@' && data[1] != '"' && data[1] != '\''
+    )
+        Write(syntax, data, size, *out);
+    else for (size_t i(0); i != size; ++i)
+        if (data[i] != '\\')
+            *out << data[i];
+        else switch(data[++i]) {
+            case '\0': goto done;
+            case '\\': *out << '\\'; break;
+            case '\'': *out << '\''; break;
+            case '"': *out << '"'; break;
+            case 'b': *out << '\b'; break;
+            case 'f': *out << '\f'; break;
+            case 'n': *out << '\n'; break;
+            case 'r': *out << '\r'; break;
+            case 't': *out << '\t'; break;
+            case 'v': *out << '\v'; break;
+            default: *out << '\\'; --i; break;
+        }
+
+  done:
+    *out << std::endl;
 }
 
-void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false) {
-    Run(client, code.c_str(), code.size(), fout, expand);
+static void Run(int client, bool syntax, const char *data, size_t size, std::ostream *out = NULL, bool expand = false) {
+    CYPool pool;
+    Output(syntax, Run(pool, client, CYUTF8String(data, size)), out, expand);
+}
+
+static void Run(int client, bool syntax, std::string &code, std::ostream *out = NULL, bool expand = false) {
+    Run(client, syntax, code.c_str(), code.size(), out, expand);
 }
 
 int (*append_history$)(int, const char *);
 
-static void Console(apr_pool_t *pool, int client) {
+static std::string command_;
+
+static CYExpression *ParseExpression(CYUTF8String code) {
+    std::stringstream stream;
+    stream << '(' << code << ')';
+    CYDriver driver(stream);
+
+    cy::parser parser(driver);
+    Setup(driver, parser);
+
+    if (parser.parse() != 0 || !driver.errors_.empty())
+        return NULL;
+
+    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);
+
+    return NULL;
+}
+
+static int client_;
+
+static char **Complete(const char *word, int start, int end) {
+    rl_attempted_completion_over = TRUE;
+
+    CYLocalPool pool;
+
+    std::string line(rl_line_buffer, start);
+    std::istringstream stream(command_ + line);
+    CYDriver driver(stream);
+
+    driver.auto_ = true;
+
+    cy::parser parser(driver);
+    Setup(driver, parser);
+
+    if (parser.parse() != 0 || !driver.errors_.empty())
+        return NULL;
+
+    if (driver.mode_ == CYDriver::AutoNone)
+        return NULL;
+
+    CYExpression *expression;
+
+    CYOptions options;
+    CYContext context(options);
+
+    std::ostringstream prefix;
+
+    switch (driver.mode_) {
+        case CYDriver::AutoPrimary:
+            expression = $ CYThis();
+        break;
+
+        case CYDriver::AutoDirect:
+            expression = driver.context_;
+        break;
+
+        case CYDriver::AutoIndirect:
+            expression = $ CYIndirect(driver.context_);
+        break;
+
+        case CYDriver::AutoMessage: {
+            CYDriver::Context &thing(driver.contexts_.back());
+            expression = $M($C1($V("object_getClass"), thing.context_), $S("messages"));
+            for (CYDriver::Context::Words::const_iterator part(thing.words_.begin()); part != thing.words_.end(); ++part)
+                prefix << (*part)->word_ << ':';
+        } break;
+
+        default:
+            _assert(false);
+    }
+
+    std::string begin(prefix.str());
+
+    driver.program_ = $ CYProgram($ CYExpress($C3(ParseExpression(
+    "   function(object, prefix, word) {\n"
+    "       var names = [];\n"
+    "       var before = prefix.length;\n"
+    "       prefix += word;\n"
+    "       var entire = prefix.length;\n"
+    "       for (name in object)\n"
+    "           if (name.substring(0, entire) == prefix)\n"
+    "               names.push(name.substr(before));\n"
+    "       return names;\n"
+    "   }\n"
+    ), expression, $S(begin.c_str()), $S(word))));
+
+    driver.program_->Replace(context);
+
+    std::ostringstream str;
+    CYOutput out(str, options);
+    out << *driver.program_;
+
+    std::string code(str.str());
+    CYUTF8String json(Run(pool, client_, code));
+    // XXX: if this fails we should not try to parse it
+
+    CYExpression *result(ParseExpression(json));
+    if (result == NULL)
+        return NULL;
+
+    CYArray *array(dynamic_cast<CYArray *>(result));
+
+    if (array == NULL) {
+        *out_ << '\n';
+        Output(false, json, out_);
+        rl_forced_update_display();
+        return NULL;
+    }
+
+    // XXX: use an std::set?
+    typedef std::vector<std::string> Completions;
+    Completions completions;
+
+    std::string common;
+    bool rest(false);
+
+    CYForEach (element, array->elements_) {
+        CYString *string(dynamic_cast<CYString *>(element->value_));
+        _assert(string != NULL);
+
+        std::string completion;
+        if (string->size_ != 0)
+            completion.assign(string->value_, string->size_);
+        else if (driver.mode_ == CYDriver::AutoMessage)
+            completion = "]";
+        else
+            continue;
+
+        completions.push_back(completion);
+
+        if (!rest) {
+            common = completion;
+            rest = true;
+        } else {
+            size_t limit(completion.size()), size(common.size());
+            if (size > limit)
+                common = common.substr(0, limit);
+            else
+                limit = size;
+            for (limit = 0; limit != size; ++limit)
+                if (common[limit] != completion[limit])
+                    break;
+            if (limit != size)
+                common = common.substr(0, limit);
+        }
+    }
+
+    size_t count(completions.size());
+    if (count == 0)
+        return NULL;
+
+    size_t colon(common.find(':'));
+    if (colon != std::string::npos)
+        common = common.substr(0, colon + 1);
+    if (completions.size() == 1)
+        common += ' ';
+
+    char **results(reinterpret_cast<char **>(malloc(sizeof(char *) * (count + 2))));
+
+    results[0] = strdup(common.c_str());
+    size_t index(0);
+    for (Completions::const_iterator i(completions.begin()); i != completions.end(); ++i)
+        results[++index] = strdup(i->c_str());
+    results[count + 1] = NULL;
+
+    return results;
+}
+
+// need char *, not const char *
+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;
+
     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);
+    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);
 
-    FILE *fout(stdout);
+    out_ = &std::cout;
 
-    rl_bind_key('\t', rl_insert);
+    // rl_completer_word_break_characters is broken in libedit
+    rl_basic_word_break_characters = break_;
+
+    rl_completer_word_break_characters = break_;
+    rl_attempted_completion_function = &Complete;
+    rl_bind_key('\t', rl_complete);
 
     struct sigaction action;
     sigemptyset(&action.sa_mask);
@@ -211,7 +456,7 @@ static void Console(apr_pool_t *pool, int client) {
     sigaction(SIGINT, &action, NULL);
 
     restart: for (;;) {
-        std::string command;
+        command_.clear();
         std::vector<std::string> lines;
 
         bool extra(false);
@@ -219,18 +464,27 @@ static void Console(apr_pool_t *pool, int client) {
 
         if (setjmp(ctrlc_) != 0) {
             mode_ = Working;
-            fputs("\n", fout);
-            fflush(fout);
+            *out_ << std::endl;
             goto restart;
         }
 
       read:
+
+#if RL_READLINE_VERSION >= 0x0600
+        if (syntax)
+            rl_redisplay_function = CYDisplayUpdate;
+        else
+            rl_redisplay_function = rl_redisplay;
+#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) {
@@ -239,24 +493,35 @@ static void Console(apr_pool_t *pool, int client) {
                 std::string data(line + 1);
                 if (data == "bypass") {
                     bypass = !bypass;
-                    fprintf(fout, "bypass == %s\n", bypass ? "true" : "false");
-                    fflush(fout);
+                    *out_ << "bypass == " << (bypass ? "true" : "false") << std::endl;
                 } else if (data == "debug") {
                     debug = !debug;
-                    fprintf(fout, "debug == %s\n", debug ? "true" : "false");
-                    fflush(fout);
+                    *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;
-                    fprintf(fout, "expand == %s\n", expand ? "true" : "false");
-                    fflush(fout);
+                    *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;
             }
         }
 
-        command += line;
+        command_ += line;
 
         char *begin(line), *end(line + strlen(line));
         while (char *nl = reinterpret_cast<char *>(memchr(begin, '\n', end - begin))) {
@@ -272,19 +537,20 @@ static void Console(apr_pool_t *pool, int client) {
         std::string code;
 
         if (bypass)
-            code = command;
+            code = command_;
         else {
-            CYDriver driver("");
+            CYLocalPool pool;
+
+            std::istringstream stream(command_);
+            CYDriver driver(stream);
+
             cy::parser parser(driver);
             Setup(driver, parser);
 
-            driver.data_ = command.c_str();
-            driver.size_ = command.size();
-
             if (parser.parse() != 0 || !driver.errors_.empty()) {
                 for (CYDriver::Errors::const_iterator error(driver.errors_.begin()); error != driver.errors_.end(); ++error) {
                     cy::position begin(error->location_.begin);
-                    if (begin.line != lines.size() || begin.column - 1 != lines.back().size() || error->warning_) {
+                    if (begin.line != lines.size() || begin.column < lines.back().size() || error->warning_) {
                         cy::position end(error->location_.end);
 
                         if (begin.line != lines.size()) {
@@ -293,7 +559,7 @@ static void Console(apr_pool_t *pool, int client) {
                         }
 
                         std::cerr << "....";
-                        for (size_t i(0); i != begin.column - 1; ++i)
+                        for (size_t i(0); i != begin.column; ++i)
                             std::cerr << '.';
                         if (begin.line != end.line || begin.column == end.column)
                             std::cerr << '^';
@@ -304,15 +570,14 @@ static void Console(apr_pool_t *pool, int client) {
                         std::cerr << "  | ";
                         std::cerr << error->message_ << std::endl;
 
-                        add_history(command.c_str());
-                        ++histlines;
+                        history += command_;
                         goto restart;
                     }
                 }
 
                 driver.errors_.clear();
 
-                command += '\n';
+                command_ += '\n';
                 prompt = "cy> ";
                 goto read;
             }
@@ -320,67 +585,46 @@ static void Console(apr_pool_t *pool, int client) {
             if (driver.program_ == NULL)
                 goto restart;
 
-            if (client != -1)
-                code = command;
-            else {
-                std::ostringstream str;
-                CYOutput out(str);
-                Setup(out, driver);
-                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 << code << std::endl;
+        if (debug) {
+            std::cout << "cy= ";
+            Write(syntax, code.c_str(), code.size(), std::cout);
+            std::cout << std::endl;
+        }
 
-        Run(client, code, fout, 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);
-    }
-
-    fputs("\n", fout);
-    fflush(fout);
-}
-
-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);
 
 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;
 
-    append_history$ = reinterpret_cast<int (*)(int, const char *)>(dlsym(RTLD_DEFAULT, "append_history"));
+    append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history"));
 
 #ifdef CY_ATTACH
     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));
 
@@ -393,6 +637,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 #ifdef CY_ATTACH
             "p:"
 #endif
+            "r:"
             "s"
         , &opt, &arg));
 
@@ -406,6 +651,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;
@@ -420,6 +666,8 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
             case 'g':
                 if (false);
+                else if (strcmp(arg, "rename") == 0)
+                    options.verbose_ = true;
 #if YYDEBUG
                 else if (strcmp(arg, "bison") == 0)
                     bison_ = true;
@@ -448,7 +696,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
-                    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];
@@ -460,10 +708,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;
-                                }
                             }
                         }
 
@@ -484,13 +730,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;
 #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;
@@ -531,11 +798,9 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     }
 #endif
 
-    int client;
-
 #ifdef CY_ATTACH
     if (pid == _not(pid_t))
-        client = -1;
+        client_ = -1;
     else {
         int server(_syscall(socket(PF_UNIX, SOCK_STREAM, 0))); try {
             struct sockaddr_un address;
@@ -550,7 +815,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
             try {
                 _syscall(listen(server, 1));
                 InjectLibrary(pid);
-                client = _syscall(accept(server, NULL, NULL));
+                client_ = _syscall(accept(server, NULL, NULL));
             } catch (...) {
                 // XXX: exception?
                 unlink(address.sun_path);
@@ -562,61 +827,73 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
         }
     }
 #else
-    client = -1;
+    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(pool, client);
+        Console(options);
     else {
-        CYDriver driver(script ?: "<stdin>");
-        cy::parser parser(driver);
-        Setup(driver, parser);
-
-        char *start, *end;
+        CYLocalPool pool;
 
+        std::istream *stream;
         if (script == NULL) {
-            start = NULL;
-            end = NULL;
-
-            driver.file_ = stdin;
+            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;
-            }
-
-            driver.data_ = start;
-            driver.size_ = end - start;
+            stream = new std::fstream(script, std::ios::in | std::ios::binary);
+            _assert(!stream->fail());
         }
 
+        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) {
-                std::string code(start, end-start);
-                Run(client, code, stdout);
-            } else {
-                std::ostringstream str;
-                CYOutput out(str);
-                Setup(out, driver);
-                out << *driver.program_;
-                std::string code(str.str());
-                if (compile)
-                    std::cout << code;
-                else
-                    Run(client, code, stdout);
-            }
+        } 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);
+        }
     }
 
+    apr_pool_destroy(pool);
+
     return 0;
 }