1
0
mirror of https://github.com/samba-team/samba.git synced 2025-11-05 04:23:51 +03:00

r8297: add libinclude() function in ejs, which is like include() but searches a js library

path set in "js include" in smb.conf.

This will allow us to start building up a library of common js code,
while avoiding the problem of hard-coding include paths in scripts
This commit is contained in:
Andrew Tridgell
2005-07-11 00:13:11 +00:00
committed by Gerald (Jerry) Carter
parent 6961fe2905
commit ff60529ba2
2 changed files with 53 additions and 0 deletions

View File

@@ -65,6 +65,52 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
}
/*
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) {
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
*/
@@ -78,6 +124,7 @@ void smb_setup_ejs_functions(void)
smb_setup_ejs_auth();
ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
}
/*