From 6e5d12b5d0345e61425399aff22c5a54fbebaf9e Mon Sep 17 00:00:00 2001
From: Thomas Guyot-Sionnest <dermoth@aei.ca>
Date: Wed, 10 Jun 2009 23:16:12 -0400
Subject: Use a more "natural" way of writing argument lists in extra-opts
 tests.


diff --git a/lib/extra_opts.h b/lib/extra_opts.h
index 0cb47fb..4bb7b73 100644
--- a/lib/extra_opts.h
+++ b/lib/extra_opts.h
@@ -8,11 +8,14 @@
 
 /* np_extra_opts: Process the --extra-opts arguments and create a new argument
  * array with ini-processed and argument-passed arguments together. The
- * ini-procesed arguments always come first (in the ord of --extra-opts
+ * ini-procesed arguments always come first (in the order of --extra-opts
  * arguments). If no --extra-opts arguments are provided or returned nothing
  * it returns **argv otherwise the new array is returned. --extra-opts are
  * always removed from **argv. The original pointers from **argv are kept in
  * the new array to preserve ability to overwrite arguments in processlist.
+ *
+ * The new array can be easily freed as long as a pointer to the original one
+ * is kept. See my_free() in lib/tests/test_opts1.c for an example.
  */
 char **np_extra_opts(int *argc, char **argv, const char *plugin_name);
 
diff --git a/lib/tests/test_opts1.c b/lib/tests/test_opts1.c
index 0b91622..077c5b6 100644
--- a/lib/tests/test_opts1.c
+++ b/lib/tests/test_opts1.c
@@ -21,14 +21,44 @@
 
 #include "tap.h"
 
-void my_free(int *argc, char **argv) {
+/* This my_free would be the most efficient way of freeing an extra-opts array,
+ * provided as an example */
+#if 0
+void my_free(int *argc, char **newargv, char **argv) {
 	int i;
-	printf ("    Arg(%i): ", *argc);
-	for (i=1; i<*argc; i++) printf ("'%s' ", argv[i]);
+	/* Return if both arrays are the same */
+	if (newargv == argv) return;
+
+	for (i=1; i<*argc; i++) {
+		/* Free array items until we reach the start of the original argv */
+		if (newargv[i] == argv[1]) break;
+		free(newargv[i]);
+	}
+	/* Free the array itself */
+	free(newargv);
+}
+#else
+void my_free(int *argc, char **newargv, char **argv) {
+	/* Free stuff (and print while we're at it) */
+	int i, freeflag=1;
+	printf ("    Arg(%i): ", *argc+1);
+	printf ("'%s' ", newargv[0]);
+	for (i=1; i<*argc; i++) {
+		printf ("'%s' ", newargv[i]);
+		/* Stop freeing when we get to the start of the original array */
+		if (freeflag) {
+			if (newargv[i] == argv[1])
+				freeflag=0;
+			else
+				free(newargv[i]);
+		}
+	}
 	printf ("\n");
-	free(argv);
+	/* Free only if it's a different array */
+	if (newargv != argv) free(newargv);
 	*argc=0;
 }
+#endif
 
 int array_diff(int i1, char **a1, int i2, char **a2) {
 	int i;
@@ -54,94 +84,55 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
 int
 main (int argc, char **argv)
 {
-	char **argv_test=NULL, **argv_known=NULL;
+	char **argv_new=NULL;
 	int i, argc_test;
 
 	plan_tests(5);
 
-	argv_test=(char **)malloc(2*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = NULL;
-	argc_test=1;
-	argv_known=(char **)realloc(argv_known, 2*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 1, argv_known), "No opts, returns correct argv/argc");
-	my_free(&argc_test, argv_test);
+	{
+		char *argv_test[] = {"prog_name", (char *) NULL};
+		argc_test=1;
+		char *argv_known[] = {"prog_name", (char *) NULL};
+		argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+		ok(array_diff(argc_test, argv_new, 1, argv_known), "No opts, returns correct argv/argc");
+		my_free(&argc_test, argv_new, argv_test);
+	}
 
-	argv_test=(char **)malloc(6*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = "arg1";
-	argv_test[2] = "--arg2=val1";
-	argv_test[3] = "--arg3";
-	argv_test[4] = "val2";
-	argv_test[5] = NULL;
-	argc_test=5;
-	argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = "arg1";
-	argv_known[2] = "--arg2=val1";
-	argv_known[3] = "--arg3";
-	argv_known[4] = "val2";
-	argv_known[5] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 5, argv_known), "No extra opts, verbatim copy of argv");
-	my_free(&argc_test,argv_test);
+	{
+		char *argv_test[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *) NULL};
+		argc_test=5;
+		char *argv_known[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *) NULL};
+		argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+		ok(array_diff(argc_test, argv_new, 5, argv_known), "No extra opts, verbatim copy of argv");
+		my_free(&argc_test, argv_new, argv_test);
+	}
 
