converted locktest to use popt and cmdline utility code

(This used to be commit 625ea49a95cbdb507ea5b191f75ffa27e25cdb90)

4 files changed, 77 insertions, 99 deletions

diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 8be55f78b0..ab7065c6f0 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -253,7 +253,7 @@ plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PAS
 plantest "blackbox.cifsdd" dc $bbdir/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" 
 plantest "blackbox.nmblookup" dc $samba4srcdir/utils/tests/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP" 
 plantest "blackbox.nmblookup" member $samba4srcdir/utils/tests/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
-plantest "blackbox.locktest" dc $bbdir/test_locktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" 
+plantest "blackbox.locktest" dc $bbdir/test_locktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
 
 # Tests using the "Simple" NTVFS backend
 
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 0c5e641b4b..18e5ea70ec 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -362,6 +362,9 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
 		locktest.o
 PRIVATE_DEPENDENCIES = \
+		LIBPOPT \
+		POPT_SAMBA \
+		POPT_CREDENTIALS \
 		LIBSAMBA-UTIL \
 		LIBCLI_SMB \
 		LIBSAMBA-CONFIG
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index 119b5186d9..ebc325fe2b 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 #include "system/filesys.h"
 #include "system/time.h"
 #include "pstring.h"
@@ -29,15 +30,15 @@
 #include "libcli/resolve/resolve.h"
 
 static int numops = 1000;
-static bool showall;
-static bool analyze;
-static bool hide_unlock_fails;
-static bool use_oplocks;
+static int showall;
+static int analyze;
+static int hide_unlock_fails;
+static int use_oplocks;
 static uint_t lock_range = 100;
 static uint_t lock_base = 0;
 static uint_t min_length = 0;
-static bool exact_error_codes;
-static bool zero_zero;
+static int exact_error_codes;
+static int zero_zero;
 
 #define FILENAME "\\locktest.dat"
 
@@ -520,26 +521,10 @@ static void test_locks(struct loadparm_context *lp_ctx, char *share[NSERVERS])
 
 
 
