svn commit: samba r8484 - in branches/SAMBA_4_0/source/scripting:
ejs libjs
tridge at samba.org
tridge at samba.org
Fri Jul 15 07:45:41 GMT 2005
Author: tridge
Date: 2005-07-15 07:45:40 +0000 (Fri, 15 Jul 2005)
New Revision: 8484
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8484
Log:
switched the sys_*() calls to the OO interface
tim, do you want to do the cli_*() calls now?
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c
branches/SAMBA_4_0/source/scripting/libjs/provision.js
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c 2005-07-15 07:18:23 UTC (rev 8483)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c 2005-07-15 07:45:40 UTC (rev 8484)
@@ -171,16 +171,30 @@
/*
+ initialise sys ejs subsystem
+*/
+static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+ struct MprVar obj = mprObject("sys");
+
+ mprSetCFunction(&obj, "interfaces", ejs_sys_interfaces);
+ mprSetCFunction(&obj, "hostname", ejs_sys_hostname);
+ mprSetCFunction(&obj, "nttime", ejs_sys_nttime);
+ mprSetCFunction(&obj, "gmtime", ejs_sys_gmtime);
+ mprSetCFunction(&obj, "ldaptime", ejs_sys_ldaptime);
+ mprSetStringCFunction(&obj, "unlink", ejs_sys_unlink);
+ mprSetStringCFunction(&obj, "file_load", ejs_sys_file_load);
+ mprSetStringCFunction(&obj, "file_save", ejs_sys_file_save);
+
+ mpr_Return(eid, obj);
+ return 0;
+}
+
+
+/*
setup C functions that be called from ejs
*/
void smb_setup_ejs_system(void)
{
- ejsDefineCFunction(-1, "sys_interfaces", ejs_sys_interfaces, NULL, MPR_VAR_SCRIPT_HANDLE);
- ejsDefineCFunction(-1, "sys_hostname", ejs_sys_hostname, NULL, MPR_VAR_SCRIPT_HANDLE);
- ejsDefineCFunction(-1, "sys_nttime", ejs_sys_nttime, NULL, MPR_VAR_SCRIPT_HANDLE);
- ejsDefineCFunction(-1, "sys_gmtime", ejs_sys_gmtime, NULL, MPR_VAR_SCRIPT_HANDLE);
- ejsDefineCFunction(-1, "sys_ldaptime", ejs_sys_ldaptime, NULL, MPR_VAR_SCRIPT_HANDLE);
- ejsDefineStringCFunction(-1, "sys_unlink", ejs_sys_unlink, NULL, MPR_VAR_SCRIPT_HANDLE);
- ejsDefineStringCFunction(-1, "sys_file_load", ejs_sys_file_load, NULL, MPR_VAR_SCRIPT_HANDLE);
- ejsDefineStringCFunction(-1, "sys_file_save", ejs_sys_file_save, NULL, MPR_VAR_SCRIPT_HANDLE);
+ ejsDefineCFunction(-1, "sys_init", ejs_sys_init, NULL, MPR_VAR_SCRIPT_HANDLE);
}
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2005-07-15 07:18:23 UTC (rev 8483)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2005-07-15 07:45:40 UTC (rev 8484)
@@ -7,6 +7,8 @@
/* used to generate sequence numbers for records */
provision_next_usn = 1;
+sys = sys_init();
+
/*
find a user or group from a list of possibilities
*/
@@ -59,7 +61,7 @@
*/
function nttime()
{
- return "" + sys_nttime();
+ return "" + sys.nttime();
}
/*
@@ -67,7 +69,7 @@
*/
function ldaptime()
{
- return sys_ldaptime(sys_nttime());
+ return sys.ldaptime(sys.nttime());
}
/*
@@ -75,7 +77,7 @@
*/
function datestring()
{
- var t = sys_gmtime(sys_nttime());
+ var t = sys.gmtime(sys.nttime());
return sprintf("%04u%02u%02u%02u",
t.tm_year+1900, t.tm_mon+1, t.tm_mday, t.tm_hour);
}
@@ -85,7 +87,7 @@
*/
function hostip()
{
- var list = sys_interfaces();
+ var list = sys.interfaces();
return list[0];
}
@@ -103,7 +105,7 @@
*/
function hostname()
{
- var s = split(".", sys_hostname());
+ var s = split(".", sys.hostname());
return s[0];
}
@@ -123,9 +125,9 @@
var db = lpGet("private dir") + "/" + dbname;
var src = lpGet("setup directory") + "/" + ldif;
- sys_unlink(db);
+ sys.unlink(db);
- var data = sys_file_load(src);
+ var data = sys.file_load(src);
data = data + extra;
data = substitute_var(data, subobj);
@@ -141,12 +143,12 @@
var f = lpGet("private dir") + "/" + fname;
var src = lpGet("setup directory") + "/" + template;
- sys_unlink(f);
+ sys.unlink(f);
- var data = sys_file_load(src);
+ var data = sys.file_load(src);
data = substitute_var(data, subobj);
- ok = sys_file_save(f, data);
+ ok = sys.file_save(f, data);
assert(ok);
}
More information about the samba-cvs
mailing list