-	argv_test=(char **)malloc(3*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = "--extra-opts=@./config-opts.ini";
-	argv_test[2] = NULL;
-	argc_test=2;
-	argv_known=(char **)realloc(argv_known, 5*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = "--foo=Bar";
-	argv_known[2] = "--this=Your Mother!";
-	argv_known[3] = "--blank";
-	argv_known[4] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 4, argv_known), "Only extra opts using default section");
-	my_free(&argc_test,argv_test);
+	{
+		char *argv_test[] = {"prog_name", "--extra-opts=@./config-opts.ini", (char *) NULL};
+		argc_test=2;
+		char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank", (char *) NULL};
+		argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+		ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts using default section");
+		my_free(&argc_test, argv_new, argv_test);
+	}
 
-	argv_test=(char **)malloc(5*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = "--extra-opts=sect1@./config-opts.ini";
-	argv_test[2] = "--extra-opts";
-	argv_test[3] = "sect2@./config-opts.ini";
-	argv_test[4] = NULL;
-	argc_test=4;
-	argv_known=(char **)realloc(argv_known, 5*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = "--one=two";
-	argv_known[2] = "--something else=oops";
-	argv_known[3] = "--this=that";
-	argv_known[4] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 4, argv_known), "Only extra opts specified twice");
-	my_free(&argc_test,argv_test);
+	{
+		char *argv_test[] = {"prog_name", "--extra-opts=sect1@./config-opts.ini", "--extra-opts", "sect2@./config-opts.ini", (char *) NULL};
+		argc_test=4;
+		char *argv_known[] = {"prog_name", "--one=two", "--something else=oops", "--this=that", (char *) NULL};
+		argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+		ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts specified twice");
+		my_free(&argc_test, argv_new, argv_test);
+	}
 
-	argv_test=(char **)malloc(7*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = "--arg1=val1";
-	argv_test[2] = "--extra-opts=@./config-opts.ini";
-	argv_test[3] = "--extra-opts";
-	argv_test[4] = "sect1@./config-opts.ini";
-	argv_test[5] = "--arg2";
-	argv_test[6] = NULL;
-	argc_test=6;
-	argv_known=(char **)realloc(argv_known, 8*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = "--foo=Bar";
-	argv_known[2] = "--this=Your Mother!";
-	argv_known[3] = "--blank";
-	argv_known[4] = "--one=two";
-	argv_known[5] = "--arg1=val1";
-	argv_known[6] = "--arg2";
-	argv_known[7] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 7, argv_known), "twice extra opts using two sections");
-	my_free(&argc_test,argv_test);
+	{
+		char *argv_test[] = {"prog_name", "--arg1=val1", "--extra-opts=@./config-opts.ini", "--extra-opts", "sect1@./config-opts.ini", "--arg2", (char *) NULL};
+		argc_test=6;
+		char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank", "--one=two", "--arg1=val1", "--arg2", (char *) NULL};
+		argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+		ok(array_diff(argc_test, argv_new, 7, argv_known), "twice extra opts using two sections");
+		my_free(&argc_test, argv_new, argv_test);
+	}
 
 	return exit_status();
 }
diff --git a/lib/tests/test_opts2.c b/lib/tests/test_opts2.c
index e50f23e..c3d2067 100644
--- a/lib/tests/test_opts2.c
+++ b/lib/tests/test_opts2.c
@@ -21,12 +21,24 @@
 
 #include "tap.h"
 
