svn commit: samba r8317 - in branches/SAMBA_4_0/testprogs/ejs: .
tridge at samba.org
tridge at samba.org
Mon Jul 11 07:43:36 GMT 2005
Author: tridge
Date: 2005-07-11 07:43:36 +0000 (Mon, 11 Jul 2005)
New Revision: 8317
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8317
Log:
convert the example scripts over to the new GetOptions() call
Modified:
branches/SAMBA_4_0/testprogs/ejs/argv.js
branches/SAMBA_4_0/testprogs/ejs/echo.js
branches/SAMBA_4_0/testprogs/ejs/nbtstats
branches/SAMBA_4_0/testprogs/ejs/samr.js
Changeset:
Modified: branches/SAMBA_4_0/testprogs/ejs/argv.js
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/argv.js 2005-07-11 07:42:43 UTC (rev 8316)
+++ branches/SAMBA_4_0/testprogs/ejs/argv.js 2005-07-11 07:43:36 UTC (rev 8317)
@@ -1,7 +1,18 @@
/*
- demonstrate use of argv
+ demonstrate use of GetOptions
*/
+var ok;
+var options = new Object();
+
+ok = GetOptions(ARGV, options,
+ "POPT_AUTOHELP",
+ "POPT_COMMON_SAMBA",
+ "myopt=s",
+ "intopt=i",
+ "noopt");
+printVars(ok);
+
println("You called this script with arguments:");
-printVars(ARGV);
+printVars(options);
Modified: branches/SAMBA_4_0/testprogs/ejs/echo.js
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/echo.js 2005-07-11 07:42:43 UTC (rev 8316)
+++ branches/SAMBA_4_0/testprogs/ejs/echo.js 2005-07-11 07:43:36 UTC (rev 8317)
@@ -3,6 +3,17 @@
test echo pipe calls from ejs
*/
+var options = new Object();
+
+ok = GetOptions(ARGV, options,
+ "POPT_AUTOHELP",
+ "POPT_COMMON_SAMBA",
+ "POPT_COMMON_CREDENTIALS");
+if (ok == false) {
+ println("Failed to parse options: " + options.ERROR);
+ return -1;
+}
+
libinclude("base.js");
/*
@@ -198,7 +209,11 @@
exit(0);
}
-var binding = ARGV[0];
+if (options.ARGV.length != 1) {
+ println("Usage: samr.js <BINDING>");
+ return -1;
+}
+var binding = options.ARGV[0];
var conn = new Object();
print("Connecting to " + binding + "\n");
Modified: branches/SAMBA_4_0/testprogs/ejs/nbtstats
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/nbtstats 2005-07-11 07:42:43 UTC (rev 8316)
+++ branches/SAMBA_4_0/testprogs/ejs/nbtstats 2005-07-11 07:43:36 UTC (rev 8317)
@@ -3,6 +3,16 @@
demonstrate access to irpc calls from ejs
*/
+var options = new Object();
+
+ok = GetOptions(ARGV, options,
+ "POPT_AUTOHELP",
+ "POPT_COMMON_SAMBA");
+if (ok == false) {
+ println("Failed to parse options: " + options.ERROR);
+ return -1;
+}
+
var conn = new Object();
status = irpc_connect(conn, "nbt_server");
Modified: branches/SAMBA_4_0/testprogs/ejs/samr.js
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/samr.js 2005-07-11 07:42:43 UTC (rev 8316)
+++ branches/SAMBA_4_0/testprogs/ejs/samr.js 2005-07-11 07:43:36 UTC (rev 8317)
@@ -3,9 +3,19 @@
test samr calls from ejs
*/
+var options = new Object();
+
+ok = GetOptions(ARGV, options,
+ "POPT_AUTOHELP",
+ "POPT_COMMON_SAMBA",
+ "POPT_COMMON_CREDENTIALS");
+if (ok == false) {
+ println("Failed to parse options: " + options.ERROR);
+ return -1;
+}
+
libinclude("base.js");
libinclude("samr.js");
-libinclude("samr.js");
/*
@@ -96,14 +106,11 @@
}
}
-
-
-if (ARGV.length == 0) {
- print("Usage: samr.js <RPCBINDING>\n");
- exit(0);
+if (options.ARGV.length != 1) {
+ println("Usage: samr.js <BINDING>");
+ return -1;
}
-
-var binding = ARGV[0];
+var binding = options.ARGV[0];
var conn = new Object();
print("Connecting to " + binding + "\n");
More information about the samba-cvs
mailing list