diff --git a/tool/net/help.txt b/tool/net/help.txt index 8bc370b89..efd5b8ef9 100644 --- a/tool/net/help.txt +++ b/tool/net/help.txt @@ -46,8 +46,6 @@ FLAGS -b log message bodies -a log resource usage -g log handler latency - -e eval Lua code in arg - -F eval Lua code in file -E show crash reports to public ips -j enable ssl client verify -k disable ssl fetch verify @@ -62,6 +60,8 @@ FLAGS -v increase verbosity [repeatable] -V increase ssl verbosity [repeatable] -S increase pledge sandboxing [repeatable] + -e CODE eval Lua code in arg [repeatable] + -F PATH eval Lua code in file [repeatable] -H K:V sets http header globally [repeatable] -D DIR overlay assets in local directory [repeatable] -r /X=/Y redirect X to Y [repeatable] diff --git a/tool/net/redbean.c b/tool/net/redbean.c index efe10604a..f73d9c494 100644 --- a/tool/net/redbean.c +++ b/tool/net/redbean.c @@ -1166,22 +1166,24 @@ static void LogLuaError(char *hook, char *err) { ERRORF("(lua) failed to run %s: %s", hook, err); } -static bool LuaEvalCode(const char *code) { +// handles `-e CODE` (frontloads web server code) +// handles `-i -e CODE` (interprets expression and exits) +static void LuaEvalCode(const char *code) { lua_State *L = GL; int status = luaL_loadstring(L, code); if (status != LUA_OK || LuaCallWithTrace(L, 0, 0, NULL) != LUA_OK) { LogLuaError("lua code", lua_tostring(L, -1)); lua_pop(L, 1); // pop error - return false; + exit(1); } AssertLuaStackIsAt(L, 0); - return true; } -static bool LuaEvalFile(const char *path) { +// handle `-F PATH` arg +static void LuaEvalFile(const char *path) { char *f = _gc(xslurp(path, 0)); if (!f) FATALF("(cfg) error: failed to read file %`'s", path); - return LuaEvalCode(f); + LuaEvalCode(f); } static bool LuaOnClientConnection(void) { @@ -7256,6 +7258,7 @@ static void TlsDestroy(void) { static void GetOpts(int argc, char *argv[]) { int opt; + bool got_e_arg = false; bool storeasset = false; // only generate ecp cert under blinkenlights (rsa is slow) norsagen = IsGenuineBlink(); @@ -7304,11 +7307,14 @@ static void GetOpts(int argc, char *argv[]) { break; #endif #ifndef STATIC - CASE('e', LuaEvalCode(optarg)); CASE('F', LuaEvalFile(optarg)); CASE('*', selfmodifiable = true); CASE('i', interpretermode = true); CASE('E', leakcrashreports = true); + case 'e': + got_e_arg = true; + LuaEvalCode(optarg); + break; case 'A': if (!storeasset) { storeasset = true; @@ -7332,6 +7338,8 @@ static void GetOpts(int argc, char *argv[]) { } // if storing asset(s) is requested, don't need to continue if (storeasset) exit(0); + // we don't want to drop into a repl after using -e in -i mode + if (interpretermode && got_e_arg) exit(0); } void RedBean(int argc, char *argv[]) {