-void my_free(int *argc, char **argv) {
-	int i;
-	printf ("    Arg(%i): ", *argc);
-	for (i=1; i<*argc; i++) printf ("'%s' ", argv[i]);
+void my_free(int *argc, char **newargv, char **argv) {
+	/* Free stuff (and print while we're at it) */
+	int i, freeflag=1;
+	printf ("    Arg(%i): ", *argc+1);
+	printf ("'%s' ", newargv[0]);
+	for (i=1; i<*argc; i++) {
+		printf ("'%s' ", newargv[i]);
+		/* Stop freeing when we get to the start of the original array */
+		if (freeflag) {
+			if (newargv[i] == argv[1])
+				freeflag=0;
+			else
+				free(newargv[i]);
+		}
+	}
 	printf ("\n");
-	free(argv);
+	/* Free only if it's a different array */
+	if (newargv != argv) free(newargv);
 	*argc=0;
 }
 
@@ -54,97 +66,55 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
 int
 main (int argc, char **argv)
 {
-	char **argv_test=NULL, **argv_known=NULL;
+	char **argv_new=NULL;
 	int i, argc_test;
 
 	plan_tests(5);
 
-	argv_test=(char **)malloc(6*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = "arg1";
-	argv_test[2] = "--extra-opts";
-	argv_test[3] = "--arg3";
-	argv_test[4] = "val2";
-	argv_test[5] = NULL;
-	argc_test=5;
-	argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = "--foo=bar";
-	argv_known[2] = "arg1";
-	argv_known[3] = "--arg3";
-	argv_known[4] = "val2";
-	argv_known[5] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 1");
+	{
+		char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "--arg3", "val2", (char *) NULL};
+		argc_test=5;
+		char *argv_known[] = {"prog_name", "--foo=bar", "arg1", "--arg3", "val2", (char *) NULL};
+		argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+		ok(array_diff(argc_test, argv_new, 5, argv_known), "Default section 1");
+		my_free(&argc_test, argv_new, argv_test);
+	}
 
-	argv_test=(char **)malloc(3*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = "--extra-opts";
-	argv_test[2] = NULL;
-	argc_test=2;
-	argv_known=(char **)realloc(argv_known, 3*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = "--foo=bar";
-	argv_known[2] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 2, argv_known), "Default section 2");
-	my_free(&argc_test,argv_test);
+	{
+		char *argv_test[] = {"prog_name", "--extra-opts", (char *) NULL};
+		argc_test=2;
+		char *argv_known[] = {"prog_name", "--foo=bar", (char *) NULL};
+		argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+		ok(array_diff(argc_test, argv_new, 2, argv_known), "Default section 2");
+		my_free(&argc_test, argv_new, argv_test);
+	}
 
-	argv_test=(char **)malloc(6*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = "arg1";
-	argv_test[2] = "--extra-opts=section1";
-	argv_test[3] = "--arg3";
-	argv_test[4] = "val2";
-	argv_test[5] = NULL;
-	argc_test=5;
-	argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = "--foobar=baz";
-	argv_known[2] = "arg1";
-	argv_known[3] = "--arg3";
-	argv_known[4] = "val2";
-	argv_known[5] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 3");
-	my_free(&argc_test,argv_test);
+	{
+		char *argv_test[] = {"prog_name", "arg1", "--extra-opts=section1", "--arg3", "val2", (char *) NULL};
+		argc_test=5;
+		char *argv_known[] = {"prog_name", "--foobar=baz", "arg1", "--arg3", "val2", (char *) NULL};
+		argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+		ok(array_diff(argc_test, argv_new, 5, argv_known), "Default section 3");
+		my_free(&argc_test, argv_new, argv_test);
+	}
 
-	argv_test=(char **)malloc(6*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = "arg1";
-	argv_test[2] = "--extra-opts";
-	argv_test[3] = "-arg3";
-	argv_test[4] = "val2";
-	argv_test[5] = NULL;
-	argc_test=5;
-	argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = "--foo=bar";
-	argv_known[2] = "arg1";
-	argv_known[3] = "-arg3";
-	argv_known[4] = "val2";
-	argv_known[5] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 4");
-	my_free(&argc_test,argv_test);
+	{
+		char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "-arg3", "val2", (char *) NULL};
+		argc_test=5;
+		char *argv_known[] = {"prog_name", "--foo=bar", "arg1", "-arg3", "val2", (char *) NULL};
+		argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+		ok(array_diff(argc_test, argv_new, 5, argv_known), "Default section 4");
+		my_free(&argc_test, argv_new, argv_test);
+	}
 
-	argv_test=(char **)malloc(4*sizeof(char **));
-	argv_test[0] = "check_tcp";
-	argv_test[1] = "--extra-opts";
-	argv_test[2] = "--extra-opts=tcp_long_lines";
-	argv_test[3] = NULL;
-	argc_test=3;
-	argv_known=(char **)realloc(argv_known, 7*sizeof(char **));
-	argv_known[0] = "check_tcp";
-	argv_known[1] = "--timeout=10";
-	argv_known[2] = "--escape";
-	argv_known[3] = "--send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda";
-	argv_known[4] = "--expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda";
-	argv_known[5] = "--jail";
-	argv_known[6] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_tcp");
-	ok(array_diff(argc_test, argv_test, 6, argv_known), "Long lines test");
-	my_free(&argc_test,argv_test);
+	{
+		char *argv_test[] = {"check_tcp", "--extra-opts", "--extra-opts=tcp_long_lines", (char *) NULL};
+		argc_test=3;
+		char *argv_known[] = {"check_tcp", "--timeout=10", "--escape", "--send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda", "--expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda", "--jail", (char *) NULL};
+		argv_new=np_extra_opts(&argc_test, argv_test, "check_tcp");
+		ok(array_diff(argc_test, argv_new, 6, argv_known), "Long lines test");
+		my_free(&argc_test, argv_new, argv_test);
+	}
 
 	return exit_status();
 }
-- 
cgit v0.10-9-g596f