diff --git a/src/sbbs3/js_system.c b/src/sbbs3/js_system.c index a8410b7092e034f2f3a2caee338140d5f4e01f19..2f564590dfba28084435dbbfe3fb9659bf6b942e 100644 --- a/src/sbbs3/js_system.c +++ b/src/sbbs3/js_system.c @@ -397,17 +397,17 @@ static JSBool js_system_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) static JSBool js_system_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp) { - jsval idval; - jsint tiny; - js_system_private_t* sys; if ((sys = (js_system_private_t*)js_GetClassPrivate(cx, obj, &js_system_class)) == NULL) return JS_FALSE; +#ifndef JSDOOR + jsval idval; + jsint tiny; + JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); -#ifndef JSDOOR switch (tiny) { case SYS_PROP_MISC: JS_ValueToECMAUint32(cx, *vp, (uint32_t*)&sys->cfg->sys_misc); diff --git a/src/sbbs3/jsexec.c b/src/sbbs3/jsexec.c index 7ae52656b3b4bc7d1d79ef90dbcf4c79291ec8c3..0f2558ab2a894f198327c96127a1df31feb7e184 100644 --- a/src/sbbs3/jsexec.c +++ b/src/sbbs3/jsexec.c @@ -126,8 +126,8 @@ void usage() #else " -c<ctrl_dir> specify path to Synchronet CTRL directory\n" " -R require successful load of configuration files\n" -#endif " -C do not change the current working directory (to CTRL dir)\n" +#endif #if defined(__unix__) " -d run in background (daemonize)\n" #endif @@ -1208,9 +1208,11 @@ int main(int argc, char **argv) ulong exec_count = 0; bool loop = false; bool nonbuffered_con = false; +#ifndef JSDOOR bool change_cwd = true; FILE* fp; char ini_fname[MAX_PATH + 1]; +#endif str_list_t ini = NULL; #ifdef __unix__ struct sigaction sa = {0}; @@ -1377,9 +1379,11 @@ int main(int argc, char **argv) confp = errfp; } break; +#ifndef JSDOOR case 'C': change_cwd = false; break; +#endif #if defined(__unix__) case 'd': daemonize = true;