X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/cd98d28056cd736c9493d73efd0c00861e6b3490..def9084602162fbc6081fadd247ad50a78ad0bce:/Console.cpp diff --git a/Console.cpp b/Console.cpp index 642cc20..a7e0929 100644 --- a/Console.cpp +++ b/Console.cpp @@ -1,21 +1,21 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2012 Jay Freeman (saurik) + * Copyright (C) 2009-2015 Jay Freeman (saurik) */ -/* GNU Lesser General Public License, Version 3 {{{ */ +/* GNU Affero General Public License, Version 3 {{{ */ /* - * Cycript is free software: you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * 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 Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Cycript. If not, see <http://www.gnu.org/licenses/>. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program 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 Affero General Public License for more details. + + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. **/ /* }}} */ @@ -26,6 +26,7 @@ #endif #include <cstdio> +#include <fstream> #include <sstream> #include <setjmp.h> @@ -42,16 +43,16 @@ #include <readline/history.h> #endif -#include <sys/mman.h> - #include <errno.h> +#include <getopt.h> +#include <signal.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> @@ -59,12 +60,13 @@ #include <sys/un.h> #include <pwd.h> -#include <apr_getopt.h> - #include <dlfcn.h> -#include "Replace.hpp" #include "Display.hpp" +#include "Replace.hpp" + +#include "Cycript.tab.hh" +#include "Driver.hpp" static volatile enum { Working, @@ -83,7 +85,8 @@ static void sigint(int) { case Parsing: longjmp(ctrlc_, 1); case Running: - throw "*** Ctrl-C"; + CYCancel(); + return; case Sending: return; case Waiting: @@ -106,20 +109,21 @@ void Setup(CYDriver &driver, cy::parser &parser) { 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); - driver.program_->Replace(context); + if (lower) + driver.program_->Replace(context); } 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 - json = CYExecute(pool, code); + json = CYExecute(CYGetJSContext(), pool, code); #else json = NULL; #endif @@ -131,15 +135,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)); - 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; } @@ -222,17 +226,20 @@ static CYExpression *ParseExpression(CYUTF8String code) { 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) { - rl_attempted_completion_over = TRUE; + rl_attempted_completion_over = ~0; CYLocalPool pool; @@ -290,7 +297,7 @@ static char **Complete(const char *word, int start, int end) { " 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" @@ -311,8 +318,7 @@ static char **Complete(const char *word, int start, int end) { 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_); @@ -383,28 +389,60 @@ static char **Complete(const char *word, int start, int end) { static char name_[] = "cycript"; static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]"; -static void Console(CYOptions &options) { - CYPool pool; +class History { + private: + std::string histfile_; + size_t histlines_; + + public: + History(std::string histfile) : + histfile_(histfile), + histlines_(0) + { + read_history(histfile_.c_str()); + } - passwd *passwd; - if (const char *username = getenv("LOGNAME")) - passwd = getpwnam(username); - else - passwd = getpwuid(getuid()); + ~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); + } + } - const char *basedir(apr_psprintf(pool, "%s/.cycript", passwd->pw_dir)); - const char *histfile(apr_psprintf(pool, "%s/history", basedir)); - size_t histlines(0); + void operator +=(const std::string &command) { + add_history(command_.c_str()); + ++histlines_; + } +}; + +static void Console(CYOptions &options) { + std::string basedir; + if (const char *home = getenv("HOME")) + basedir = home; + else { + passwd *passwd; + if (const char *username = getenv("LOGNAME")) + passwd = getpwnam(username); + else + passwd = getpwuid(getuid()); + 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); out_ = &std::cout; @@ -438,24 +476,20 @@ static void Console(CYOptions &options) { read: #if RL_READLINE_VERSION >= 0x0600 - if (syntax) { - rl_prep_term_function = CYDisplayStart; + if (syntax) rl_redisplay_function = CYDisplayUpdate; - rl_deprep_term_function = CYDisplayFinish; - } else { - rl_prep_term_function = rl_prep_terminal; + else rl_redisplay_function = rl_redisplay; - rl_deprep_term_function = rl_deprep_terminal; - } #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) { @@ -468,15 +502,26 @@ static void Console(CYOptions &options) { } 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 == "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; } } @@ -509,9 +554,9 @@ static void Console(CYOptions &options) { 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); + CYPosition begin(error->location_.begin); if (begin.line != lines.size() || begin.column < lines.back().size() || error->warning_) { - cy::position end(error->location_.end); + CYPosition end(error->location_.end); if (begin.line != lines.size()) { std::cerr << " | "; @@ -530,8 +575,7 @@ static void Console(CYOptions &options) { std::cerr << " | "; std::cerr << error->message_ << std::endl; - add_history(command_.c_str()); - ++histlines; + history += command_; goto restart; } } @@ -546,60 +590,31 @@ static void Console(CYOptions &options) { 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) { + std::cout << "cy= "; 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)); +void InjectLibrary(pid_t, int, const char *[]); - 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[]) { +int Main(int argc, char * const argv[], char const * const envp[]) { bool tty(isatty(STDIN_FILENO)); bool compile(false); + bool target(false); CYOptions options; append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history")); @@ -608,50 +623,71 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { pid_t pid(_not(pid_t)); #endif - CYPool pool; - 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 + "r:" "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; - case APR_BADCH: - case APR_BADARG: + + case ':': + case '?': fprintf(stderr, "usage: cycript [-c]" #ifdef CY_ATTACH " [-p <pid|name>]" #endif + " [-r <host:port>]" " [<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; - break; + goto target; case 'g': if (false); - else if (strcmp(arg, "rename") == 0) + else if (strcmp(optarg, "rename") == 0) options.verbose_ = true; #if YYDEBUG - else if (strcmp(arg, "bison") == 0) + else if (strcmp(optarg, "bison") == 0) bison_ = true; #endif else { @@ -662,7 +698,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { 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"); @@ -672,13 +708,15 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { #ifdef CY_ATTACH case 'p': { - size_t size(strlen(arg)); + size_t size(strlen(optarg)); 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 - const char *command(apr_psprintf(pool, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^%s /{s/^[^ ]* //;q;};};d'", arg)); + // 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]; @@ -690,10 +728,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; - } } } @@ -714,152 +750,194 @@ 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", optarg); return 1; } } - } break; + } goto target; #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; + + default: + _assert(false); } - } getopt:; + } + + getopt: + argc -= optind; + argv += optind; const char *script; - int ind(state->ind); #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; } - - if (pid != _not(pid_t) && compile) { - fprintf(stderr, "-p conflicts with -c\n"); - return 1; - } #endif - if (ind == argc) + if (argc == 0) 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 - script = argv[ind]; + script = argv[0]; 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 { - 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; + + const char *tmp; +#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__)) + tmp = "/Library/Caches"; +#else + tmp = "/tmp"; +#endif + + sprintf(address.sun_path, "%s/.s.cy.%u", tmp, 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, 1, (const char *[]) {address.sun_path, NULL}); + client_ = _syscall(accept(server, NULL, NULL)); } #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; - char *start, *end; - std::istream *indirect; - + std::istream *stream; if (script == NULL) { - start = NULL; - end = NULL; - indirect = &std::cin; + 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; - } - - 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; - } 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); - } 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); - } + } } 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;