/* 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 <http://www.gnu.org/licenses/>.
**/
/* }}} */
#endif
#include <cstdio>
+#include <fstream>
#include <sstream>
#include <setjmp.h>
#include <readline/history.h>
#endif
-#include <sys/mman.h>
-
#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>
#include <pwd.h>
#include <apr_getopt.h>
+#include <apr_pools.h>
+#include <apr_strings.h>
#include <dlfcn.h>
-#include "Replace.hpp"
#include "Display.hpp"
+#include "Replace.hpp"
+
+#include "Cycript.tab.hh"
+#include "Driver.hpp"
static volatile enum {
Working,
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
} 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;
}
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;
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_;
-#if RL_READLINE_VERSION >= 0x0600
- rl_prep_term_function = CYDisplayStart;
- rl_redisplay_function = CYDisplayUpdate;
- rl_deprep_term_function = CYDisplayFinish;
-#endif
-
- mkdir(basedir, 0700);
- read_history(histfile);
+ History history(basedir + "/history");
bool bypass(false);
bool debug(false);
bool expand(false);
- bool syntax(false);
+ bool lower(true);
+ bool syntax(true);
out_ = &std::cout;
}
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) {
} 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;
}
}
std::cerr << " | ";
std::cerr << error->message_ << std::endl;
- add_history(command_.c_str());
- ++histlines;
+ history += command_;
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) {
Write(syntax, code.c_str(), code.size(), std::cout);
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);
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;
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));
#ifdef CY_ATTACH
"p:"
#endif
+ "r:"
"s"
, &opt, &arg));
#ifdef CY_ATTACH
" [-p <pid|name>]"
#endif
+ " [-r <host:port>]"
" [<script> [<arg>...]]\n"
);
return 1;
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];
} 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;
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);
- }
+ }
}
+ apr_pool_destroy(pool);
+
return 0;
}
projects / cycript.git / blobdiff