svn commit: samba r8661 - in branches/SAMBA_4_0/source/scripting/ejs: .

tridge at samba.org tridge at samba.org
Thu Jul 21 04:10:36 GMT 2005


Author: tridge
Date: 2005-07-21 04:10:35 +0000 (Thu, 21 Jul 2005)
New Revision: 8661

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8661

Log:
added strstr() ejs function in string lib


Modified:
   branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c	2005-07-21 02:12:20 UTC (rev 8660)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c	2005-07-21 04:10:35 UTC (rev 8661)
@@ -75,6 +75,22 @@
 
 /*
   usage:
+      var s = strstr(string, substring);
+*/
+static int ejs_strstr(MprVarHandle eid, int argc, char **argv)
+{
+	char *s;
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "strstr invalid arguments");
+		return -1;
+	}
+	s = strstr(argv[0], argv[1]);
+	mpr_Return(eid, mprString(s));
+	return 0;
+}
+
+/*
+  usage:
      list = split(".", "a.foo.bar");
 
   NOTE: does not take a regular expression, unlink perl split()
@@ -330,6 +346,7 @@
 	mprSetStringCFunction(obj, "strlen", ejs_strlen);
 	mprSetStringCFunction(obj, "strlower", ejs_strlower);
 	mprSetStringCFunction(obj, "strupper", ejs_strupper);
+	mprSetStringCFunction(obj, "strstr", ejs_strstr);
 	mprSetStringCFunction(obj, "split", ejs_split);
 	mprSetCFunction(obj, "join", ejs_join);
 	mprSetCFunction(obj, "sprintf", ejs_sprintf);



More information about the samba-cvs mailing list