-static void usage(void)
+_NORETURN_ static void usage(poptContext pc)
 {
-	printf(
-"Usage:\n\
-  locktest //server1/share1 //server2/share2 [options..]\n\
-  options:\n\
-        -U user%%pass        (may be specified twice)\n\
-        -s seed\n\
-        -o numops\n\
-        -u          hide unlock fails\n\
-        -a          (show all ops)\n\
-        -A          analyse for minimal ops\n\
-        -O          use oplocks\n\
-        -E          enable exact error code checking\n\
-        -Z          enable the zero/zero lock\n\
-        -R range    set lock range\n\
-        -B base     set lock base\n\
-        -M min      set min lock length\n\
-        -l filename unclist file\n\
-");
+	printf("Usage:\n\tlocktest //server1/share1 //server2/share2 [options..]\n");
+	poptPrintUsage(pc, stdout, 0);
 }
 
 /****************************************************************************
@@ -552,97 +537,86 @@ static void usage(void)
 	int seed, server;
 	int username_count=0;
 	struct loadparm_context *lp_ctx;
+	poptContext pc;
+	int argc_new, i;
+	char **argv_new;
+	enum {OPT_UNCLIST=1000};
+	struct poptOption long_options[] = {
+		POPT_AUTOHELP
+		{"seed",	  0, POPT_ARG_INT,  &seed, 	0,	"Seed to use for randomizer", 	NULL},
+		{"num-ops",	  0, POPT_ARG_INT,  &numops, 	0, 	"num ops",	NULL},
+		{"lockrange",     0, POPT_ARG_INT,  &lock_range,0,      "locking range", NULL},
+		{"lockbase",      0, POPT_ARG_INT,  &lock_base, 0,      "locking base", NULL},
+		{"minlength",     0, POPT_ARG_INT,  &min_length,0,      "min lock length", NULL},
+		{"hidefails",     0, POPT_ARG_NONE, &hide_unlock_fails,0,"hide unlock fails", NULL},
+		{"oplocks",       0, POPT_ARG_NONE, &use_oplocks,0,      "use oplocks", NULL},
+		{"showall",       0, POPT_ARG_NONE, &showall,    0,      "display all operations", NULL},
+		{"analyse",       0, POPT_ARG_NONE, &analyze,    0,      "do backtrack analysis", NULL},
+		{"zerozero",      0, POPT_ARG_NONE, &zero_zero,    0,      "do zero/zero lock", NULL},
+		{"exacterrors",   0, POPT_ARG_NONE, &exact_error_codes,0,"use exact error codes", NULL},
+		{"unclist",	  0, POPT_ARG_STRING,	NULL, 	OPT_UNCLIST,	"unclist", 	NULL},
+		{ "user", 'U',       POPT_ARG_STRING, NULL, 'U', "Set the network username", "[DOMAIN/]USERNAME[%PASSWORD]" },
+		POPT_COMMON_SAMBA
+		POPT_COMMON_CONNECTION
+		POPT_COMMON_CREDENTIALS
+		POPT_COMMON_VERSION
+		{ NULL }
+	};
 
 	setlinebuf(stdout);
+	seed = time(NULL);
 
-	setup_logging("locktest", DEBUG_STDOUT);
-
-	if (argc < 3 || argv[1][0] == '-') {
-		usage();
-		exit(1);
-	}
-
-	setup_logging(argv[0], DEBUG_STDOUT);
-
-	for (server=0;server<NSERVERS;server++) {
-		share[server] = argv[1+server];
-		all_string_sub(share[server],"/","\\",0);
-	}
-
-	argc -= NSERVERS;
-	argv += NSERVERS;
+	pc = poptGetContext("locjtest", argc, (const char **) argv, long_options, 
+			    POPT_CONTEXT_KEEP_FIRST);
 
-	global_loadparm = lp_ctx = loadparm_init(talloc_autofree_context());
-	lp_load(lp_ctx, dyn_CONFIGFILE);
+	poptSetOtherOptionHelp(pc, "<unc1> <unc2>");
 
 	servers[0] = cli_credentials_init(talloc_autofree_context());
 	servers[1] = cli_credentials_init(talloc_autofree_context());
 	cli_credentials_guess(servers[0], lp_ctx);
 	cli_credentials_guess(servers[1], lp_ctx);
 
-	seed = time(NULL);
-
-	while ((opt = getopt(argc, argv, "U:s:ho:aAW:OR:B:M:EZW:l:")) != EOF) {
+	while((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
+		case OPT_UNCLIST:
+			lp_set_cmdline(cmdline_lp_ctx, "torture:unclist", poptGetOptArg(pc));
+			break;
 		case 'U':
 			if (username_count == 2) {
-				usage();
+				usage(pc);
 				exit(1);
 			}
-			cli_credentials_parse_string(servers[username_count], 
-						     optarg, CRED_SPECIFIED);
+			cli_credentials_parse_string(servers[username_count], poptGetOptArg(pc), CRED_SPECIFIED);
 			username_count++;
 			break;
-		case 'R':
-			lock_range = strtol(optarg, NULL, 0);
-			break;
-		case 'B':
-			lock_base = strtol(optarg, NULL, 0);
-			break;
-		case 'M':
-			min_length = strtol(optarg, NULL, 0);
-			break;
-		case 's':
-			seed = atoi(optarg);
-			break;
-		case 'u':
-			hide_unlock_fails = true;
-			break;
-		case 'o':
-			numops = atoi(optarg);
-			break;
-		case 'O':
-			use_oplocks = true;
-			break;
-		case 'a':
-			showall = true;
-			break;
-		case 'A':
-			analyze = true;
-			break;
-		case 'Z':
-			zero_zero = true;
-			break;
-		case 'E':
-			exact_error_codes = true;
-			break;
-		case 'l':
-			lp_set_cmdline(lp_ctx, "torture:unclist", optarg);
-			break;
-		case 'W':
-			lp_set_cmdline(lp_ctx, "workgroup", optarg);
+		}
+	}
+
+	argv_new = discard_const_p(char *, poptGetArgs(pc));
+	argc_new = argc;
+	for (i=0; i<argc; i++) {
+		if (argv_new[i] == NULL) {
+			argc_new = i;
 			break;
-		case 'h':
-			usage();
-			exit(1);
-		default:
-			printf("Unknown option %c (%d)\n", (char)opt, opt);
-			exit(1);
 		}
 	}
 
+	if (!(argc_new >= 3)) {
+		usage(pc);
+		exit(1);
+	}
+
+	setup_logging("locktest", DEBUG_STDOUT);
+
+	for (server=0;server<NSERVERS;server++) {
+		share[server] = argv_new[1+server];
+		all_string_sub(share[server],"/","\\",0);
+	}
+
+	lp_ctx = cmdline_lp_ctx;
+
 	if (username_count == 0) {
-		usage();
+		usage(pc);
 		return -1;
 	}
 	if (username_count == 1) {
diff --git a/testprogs/blackbox/test_locktest.sh b/testprogs/blackbox/test_locktest.sh
index 60597ba83f..c08b408107 100755
--- a/testprogs/blackbox/test_locktest.sh
+++ b/testprogs/blackbox/test_locktest.sh
@@ -3,9 +3,9 @@
 # Copyright (C) 2008 Andrew Tridgell
 # based on test_smbclient.sh
 
-if [ $# -lt 4 ]; then
+if [ $# -lt 5 ]; then
 cat <<EOF
-Usage: test_locktest.sh SERVER USERNAME PASSWORD DOMAIN
+Usage: test_locktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
 EOF
 exit 1;
 fi
@@ -14,7 +14,8 @@ SERVER=$1
 USERNAME=$2
 PASSWORD=$3
 DOMAIN=$4
-shift 4
+PREFIX=$5
+shift 5
 failed=0
 
 samba4bindir=`dirname $0`/../../source/bin
@@ -35,6 +36,6 @@ testit() {
 	return $status
 }
 
-testit "locktest" $VALGRIND $locktest //$SERVER/test1 //$SERVER/test2 -o 100  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+testit "locktest" $VALGRIND $locktest //$SERVER/test1 //$SERVER/test2 --num-ops=100  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
 
 exit $failed