-/* Cycript - Remove Execution Server and Disassembler
+/* Cycript - Inlining/Optimizing JavaScript Compiler
* Copyright (C) 2009 Jay Freeman (saurik)
*/
#include "cycript.hpp"
+#ifdef CY_EXECUTE
+#include "JavaScript.hpp"
+#endif
+
#include <cstdio>
#include <sstream>
#include <apr_getopt.h>
+#include <dlfcn.h>
+
static volatile enum {
Working,
Parsing,
driver.strict_ = true;
}
-void Setup(CYOutput &out, CYDriver &driver) {
+void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) {
out.pretty_ = pretty_;
-
- CYContext context(driver.pool_);
+ CYContext context(driver.pool_, options);
driver.program_->Replace(context);
}
-void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
+void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
CYPool pool;
const char *json;
- if (socket == -1) {
+ if (client == -1) {
mode_ = Running;
#ifdef CY_EXECUTE
json = CYExecute(pool, data);
size = strlen(json);
} else {
mode_ = Sending;
- CYSendAll(socket, &size, sizeof(size));
- CYSendAll(socket, data, size);
+ CYSendAll(client, &size, sizeof(size));
+ CYSendAll(client, data, size);
mode_ = Waiting;
- CYRecvAll(socket, &size, sizeof(size));
+ CYRecvAll(client, &size, sizeof(size));
if (size == _not(size_t))
json = NULL;
else {
char *temp(new(pool) char[size + 1]);
- CYRecvAll(socket, temp, size);
+ CYRecvAll(client, temp, size);
temp[size] = '\0';
json = temp;
}
}
}
-void Run(int socket, std::string &code, FILE *fout = NULL, bool expand = false) {
- Run(socket, code.c_str(), code.size(), fout, expand);
+void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false) {
+ Run(client, code.c_str(), code.size(), fout, expand);
}
-static void Console(apr_pool_t *pool, int socket) {
+int (*append_history$)(int, const char *);
+
+static void Console(apr_pool_t *pool, int client, CYOptions &options) {
passwd *passwd;
if (const char *username = getenv("LOGNAME"))
passwd = getpwnam(username);
mode_ = Working;
if (line == NULL)
break;
+ if (line[0] == '\0')
+ goto read;
if (!extra) {
extra = true;
if (driver.program_ == NULL)
goto restart;
- if (socket != -1)
+ if (client != -1)
code = command;
else {
std::ostringstream str;
- CYOutput out(str);
- Setup(out, driver);
+ CYOutput out(str, options);
+ Setup(out, driver, options);
out << *driver.program_;
code = str.str();
}
if (debug)
std::cout << code << std::endl;
- Run(socket, code, fout, expand);
+ Run(client, code, fout, expand);
}
- _syscall(close(_syscall(open(histfile, O_CREAT | O_WRONLY, 0600))));
- append_history(histlines, histfile);
+ 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);
int Main(int argc, char const * const argv[], char const * const envp[]) {
bool tty(isatty(STDIN_FILENO));
bool compile(false);
+ CYOptions options;
+
+ append_history$ = reinterpret_cast<int (*)(int, const char *)>(dlsym(RTLD_DEFAULT, "append_history"));
#ifdef CY_ATTACH
pid_t pid(_not(pid_t));
case 'g':
if (false);
+ else if (strcmp(arg, "rename") == 0)
+ options.verbose_ = true;
#if YYDEBUG
else if (strcmp(arg, "bison") == 0)
bison_ = true;
size += read;
if (size == sizeof(value)) {
pid = _not(pid_t);
- goto pclose;
+ goto fail;
}
}
}
size:
if (size == 0)
- goto pclose;
+ goto fail;
if (value[size - 1] == '\n') {
--size;
goto size;
value[size] = '\0';
size = strlen(value);
pid = strtoul(value, &end, 0);
- if (value + size != end)
+ if (value + size != end) fail:
pid = _not(pid_t);
-
- pclose:
_syscall(pclose(pids));
}
}
#endif
- int socket;
+ int client;
#ifdef CY_ATTACH
if (pid == _not(pid_t))
- socket = -1;
+ client = -1;
else {
- InjectLibrary(pid);
-
- socket = _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", pid);
-
- _syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
+ 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;
+ }
+ } catch (...) {
+ _syscall(close(server));
+ throw;
+ }
}
#else
- socket = -1;
+ client = -1;
#endif
if (script == NULL && tty)
- Console(pool, socket);
+ Console(pool, client, options);
else {
CYDriver driver(script ?: "<stdin>");
cy::parser parser(driver);
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 (socket != -1)
- Run(socket, start, end - start, stdout);
- else {
+ if (client != -1) {
+ std::string code(start, end-start);
+ Run(client, code, stdout);
+ } else {
std::ostringstream str;
- CYOutput out(str);
- Setup(out, driver);
+ CYOutput out(str, options);
+ Setup(out, driver, options);
out << *driver.program_;
std::string code(str.str());
if (compile)
std::cout << code;
else
- Run(socket, code, stdout);
+ Run(client, code, stdout);
}
}
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;
projects / cycript.git / blobdiff