r9800: Add EJS interface to param. tridge, sorry this overlaps a bit

[sfrench/samba-autobuild/.git] / source4 / scripting / ejs / smbcalls.c

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index ff57eff1290a2cab83de2105442ae63c66f814dc..d0ce1366a512407b59116dc43191ee75299c00c8 100644 (file)
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
 
 /*
@@ -45,7 +45,7 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
                { MPR_TYPE_FUNCTION,         "function" },
                { MPR_TYPE_STRING,           "string" },
                { MPR_TYPE_STRING_CFUNCTION, "function" },
-               { MPR_TYPE_PTR,              "C pointer" }
+               { MPR_TYPE_PTR,              "pointer" }
        };
        int i;
        const char *type = NULL;
@@ -64,6 +64,52 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
        return 0;
 }
 
+/*
+  libinclude() allows you to include js files using a search path specified
+  in "js include =" in smb.conf. 
+*/
+static int ejs_libinclude(int eid, int argc, char **argv)
+{
+       int i, j;
+       const char **js_include = lp_js_include();
+
+       if (js_include == NULL || js_include[0] == NULL) {
+               ejsSetErrorMsg(eid, "js include path not set");
+               return -1;
+       }
+
+       for (i = 0; i < argc; i++) {
+               const char *script = argv[i];
+
+               for (j=0;js_include[j];j++) {
+                       char *path;
+                       path = talloc_asprintf(mprMemCtx(), "%s/%s", js_include[j], script);
+                       if (path == NULL) {
+                               return -1;
+                       }
+                       if (file_exist(path)) {
+                               int ret;
+                               struct MprVar result;
+                               char *emsg;
+
+                               ret = ejsEvalFile(eid, path, &result, &emsg);
+                               talloc_free(path);
+                               if (ret < 0) {
+                                       ejsSetErrorMsg(eid, "%s: %s", script, emsg);
+                                       return -1;
+                               }
+                               break;
+                       }
+                       talloc_free(path);
+               }
+               if (js_include[j] == NULL) {
+                       ejsSetErrorMsg(eid, "unable to include '%s'", script);
+                       return -1;
+               }
+       }
+       return 0;
+}
+
 
 /*
   setup C functions that be called from ejs
@@ -76,14 +122,17 @@ void smb_setup_ejs_functions(void)
        smb_setup_ejs_cli();
        smb_setup_ejs_rpc();
        smb_setup_ejs_auth();
+       smb_setup_ejs_options();
+       smb_setup_ejs_nss();
+       smb_setup_ejs_string();
+       smb_setup_ejs_random();
+       smb_setup_ejs_system();
+       smb_setup_ejs_credentials();
+       smb_setup_ejs_samba3();
+       smb_setup_ejs_param();
+       smb_setup_ejs_datablob();
 
        ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
+       ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
-/*
-  setup constants that can be used from ejs
-*/
-void smb_setup_ejs_constants(int eid)
-{
-       smb_setup_ejs_rpc_constants(eid);
-}