From fef7a81478cb246a7d2fe29283a50d52501ccc33 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 22 Aug 2005 23:31:18 +0000 Subject: [PATCH] r9491: fixed up a few scripts that need to be updated for the new GetOptions syntax. Mimir, its a good idea to use grep -r to find places that need fixing when you change the syntax of a call :-) (This used to be commit 1ead49f8e823a69dbd9cd3df3f5be04dc17e0d1f) --- source4/scripting/bin/winreg | 14 ++++++-------- testprogs/ejs/argv.js | 6 +----- testprogs/ejs/echo.js | 8 +++----- testprogs/ejs/ldap.js | 8 +++----- testprogs/ejs/nbtstats | 12 +++++------- testprogs/ejs/samr.js | 14 ++++++-------- 6 files changed, 24 insertions(+), 38 deletions(-) diff --git a/source4/scripting/bin/winreg b/source4/scripting/bin/winreg index d869d356fdd..7656c8a4410 100755 --- a/source4/scripting/bin/winreg +++ b/source4/scripting/bin/winreg @@ -9,14 +9,12 @@ exec smbscript "$0" ${1+"$@"} libinclude("base.js"); libinclude("winreg.js"); -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); +var options = GetOptions(ARGV, + "POPT_AUTOHELP", + "POPT_COMMON_SAMBA", + "POPT_COMMON_CREDENTIALS"); +if (options == undefined) { + println("Failed to parse options"); return -1; } diff --git a/testprogs/ejs/argv.js b/testprogs/ejs/argv.js index 093123014a2..ffb6e007eb6 100644 --- a/testprogs/ejs/argv.js +++ b/testprogs/ejs/argv.js @@ -2,16 +2,12 @@ demonstrate use of GetOptions */ -var ok; -var options = new Object(); - -ok = GetOptions(ARGV, options, +var options = GetOptions(ARGV, "POPT_AUTOHELP", "POPT_COMMON_SAMBA", "myopt=s", "intopt=i", "noopt"); -printVars(ok); println("You called this script with arguments:"); diff --git a/testprogs/ejs/echo.js b/testprogs/ejs/echo.js index 2875d1fb0e2..e694193c4be 100755 --- a/testprogs/ejs/echo.js +++ b/testprogs/ejs/echo.js @@ -3,14 +3,12 @@ test echo pipe calls from ejs */ -var options = new Object(); - -ok = GetOptions(ARGV, options, +var options = GetOptions(ARGV, "POPT_AUTOHELP", "POPT_COMMON_SAMBA", "POPT_COMMON_CREDENTIALS"); -if (ok == false) { - println("Failed to parse options: " + options.ERROR); +if (options == undefined) { + println("Failed to parse options"); return -1; } diff --git a/testprogs/ejs/ldap.js b/testprogs/ejs/ldap.js index 28a08879cf5..e1099d5ff0c 100755 --- a/testprogs/ejs/ldap.js +++ b/testprogs/ejs/ldap.js @@ -6,14 +6,12 @@ exec smbscript "$0" ${1+"$@"} var ldb = ldb_init(); -var options = new Object(); - -ok = GetOptions(ARGV, options, +var options = GetOptions(ARGV, "POPT_AUTOHELP", "POPT_COMMON_SAMBA", "POPT_COMMON_CREDENTIALS"); -if (ok == false) { - println("Failed to parse options: " + options.ERROR); +if (options == undefined) { + println("Failed to parse options"); return -1; } diff --git a/testprogs/ejs/nbtstats b/testprogs/ejs/nbtstats index 20bc781f03c..1c8a6a5e7ec 100755 --- a/testprogs/ejs/nbtstats +++ b/testprogs/ejs/nbtstats @@ -3,13 +3,11 @@ 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); +var options = GetOptions(ARGV, + "POPT_AUTOHELP", + "POPT_COMMON_SAMBA"); +if (options == undefined) { + println("Failed to parse options"); return -1; } diff --git a/testprogs/ejs/samr.js b/testprogs/ejs/samr.js index b518fea234b..fbdae974bea 100755 --- a/testprogs/ejs/samr.js +++ b/testprogs/ejs/samr.js @@ -3,14 +3,12 @@ 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); +var options = GetOptions(ARGV, + "POPT_AUTOHELP", + "POPT_COMMON_SAMBA", + "POPT_COMMON_CREDENTIALS"); +if (options == undefined) { + println("Failed to parse options"); return -1; } -- 2.34.1