X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/2e2ed904884fa1dc0a0670364d44cdc3dc9a0775..a93f15c0bc99a80cc7dbe2f43f53ca3f2d7f64a3:/Console.cpp diff --git a/Console.cpp b/Console.cpp index d407948..e955311 100644 --- a/Console.cpp +++ b/Console.cpp @@ -1,20 +1,20 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2012 Jay Freeman (saurik) + * Copyright (C) 2009-2013 Jay Freeman (saurik) */ -/* GNU Lesser General Public License, Version 3 {{{ */ +/* GNU 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 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. * - * 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. + * 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. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with Cycript. If not, see . **/ /* }}} */ @@ -60,10 +60,13 @@ #include #include +#include +#include #include #include "Replace.hpp" +#include "Display.hpp" static volatile enum { Working, @@ -113,7 +116,7 @@ void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) { static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) { const char *json; - size_t size; + uint32_t size; if (client == -1) { mode_ = Running; @@ -134,7 +137,7 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) { CYSendAll(client, code.data, code.size); mode_ = Waiting; CYRecvAll(client, &size, sizeof(size)); - if (size == _not(size_t)) + if (size == _not(uint32_t)) json = NULL; else { char *temp(new(pool) char[size + 1]); @@ -154,7 +157,14 @@ static CYUTF8String Run(CYPool &pool, int client, const std::string &code) { static std::ostream *out_; -static void Output(CYUTF8String json, std::ostream *out, bool expand = false) { +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); @@ -165,7 +175,7 @@ static void Output(CYUTF8String json, std::ostream *out, bool expand = false) { data[0] != '@' && data[0] != '"' && data[0] != '\'' || data[0] == '@' && data[1] != '"' && data[1] != '\'' ) - out->write(data, size); + Write(syntax, data, size, *out); else for (size_t i(0); i != size; ++i) if (data[i] != '\\') *out << data[i]; @@ -187,13 +197,13 @@ static void Output(CYUTF8String json, std::ostream *out, bool expand = false) { *out << std::endl; } -static void Run(int client, const char *data, size_t size, std::ostream *out = NULL, bool expand = false) { +static void Run(int client, bool syntax, const char *data, size_t size, std::ostream *out = NULL, bool expand = false) { CYPool pool; - Output(Run(pool, client, CYUTF8String(data, size)), out, expand); + Output(syntax, Run(pool, client, CYUTF8String(data, size)), out, expand); } -static void Run(int client, std::string &code, std::ostream *out = NULL, bool expand = false) { - Run(client, code.c_str(), code.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 *); @@ -307,7 +317,7 @@ static char **Complete(const char *word, int start, int end) { if (array == NULL) { *out_ << '\n'; - Output(json, out_); + Output(false, json, out_); rl_forced_update_display(); return NULL; } @@ -384,8 +394,8 @@ static void Console(CYOptions &options) { else passwd = getpwuid(getuid()); - const char *basedir(apr_psprintf(pool, "%s/.cycript", passwd->pw_dir)); - const char *histfile(apr_psprintf(pool, "%s/history", basedir)); + const char *basedir(pool.strcat(passwd->pw_dir, "/.cycript", NULL)); + const char *histfile(pool.strcat(basedir, "/history", NULL)); size_t histlines(0); rl_initialize(); @@ -397,6 +407,7 @@ static void Console(CYOptions &options) { bool bypass(false); bool debug(false); bool expand(false); + bool syntax(true); out_ = &std::cout; @@ -427,9 +438,23 @@ static void Console(CYOptions &options) { } read: + +#if RL_READLINE_VERSION >= 0x0600 + if (syntax) { + rl_prep_term_function = CYDisplayStart; + rl_redisplay_function = CYDisplayUpdate; + rl_deprep_term_function = CYDisplayFinish; + } else { + rl_prep_term_function = rl_prep_terminal; + rl_redisplay_function = rl_redisplay; + rl_deprep_term_function = rl_deprep_terminal; + } +#endif + mode_ = Parsing; char *line(readline(prompt)); mode_ = Working; + if (line == NULL) break; if (line[0] == '\0') @@ -448,6 +473,9 @@ static void Console(CYOptions &options) { } else if (data == "expand") { expand = !expand; *out_ << "expand == " << (expand ? "true" : "false") << std::endl; + } else if (data == "syntax") { + syntax = !syntax; + *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl; } add_history(line); ++histlines; @@ -534,10 +562,12 @@ static void Console(CYOptions &options) { add_history(command_.c_str()); ++histlines; - if (debug) - std::cout << code << std::endl; + if (debug) { + Write(syntax, code.c_str(), code.size(), std::cout); + std::cout << std::endl; + } - Run(client_, code, out_, expand); + Run(client_, syntax, code, out_, expand); } if (append_history$ != NULL) { @@ -570,6 +600,11 @@ static void *Map(const char *path, size_t *psize) { 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; @@ -580,7 +615,6 @@ 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)); @@ -650,7 +684,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]; @@ -808,7 +842,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { if (client_ != -1) { // XXX: this code means that you can't pipe to another process std::string code(start, end-start); - Run(client_, code, &std::cout); + Run(client_, false, code, &std::cout); } else { std::ostringstream str; CYOutput out(str, options); @@ -818,10 +852,12 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { if (compile) std::cout << code; else - Run(client_, code, &std::cout); + Run(client_, false, code, &std::cout); } } + apr_pool_destroy(pool); + return 0; }