*/
/* }}} */
-#define _GNU_SOURCE
-
-#include <substrate.h>
#include "cycript.hpp"
#include <cstdio>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/un.h>
+#include <pwd.h>
+
+#include <apr_getopt.h>
static volatile enum {
Working,
}
}
-void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
+#if YYDEBUG
+static bool bison_;
+#endif
+static bool strict_;
+static bool pretty_;
+
+void Setup(CYDriver &driver, cy::parser &parser) {
+#if YYDEBUG
+ if (bison_)
+ parser.set_debug_level(1);
+#endif
+ if (strict_)
+ driver.strict_ = true;
+}
+
+void Setup(CYOutput &out, CYDriver &driver) {
+ out.pretty_ = pretty_;
+
+ CYContext context(driver.pool_);
+ driver.program_->Replace(context);
+}
+
+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);
+#else
+ json = NULL;
+#endif
mode_ = Working;
if (json != NULL)
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(int socket) {
+static void Console(apr_pool_t *pool, int client) {
+ passwd *passwd;
+ if (const char *username = getenv("LOGNAME"))
+ passwd = getpwnam(username);
+ 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);
+
+ mkdir(basedir, 0700);
+ read_history(histfile);
+
bool bypass(false);
bool debug(false);
bool expand(false);
fflush(fout);
}
add_history(line);
+ ++histlines;
goto restart;
}
}
command += line;
- for (char *state, *token(apr_strtok(line, "\n", &state)); token != NULL; token = apr_strtok(NULL, "\n", &state))
- lines.push_back(token);
+
+ char *begin(line), *end(line + strlen(line));
+ while (char *nl = reinterpret_cast<char *>(memchr(begin, '\n', end - begin))) {
+ *nl = '\0';
+ lines.push_back(begin);
+ begin = nl + 1;
+ }
+
+ lines.push_back(begin);
+
free(line);
std::string code;
else {
CYDriver driver("");
cy::parser parser(driver);
- //parser.set_debug_level(1);
+ Setup(driver, parser);
driver.data_ = command.c_str();
driver.size_ = command.size();
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);
- if (begin.line != lines.size() || begin.column - 1 != lines.back().size()) {
+ if (begin.line != lines.size() || begin.column - 1 != lines.back().size() || error->warning_) {
cy::position end(error->location_.end);
if (begin.line != lines.size()) {
std::cerr << lines[begin.line - 1] << std::endl;
}
- std::cerr << " | ";
+ std::cerr << "....";
for (size_t i(0); i != begin.column - 1; ++i)
std::cerr << '.';
if (begin.line != end.line || begin.column == end.column)
std::cerr << error->message_ << std::endl;
add_history(command.c_str());
+ ++histlines;
goto restart;
}
}
goto read;
}
- if (driver.source_ == NULL)
+ if (driver.program_ == NULL)
goto restart;
- if (socket != -1)
+ if (client != -1)
code = command;
else {
std::ostringstream str;
- driver.source_->Show(str);
+ CYOutput out(str);
+ Setup(out, driver);
+ out << *driver.program_;
code = str.str();
}
}
add_history(command.c_str());
+ ++histlines;
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);
+
fputs("\n", fout);
fflush(fout);
}
return base;
}
-int main(int argc, char *argv[]) {
+void InjectLibrary(pid_t pid);
+
+int Main(int argc, char const * const argv[], char const * const envp[]) {
bool tty(isatty(STDIN_FILENO));
- pid_t pid(_not(pid_t));
bool compile(false);
- for (;;) switch (getopt(argc, argv, "cp:")) {
- case -1:
- goto getopt;
- case '?':
- fprintf(stderr, "usage: cycript [-c] [-p <pid>] [<script> [<arg>...]]\n");
- return 1;
-
- case 'c':
- compile = true;
- break;
-
- case 'p': {
- size_t size(strlen(optarg));
- char *end;
- pid = strtoul(optarg, &end, 0);
- if (optarg + size != end) {
- fprintf(stderr, "invalid pid for -p\n");
+#ifdef CY_ATTACH
+ pid_t pid(_not(pid_t));
+#endif
+
+ CYPool pool;
+ apr_getopt_t *state;
+ _aprcall(apr_getopt_init(&state, pool, argc, argv));
+
+ for (;;) {
+ char opt;
+ const char *arg;
+
+ apr_status_t status(apr_getopt(state,
+ "cg:n:"
+#ifdef CY_ATTACH
+ "p:"
+#endif
+ "s"
+ , &opt, &arg));
+
+ switch (status) {
+ case APR_EOF:
+ goto getopt;
+ case APR_BADCH:
+ case APR_BADARG:
+ fprintf(stderr,
+ "usage: cycript [-c]"
+#ifdef CY_ATTACH
+ " [-p <pid|name>]"
+#endif
+ " [<script> [<arg>...]]\n"
+ );
return 1;
- }
- } break;
+ default:
+ _aprcall(status);
+ }
+
+ switch (opt) {
+ case 'c':
+ compile = true;
+ break;
+
+ case 'g':
+ if (false);
+#if YYDEBUG
+ else if (strcmp(arg, "bison") == 0)
+ bison_ = true;
+#endif
+ else {
+ fprintf(stderr, "invalid name for -g\n");
+ return 1;
+ }
+ break;
+
+ case 'n':
+ if (false);
+ else if (strcmp(arg, "minify") == 0)
+ pretty_ = true;
+ else {
+ fprintf(stderr, "invalid name for -n\n");
+ return 1;
+ }
+ break;
+
+#ifdef CY_ATTACH
+ case 'p': {
+ size_t size(strlen(arg));
+ char *end;
+
+ 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));
+
+ if (FILE *pids = popen(command, "r")) {
+ char value[32];
+ size = 0;
+
+ for (;;) {
+ size_t read(fread(value + size, 1, sizeof(value) - size, pids));
+ if (read == 0)
+ break;
+ else {
+ size += read;
+ if (size == sizeof(value)) {
+ pid = _not(pid_t);
+ goto fail;
+ }
+ }
+ }
+
+ size:
+ if (size == 0)
+ 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) fail:
+ pid = _not(pid_t);
+ _syscall(pclose(pids));
+ }
+
+ if (pid == _not(pid_t)) {
+ fprintf(stderr, "invalid pid for -p\n");
+ return 1;
+ }
+ }
+ } break;
+#endif
+
+ case 's':
+ strict_ = true;
+ break;
+ }
} getopt:;
const char *script;
+ int ind(state->ind);
- if (pid != _not(pid_t) && optind < argc - 1) {
+#ifdef CY_ATTACH
+ if (pid != _not(pid_t) && ind < argc - 1) {
fprintf(stderr, "-p cannot set argv\n");
return 1;
}
fprintf(stderr, "-p conflicts with -c\n");
return 1;
}
+#endif
- if (optind == argc)
+ if (ind == argc)
script = NULL;
else {
+#ifdef CY_EXECUTE
// XXX: const_cast?! wtf gcc :(
- CYSetArgs(argc - optind - 1, const_cast<const char **>(argv + optind + 1));
- script = argv[optind];
+ CYSetArgs(argc - ind - 1, const_cast<const char **>(argv + ind + 1));
+#endif
+ script = argv[ind];
if (strcmp(script, "-") == 0)
script = NULL;
}
- if (script == NULL && !tty && pid != _not(pid_t)) {
- fprintf(stderr, "non-terminal attaching to remove console\n");
+#ifdef CY_ATTACH
+ if (pid != _not(pid_t) && script == NULL && !tty) {
+ fprintf(stderr, "non-terminal attaching to remote console\n");
return 1;
}
+#endif
- int socket;
+ int client;
+#ifdef CY_ATTACH
if (pid == _not(pid_t))
- socket = -1;
+ client = -1;
else {
- 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
+ client = -1;
+#endif
if (script == NULL && tty)
- Console(socket);
+ Console(pool, client);
else {
CYDriver driver(script ?: "<stdin>");
cy::parser parser(driver);
+ Setup(driver, parser);
char *start, *end;
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.source_ != NULL)
- if (socket != -1)
- Run(socket, start, end - start, stdout);
+ } else if (driver.program_ != NULL)
+ if (client != -1)
+ Run(client, start, end - start, stdout);
else {
std::ostringstream str;
- driver.source_->Show(str);
+ CYOutput out(str);
+ Setup(out, driver);
+ out << *driver.program_;
std::string code(str.str());
if (compile)
std::cout << code;
else
- Run(socket, code);
+ Run(client, code, stdout);
}
}
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 {
+ return Main(argc, argv, envp);
+ } catch (const CYException &error) {
+ CYPool pool;
+ fprintf(stderr, "%s\n", error.PoolCString(pool));
+ return 1;
+ }
+}
projects / cycript.git / blobdiff