r8452: allow for the ugly hack:

[jra/samba/.git] / source4 / scripting / ejs / smbscript.c

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index f7556b53840bb3d68e9ff3a21dc77eab3012e162..d71d0847792fa79ed898251b73b4ed3057812053 100644 (file)
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -22,9 +22,9 @@
 */
 
 #include "includes.h"
-#include "lib/cmdline/popt_common.h"
 #include "dynconfig.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
+#include "scripting/ejs/smbcalls.h"
 
 void ejs_exception(const char *reason)
 {
@@ -42,37 +42,20 @@ void ejs_exception(const char *reason)
        TALLOC_CTX *mem_ctx = talloc_new(NULL);
        const char **argv_list = NULL;
        const char *fname;
-       struct MprVar v, *return_var;
+       struct MprVar *return_var;
        int exit_status, i;
-       poptContext pc;
-       int opt;
-       struct poptOption long_options[] = {
-               POPT_AUTOHELP
-               POPT_COMMON_SAMBA
-               POPT_COMMON_CREDENTIALS
-               POPT_COMMON_VERSION
-               POPT_TABLEEND
-       };
-
-       popt_common_dont_ask();
-
-       pc = poptGetContext("smbscript", argc, argv, long_options, 0);
-
-       poptSetOtherOptionHelp(pc, "<script> <args> ...");
-
-       while((opt = poptGetNextOpt(pc)) != -1) /* noop */ ;
 
        smbscript_init_subsystems;
-
        mprSetCtx(mem_ctx);
 
-       argv = poptGetArgs(pc);
-       if (argv == NULL ||
-           argv[0] == NULL) {
-               poptPrintUsage(pc, stdout, 0);
+       lp_load(dyn_CONFIGFILE);
+
+       if (argc < 2) {
+               fprintf(stderr, "You must supply a script name\n");
                exit(1);
        }
-       fname = argv[0];
+
+       fname = argv[1];
 
        if (ejsOpen(NULL, NULL, NULL) != 0) {
                fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
@@ -95,22 +78,20 @@ void ejs_exception(const char *reason)
                argv_list = str_list_add(argv_list, argv[i]);
        }
        talloc_steal(mem_ctx, argv_list);
-       v = mprList("ARGV", argv_list);
-       mprSetPropertyValue(&v, "length", mprCreateIntegerVar(i-1));
-       mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
+       mprSetVar(ejsGetGlobalObject(eid), "ARGV", mprList("ARGV", argv_list));
 
        /* load the script and advance past interpreter line*/
        script = file_load(fname, &script_size, mem_ctx);
 
-       if ((script_size > 2) && script[0] == '#' && script[1] == '!') {
-               script += 2;
-               script_size -= 2;
-               while (script_size) {
-                       if (*script == '\r' || *script == '\n')
-                               break;
-                       script++;
-                       script_size--;
-               }
+       /* allow scriptable js */
+       if (strncmp(script, "#!", 2) == 0) {
+               script += strcspn(script, "\r\n");
+               script += strspn(script, "\r\n");
+       }
+       /* and this copes with the ugly exec hack */
+       if (strncmp(script, "exec ", 5) == 0) {
+               script += strcspn(script, "\r\n");
+               script += strspn(script, "\r\n");
        }
 
        /* run the script */
@@ -120,7 +101,7 @@ void ejs_exception(const char *reason)
        }
 
        return_var = ejsGetReturnValue(eid);
-       exit_status = return_var->integer;
+       exit_status = mprVarToNumber(return_var);
 
        ejsClose();