Correct "error: taking address of temporary array".

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index c2a87610698f34a2dfd0fde79623cc7fd99df59b..2b68eddeed2ec07106383cb3fca261fd54e8bad1 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -26,6 +26,7 @@
 #endif
 
 #include <cstdio>
 #endif
 
 #include <cstdio>

+#include <fstream>

 #include <sstream>
 
 #include <setjmp.h>
 #include <sstream>
 
 #include <setjmp.h>


@@ -42,16 +43,16 @@
 #include <readline/history.h>
 #endif
 
 #include <readline/history.h>
 #endif
 

-#include <sys/mman.h>
-

 #include <errno.h>
 #include <errno.h>

+#include <getopt.h>
+#include <signal.h>

 #include <unistd.h>
 
 #include <unistd.h>
 

+#include <sys/socket.h>

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.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>
 
 #include <sys/types.h>
 #include <sys/socket.h>


@@ -59,14 +60,13 @@
 #include <sys/un.h>
 #include <pwd.h>
 
 #include <sys/un.h>
 #include <pwd.h>
 

-#include <apr_getopt.h>
-#include <apr_pools.h>
-#include <apr_strings.h>
-

 #include <dlfcn.h>
 
 #include <dlfcn.h>
 

-#include "Replace.hpp"

 #include "Display.hpp"
 #include "Display.hpp"

+#include "Replace.hpp"
+
+#include "Cycript.tab.hh"
+#include "Driver.hpp"

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


@@ -108,20 +108,21 @@ void Setup(CYDriver &driver, cy::parser &parser) {
         driver.strict_ = true;
 }
 
         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);
     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) {
     const char *json;
 }
 
 static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     const char *json;

-    size_t size;
+    uint32_t size;

 
     if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE
 
     if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE

-        json = CYExecute(pool, code);
+        json = CYExecute(CYGetJSContext(), pool, code);

 #else
         json = NULL;
 #endif
 #else
         json = NULL;
 #endif


@@ -133,15 +134,15 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     } else {
         mode_ = Sending;
         size = code.size;
     } 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;
         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]);
             json = NULL;
         else {
             char *temp(new(pool) char[size + 1]);

-            CYRecvAll(client, temp, size);
+            _assert(CYRecvAll(client, temp, size));

             temp[size] = '\0';
             json = temp;
         }
             temp[size] = '\0';
             json = temp;
         }


@@ -224,17 +225,20 @@ static CYExpression *ParseExpression(CYUTF8String code) {
     CYOptions options;
     CYContext context(options);
 
     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);
+
+    CYExpress *express(dynamic_cast<CYExpress *>(driver.program_->statements_));
+    _assert(express != NULL);

 
 

-    return NULL;
+    return express->expression_;

 }
 
 static int client_;
 
 static char **Complete(const char *word, int start, int end) {
 }
 
 static int client_;
 
 static char **Complete(const char *word, int start, int end) {

-    rl_attempted_completion_over = TRUE;
+    rl_attempted_completion_over = ~0;

 
     CYLocalPool pool;
 
 
     CYLocalPool pool;
 


@@ -292,7 +296,7 @@ static char **Complete(const char *word, int start, int end) {
     "       var before = prefix.length;\n"
     "       prefix += word;\n"
     "       var entire = prefix.length;\n"
     "       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"
     "           if (name.substring(0, entire) == prefix)\n"
     "               names.push(name.substr(before));\n"
     "       return names;\n"


@@ -313,8 +317,7 @@ static char **Complete(const char *word, int start, int end) {
     if (result == NULL)
         return NULL;
 
     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_);
     if (array == NULL) {
         *out_ << '\n';
         Output(false, json, out_);


@@ -385,6 +388,35 @@ static char **Complete(const char *word, int start, int end) {
 static char name_[] = "cycript";
 static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]";
 
 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) {
+            int fd(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600)));
+            _syscall(close(fd));
+            _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;
 
 static void Console(CYOptions &options) {
     CYPool pool;
 


@@ -394,19 +426,19 @@ static void Console(CYOptions &options) {
     else
         passwd = getpwuid(getuid());
 
     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_;
 
 
     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 bypass(false);
     bool debug(false);
     bool expand(false);

+    bool lower(true);

     bool syntax(true);
 
     out_ = &std::cout;
     bool syntax(true);
 
     out_ = &std::cout;


@@ -440,24 +472,20 @@ static void Console(CYOptions &options) {
       read:
 
 #if RL_READLINE_VERSION >= 0x0600
       read:
 
 #if RL_READLINE_VERSION >= 0x0600

-        if (syntax) {
-            rl_prep_term_function = CYDisplayStart;
+        if (syntax)

             rl_redisplay_function = CYDisplayUpdate;
             rl_redisplay_function = CYDisplayUpdate;

-            rl_deprep_term_function = CYDisplayFinish;
-        } else {
-            rl_prep_term_function = rl_prep_terminal;
+        else

             rl_redisplay_function = rl_redisplay;
             rl_redisplay_function = rl_redisplay;

-            rl_deprep_term_function = rl_deprep_terminal;
-        }

 #endif
 
         mode_ = Parsing;
         char *line(readline(prompt));
         mode_ = Working;
 
 #endif
 
         mode_ = Parsing;
         char *line(readline(prompt));
         mode_ = Working;
 

-        if (line == NULL)
+        if (line == NULL) {
+            *out_ << std::endl;

             break;
             break;

-        if (line[0] == '\0')
+        } else if (line[0] == '\0')

             goto read;
 
         if (!extra) {
             goto read;
 
         if (!extra) {


@@ -470,15 +498,26 @@ static void Console(CYOptions &options) {
                 } else if (data == "debug") {
                     debug = !debug;
                     *out_ << "debug == " << (debug ? "true" : "false") << std::endl;
                 } 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 == "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;
                 }
                 } else if (data == "syntax") {
                     syntax = !syntax;
                     *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl;
                 }

-                add_history(line);
-                ++histlines;
+                command_ = line;
+                history += command_;

                 goto restart;
             }
         }
                 goto restart;
             }
         }


