diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-07-12 06:57:25 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:20:10 -0500 |
commit | 26a55c330a8cd79da290b2ad0e15aaf94be6ebcf (patch) | |
tree | 85c23207c8baac99d60163bb3e3089d7e2cabb04 /source4/scripting/ejs/smbcalls_string.c | |
parent | 102e24761189306fdf6233481ada43e99a56b5e7 (diff) | |
download | samba-26a55c330a8cd79da290b2ad0e15aaf94be6ebcf.tar.gz samba-26a55c330a8cd79da290b2ad0e15aaf94be6ebcf.tar.bz2 samba-26a55c330a8cd79da290b2ad0e15aaf94be6ebcf.zip |
r8355: - added a vsprintf() function
- removed the --outputdir option from provision, as its not used any
more (as ejs knows the real paths)
(This used to be commit abbf9c703c17c2edc2d978dade3619a96c38d0d9)
Diffstat (limited to 'source4/scripting/ejs/smbcalls_string.c')
-rw-r--r-- | source4/scripting/ejs/smbcalls_string.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c index 7a19ecdf2c..ad998701f6 100644 --- a/source4/scripting/ejs/smbcalls_string.c +++ b/source4/scripting/ejs/smbcalls_string.c @@ -272,6 +272,41 @@ failed: } /* + used to build your own print function + str = vsprintf(args); +*/ +static int ejs_vsprintf(MprVarHandle eid, int argc, struct MprVar **argv) +{ + struct MprVar **args, *len, *v; + int i, ret, length; + if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) { + ejsSetErrorMsg(eid, "vsprintf invalid arguments"); + return -1; + } + v = argv[0]; + len = mprGetProperty(v, "length", NULL); + if (len == NULL) { + ejsSetErrorMsg(eid, "vsprintf takes an array"); + return -1; + } + length = mprToInt(len); + args = talloc_array(mprMemCtx(), struct MprVar *, length); + if (args == NULL) { + return -1; + } + + for (i=0;i<length;i++) { + char idx[16]; + mprItoa(i, idx, sizeof(idx)); + args[i] = mprGetProperty(v, idx, NULL); + } + + ret = ejs_sprintf(eid, length, args); + talloc_free(args); + return ret; +} + +/* setup C functions that be called from ejs */ void smb_setup_ejs_string(void) @@ -281,4 +316,5 @@ void smb_setup_ejs_string(void) ejsDefineStringCFunction(-1, "split", ejs_split, NULL, MPR_VAR_SCRIPT_HANDLE); ejsDefineCFunction(-1, "join", ejs_join, NULL, MPR_VAR_SCRIPT_HANDLE); ejsDefineCFunction(-1, "sprintf", ejs_sprintf, NULL, MPR_VAR_SCRIPT_HANDLE); + ejsDefineCFunction(-1, "vsprintf", ejs_vsprintf, NULL, MPR_VAR_SCRIPT_HANDLE); } |