@@ -532,8 +571,7 @@ static void Console(CYOptions &options) {
                         std::cerr << "  | ";
                         std::cerr << error->message_ << std::endl;
 
                         std::cerr << "  | ";
                         std::cerr << error->message_ << std::endl;
 

-                        add_history(command_.c_str());
-                        ++histlines;
+                        history += command_;

                         goto restart;
                     }
                 }
                         goto restart;
                     }
                 }


@@ -548,65 +586,31 @@ static void Console(CYOptions &options) {
             if (driver.program_ == NULL)
                 goto restart;
 
             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) {
 
         if (debug) {

+            std::cout << "cy= ";

             Write(syntax, code.c_str(), code.size(), std::cout);
             std::cout << std::endl;
         }
 
         Run(client_, syntax, code, out_, expand);
     }
             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);
 
 }
 
 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);
-
+int Main(int argc, char * const argv[], char const * const envp[]) {

     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
     bool tty(isatty(STDIN_FILENO));
     bool compile(false);

+    bool target(false);

     CYOptions options;
 
     append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history"));
     CYOptions options;
 
     append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history"));


@@ -615,49 +619,71 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     pid_t pid(_not(pid_t));
 #endif
 
     pid_t pid(_not(pid_t));
 #endif
 

-    apr_getopt_t *state;
-    _aprcall(apr_getopt_init(&state, pool, argc, argv));
+    const char *host(NULL);
+    const char *port(NULL);

 
 

-    for (;;) {
-        char opt;
-        const char *arg;
+    optind = 1;

 
 

-        apr_status_t status(apr_getopt(state,
-            "cg:n:"
+    for (;;) {
+        int option(getopt_long(argc, argv,
+            "c"
+            "g:"
+            "n:"

 #ifdef CY_ATTACH
             "p:"
 #endif
 #ifdef CY_ATTACH
             "p:"
 #endif

+            "r:"

             "s"
             "s"

-        , &opt, &arg));
+        , (const struct option[]) {
+            {NULL, no_argument, NULL, 'c'},
+            {NULL, required_argument, NULL, 'g'},
+            {NULL, required_argument, NULL, 'n'},
+#ifdef CY_ATTACH
+            {NULL, required_argument, NULL, 'p'},
+#endif
+            {NULL, required_argument, NULL, 'r'},
+            {NULL, no_argument, NULL, 's'},
+        {0, 0, 0, 0}}, NULL));

 
 

-        switch (status) {
-            case APR_EOF:
+        switch (option) {
+            case -1:

                 goto getopt;
                 goto getopt;

-            case APR_BADCH:
-            case APR_BADARG:
+
+            case ':':
+            case '?':

                 fprintf(stderr,
                     "usage: cycript [-c]"
 #ifdef CY_ATTACH
                     " [-p <pid|name>]"
 #endif
                 fprintf(stderr,
                     "usage: cycript [-c]"
 #ifdef CY_ATTACH
                     " [-p <pid|name>]"
 #endif

+                    " [-r <host:port>]"

                     " [<script> [<arg>...]]\n"
                 );
                 return 1;
                     " [<script> [<arg>...]]\n"
                 );
                 return 1;

-            default:
-                _aprcall(status);
-        }

 
 

-        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;
             case 'c':
                 compile = true;

-            break;
+            goto target;

 
             case 'g':
                 if (false);
 
             case 'g':
                 if (false);

-                else if (strcmp(arg, "rename") == 0)
+                else if (strcmp(optarg, "rename") == 0)

                     options.verbose_ = true;
 #if YYDEBUG
                     options.verbose_ = true;
 #if YYDEBUG

-                else if (strcmp(arg, "bison") == 0)
+                else if (strcmp(optarg, "bison") == 0)

                     bison_ = true;
 #endif
                 else {
                     bison_ = true;
 #endif
                 else {


@@ -668,7 +694,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
             case 'n':
                 if (false);
 
             case 'n':
                 if (false);

-                else if (strcmp(arg, "minify") == 0)
+                else if (strcmp(optarg, "minify") == 0)

                     pretty_ = true;
                 else {
                     fprintf(stderr, "invalid name for -n\n");
                     pretty_ = true;
                 else {
                     fprintf(stderr, "invalid name for -n\n");


@@ -678,13 +704,15 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
 
 #ifdef CY_ATTACH
             case 'p': {
 
 #ifdef CY_ATTACH
             case 'p': {

-                size_t size(strlen(arg));
+                size_t size(strlen(optarg));

                 char *end;
 
                 char *end;
 

-                pid = strtoul(arg, &end, 0);
-                if (arg + size != end) {
+                pid = strtoul(optarg, &end, 0);
+                if (optarg + size != end) {

                     // XXX: arg needs to be escaped in some horrendous way of doom
                     // XXX: arg needs to be escaped in some horrendous way of doom

-                    const char *command(apr_pstrcat(pool, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^", arg, " /{s/^[^ ]* //;q;};};d'", NULL));
+                    // XXX: this is a memory leak now because I just don't care enough
+                    char *command;
+                    asprintf(&command, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^%s /{s/^[^ ]* //;q;};};d'", optarg);

 
                     if (FILE *pids = popen(command, "r")) {
                         char value[32];
 
                     if (FILE *pids = popen(command, "r")) {
                         char value[32];


@@ -696,10 +724,8 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                                 break;
                             else {
                                 size += read;
                                 break;
                             else {
                                 size += read;

-                                if (size == sizeof(value)) {
-                                    pid = _not(pid_t);
+                                if (size == sizeof(value))

                                     goto fail;
                                     goto fail;

-                                }

                             }
                         }
 
                             }
                         }
 


@@ -720,154 +746,187 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                     }
 
                     if (pid == _not(pid_t)) {
                     }
 
                     if (pid == _not(pid_t)) {

-                        fprintf(stderr, "invalid pid for -p\n");
+                        fprintf(stderr, "unable to find process `%s' using ps\n", optarg);

                         return 1;
                     }
                 }
                         return 1;
                     }
                 }

-            } break;
+            } goto target;

 #endif
 
 #endif
 

+            case 'r': {
+                //size_t size(strlen(optarg));
+
+                char *colon(strrchr(optarg, ':'));
+                if (colon == NULL) {
+                    fprintf(stderr, "missing colon in hostspec\n");
+                    return 1;
+                }
+
+                /*char *end;
+                port = strtoul(colon + 1, &end, 10);
+                if (end != optarg + size) {
+                    fprintf(stderr, "invalid port in hostspec\n");
+                    return 1;
+                }*/
+
+                host = optarg;
+                *colon = '\0';
+                port = colon + 1;
+            } goto target;
+

             case 's':
                 strict_ = true;
             break;
             case 's':
                 strict_ = true;
             break;

+
+            default:
+                _assert(false);

         }
         }

-    } getopt:;
+    }
+
+  getopt:
+    argc -= optind;
+    argv += optind;

 
     const char *script;
 
     const char *script;

-    int ind(state->ind);

 
 #ifdef CY_ATTACH
 
 #ifdef CY_ATTACH

-    if (pid != _not(pid_t) && ind < argc - 1) {
+    if (pid != _not(pid_t) && argc > 1) {

         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }
         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
 
 #endif
 

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

         script = NULL;
     else {
 #ifdef CY_EXECUTE
         // XXX: const_cast?! wtf gcc :(
         script = NULL;
     else {
 #ifdef CY_EXECUTE
         // XXX: const_cast?! wtf gcc :(

-        CYSetArgs(argc - ind - 1, const_cast<const char **>(argv + ind + 1));
+        CYSetArgs(argc - 1, const_cast<const char **>(argv + 1));

 #endif
 #endif

-        script = argv[ind];
+        script = argv[0];

         if (strcmp(script, "-") == 0)
             script = NULL;
     }
 
         if (strcmp(script, "-") == 0)
             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 {
 #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
 
     }
 #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;
 
     if (script == NULL && tty)
         Console(options);
     else {
         CYLocalPool pool;
 

-        char *start, *end;
-        std::istream *indirect;
-
+        std::istream *stream;

         if (script == NULL) {
         if (script == NULL) {

-            start = NULL;
-            end = NULL;
-            indirect = &std::cin;
+            stream = &std::cin;
+            script = "<stdin>";

         } else {
         } 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;
         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);
                 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);
-

     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 {
+int main(int argc, char * const argv[], char const * const envp[]) {
+    try {

         return Main(argc, argv, envp);
     } catch (const CYException &error) {
         CYPool pool;
         return Main(argc, argv, envp);
     } catch (const CYException &error) {
         CYPool pool;