X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Ftest%2Frun-helpers.c;h=de60ac9ff08e4fbac8e46943fe36e404f2301361;hp=a71fe40c33fc1958389823084f338997f779aa6b;hb=fba46ae074025cb605d46be9b1080e0649635dd6;hpb=af7afcd46e70e87397c33408d88f2bedd2c90bd8

diff --git a/ccan/opt/test/run-helpers.c b/ccan/opt/test/run-helpers.c
index a71fe40c..de60ac9f 100644
--- a/ccan/opt/test/run-helpers.c
+++ b/ccan/opt/test/run-helpers.c
@@ -19,21 +19,11 @@ static int saved_fprintf(FILE *ignored, const char *fmt, ...);
 #define vfprintf(f, fmt, ap) saved_vprintf(fmt, ap)
 static int saved_vprintf(const char *fmt, va_list ap);
 
-#define malloc(size) saved_malloc(size)
-static void *saved_malloc(size_t size);
-
 #include <ccan/opt/helpers.c>
 #include <ccan/opt/opt.c>
 #include <ccan/opt/usage.c>
 #include <ccan/opt/parse.c>
 
-static void reset_options(void)
-{
-	free(opt_table);
-	opt_table = NULL;
-	opt_count = opt_num_short = opt_num_short_arg = opt_num_long = 0;
-}
-
 static char *output = NULL;
 
 static int saved_vprintf(const char *fmt, va_list ap)
@@ -59,7 +49,7 @@ static int saved_printf(const char *fmt, ...)
 	ret = saved_vprintf(fmt, ap);
 	va_end(ap);
 	return ret;
-}	
+}
 
 static int saved_fprintf(FILE *ignored, const char *fmt, ...)
 {
@@ -70,19 +60,24 @@ static int saved_fprintf(FILE *ignored, const char *fmt, ...)
 	ret = saved_vprintf(fmt, ap);
 	va_end(ap);
 	return ret;
-}	
+}
 
-#undef malloc
-static void *last_allocation;
-static void *saved_malloc(size_t size)
+static void set_args(int *argc, char ***argv, ...)
 {
-	return last_allocation = malloc(size);
+	va_list ap;
+	*argv = malloc(sizeof(**argv) * 20);
+
+	va_start(ap, argv);
+	for (*argc = 0;
+	     ((*argv)[*argc] = va_arg(ap, char*)) != NULL;
+	     (*argc)++);
+	va_end(ap);
 }
 
 /* Test helpers. */
 int main(int argc, char *argv[])
 {
-	plan_tests(334);
+	plan_tests(454);
 
 	/* opt_set_bool */
 	{
@@ -127,7 +122,7 @@ int main(int argc, char *argv[])
 	}
 	/* opt_set_charp */
 	{
-		char *arg = (char *)"wrong";
+		char *arg = cast_const(char *, "wrong");
 		reset_options();
 		opt_register_arg("-a", opt_set_charp, NULL, &arg, "All");
 		ok1(parse_args(&argc, &argv, "-a", "string", NULL));
@@ -399,7 +394,7 @@ int main(int argc, char *argv[])
 			}
 			else
 				fail("FIXME: Handle other long long int"
-				     " sizes (specifically %lu bytes)",
+				     " sizes (specifically %zu bytes)",
 				     sizeof(long long));
 		}
 		/* opt_set_ulonglongval_bi */
@@ -421,6 +416,167 @@ int main(int argc, char *argv[])
 			ok1(parse_args(&argc, &argv, "-a", "8191P", NULL));
 			ok1(arg == 8191 * P);
 		}
+
+		/* opt_show_intval_bi */
+		{
+			int i;
+			char buf[OPT_SHOW_LEN+2] = { 0 };
+			buf[OPT_SHOW_LEN] = '!';
+			i = -77;
+			opt_show_intval_bi(buf, &i);
+			ok1(strcmp(buf, "-77") == 0);
+			i = 0;
+			opt_show_intval_bi(buf, &i);
+			ok1(strcmp(buf, "0") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 77;
+			opt_show_intval_bi(buf, &i);
+			ok1(strcmp(buf, "77") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = -1234 * k;
+			opt_show_intval_bi(buf, &i);
+			ok1(strcmp(buf, "-1234k") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 500 * M;
+			opt_show_intval_bi(buf, &i);
+			ok1(strcmp(buf, "500M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1024 * M;
+			opt_show_intval_bi(buf, &i);
+			ok1(strcmp(buf, "1G") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+		}
+
+		/* opt_show_longval_bi */
+		{
+			long i;
+			char buf[OPT_SHOW_LEN+2] = { 0 };
+			buf[OPT_SHOW_LEN] = '!';
+			i = -77;
+			opt_show_longval_bi(buf, &i);
+			ok1(strcmp(buf, "-77") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 77;
+			opt_show_longval_bi(buf, &i);
+			ok1(strcmp(buf, "77") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = -1 * k;
+			opt_show_longval_bi(buf, &i);
+			ok1(strcmp(buf, "-1k") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 500 * M;
+			opt_show_longval_bi(buf, &i);
+			ok1(strcmp(buf, "500M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1024 * M;
+			opt_show_longval_bi(buf, &i);
+			ok1(strcmp(buf, "1G") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 0;
+			opt_show_longval_bi(buf, &i);
+			ok1(strcmp(buf, "0") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+		}
+
+		/* opt_show_llongval_bi */
+		{
+			long long i;
+			char buf[OPT_SHOW_LEN+2] = { 0 };
+			buf[OPT_SHOW_LEN] = '!';
+			i = -7777;
+			opt_show_longlongval_bi(buf, &i);
+			ok1(strcmp(buf, "-7777") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 7777;
+			opt_show_longlongval_bi(buf, &i);
+			ok1(strcmp(buf, "7777") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = -10240000 * k;
+			opt_show_longlongval_bi(buf, &i);
+			ok1(strcmp(buf, "-10000M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 5 * P;
+			opt_show_longlongval_bi(buf, &i);
+			ok1(strcmp(buf, "5P") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1024 * P;
+			opt_show_longlongval_bi(buf, &i);
+			ok1(strcmp(buf, "1E") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+		}
+
+		/* opt_show_uintval_bi */
+		{
+			unsigned int i;
+			char buf[OPT_SHOW_LEN+2] = { 0 };
+			buf[OPT_SHOW_LEN] = '!';
+			i = 77;
+			opt_show_uintval_bi(buf, &i);
+			ok1(strcmp(buf, "77") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1234 * k;
+			opt_show_uintval_bi(buf, &i);
+			ok1(strcmp(buf, "1234k") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 500 * M;
+			opt_show_uintval_bi(buf, &i);
+			ok1(strcmp(buf, "500M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1024 * M;
+			opt_show_uintval_bi(buf, &i);
+			ok1(strcmp(buf, "1G") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+		}
+
+		/* opt_show_ulongval_bi */
+		{
+			unsigned long i;
+			char buf[OPT_SHOW_LEN+2] = { 0 };
+			buf[OPT_SHOW_LEN] = '!';
+			i = 77;
+			opt_show_ulongval_bi(buf, &i);
+			ok1(strcmp(buf, "77") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = k;
+			opt_show_ulongval_bi(buf, &i);
+			ok1(strcmp(buf, "1k") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 500 * M;
+			opt_show_ulongval_bi(buf, &i);
+			ok1(strcmp(buf, "500M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1024 * M;
+			opt_show_ulongval_bi(buf, &i);
+			ok1(strcmp(buf, "1G") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 0;
+			opt_show_ulongval_bi(buf, &i);
+			ok1(strcmp(buf, "0") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+		}
+
+		/* opt_show_ullongval_bi */
+		{
+			long long i;
+			char buf[OPT_SHOW_LEN+2] = { 0 };
+			buf[OPT_SHOW_LEN] = '!';
+			i = 7777;
+			opt_show_ulonglongval_bi(buf, (unsigned long long *)&i);
+			ok1(strcmp(buf, "7777") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 10240000 * k;
+			opt_show_ulonglongval_bi(buf, (unsigned long long *)&i);
+			ok1(strcmp(buf, "10000M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 5 * P;
+			opt_show_ulonglongval_bi(buf, (unsigned long long *)&i);
+			ok1(strcmp(buf, "5P") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1024 * P;
+			opt_show_ulonglongval_bi(buf, (unsigned long long *)&i);
+			ok1(strcmp(buf, "1E") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+		}
 	}
 
 	{
@@ -491,7 +647,7 @@ int main(int argc, char *argv[])
 
 		/* opt_set_ulongval_si */
 		{
-			unsigned long long int arg = 1000;
+			unsigned long int arg = 1000;
 
 			reset_options();
 			opt_register_arg("-a", opt_set_ulongval_si, NULL,
@@ -516,7 +672,7 @@ int main(int argc, char *argv[])
 			ok1(arg == 1 * G);
 			ok1(!parse_args(&argc, &argv, "-a", "-1G", NULL));
 			ok1(parse_args(&argc, &argv, "-a", "4G", NULL));
-			ok1(arg == 4000000000);
+			ok1(arg == 4000000000U);
 			if (sizeof(long) == 4){
 				ok1(!parse_args(&argc, &argv, "-a", "4294967296", NULL));
 				ok1(!parse_args(&argc, &argv, "-a", "4295M", NULL));
@@ -623,7 +779,7 @@ int main(int argc, char *argv[])
 			}
 			else
 				fail("FIXME: Handle other long long int"
-				     " sizes (specifically %lu bytes)",
+				     " sizes (specifically %zu bytes)",
 				     sizeof(long long));
 
 		}
@@ -645,6 +801,167 @@ int main(int argc, char *argv[])
 			ok1(!parse_args(&argc, &argv, "-a", "-100G", NULL));
 			ok1(parse_args(&argc, &argv, "-a", "8E", NULL));
 		}
+		/* opt_show_intval_si */
+		{
+			int i;
+			char buf[OPT_SHOW_LEN+2] = { 0 };
+			buf[OPT_SHOW_LEN] = '!';
+			i = -77;
+			opt_show_intval_si(buf, &i);
+			ok1(strcmp(buf, "-77") == 0);
+			i = 0;
+			opt_show_intval_si(buf, &i);
+			ok1(strcmp(buf, "0") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 77;
+			opt_show_intval_si(buf, &i);
+			ok1(strcmp(buf, "77") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = -1234 * k;
+			opt_show_intval_si(buf, &i);
+			ok1(strcmp(buf, "-1234k") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 500 * M;
+			opt_show_intval_si(buf, &i);
+			ok1(strcmp(buf, "500M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1000 * M;
+			opt_show_intval_si(buf, &i);
+			ok1(strcmp(buf, "1G") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+		}
+
+		/* opt_show_longval_si */
+		{
+			long i;
+			char buf[OPT_SHOW_LEN+2] = { 0 };
+			buf[OPT_SHOW_LEN] = '!';
+			i = -77;
+			opt_show_longval_si(buf, &i);
+			ok1(strcmp(buf, "-77") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 77;
+			opt_show_longval_si(buf, &i);
+			ok1(strcmp(buf, "77") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = -1 * k;
+			opt_show_longval_si(buf, &i);
+			ok1(strcmp(buf, "-1k") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 500 * M;
+			opt_show_longval_si(buf, &i);
+			ok1(strcmp(buf, "500M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1000 * M;
+			opt_show_longval_si(buf, &i);
+			ok1(strcmp(buf, "1G") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 0;
+			opt_show_longval_si(buf, &i);
+			ok1(strcmp(buf, "0") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+		}
+
+		/* opt_show_llongval_si */
+		{
+			long long i;
+			char buf[OPT_SHOW_LEN+2] = { 0 };
+			buf[OPT_SHOW_LEN] = '!';
+			i = -7777;
+			opt_show_longlongval_si(buf, &i);
+			ok1(strcmp(buf, "-7777") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 7777;
+			opt_show_longlongval_si(buf, &i);
+			ok1(strcmp(buf, "7777") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = -10240000 * k;
+			opt_show_longlongval_si(buf, &i);
+			ok1(strcmp(buf, "-10240M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 5 * P;
+			opt_show_longlongval_si(buf, &i);
+			ok1(strcmp(buf, "5P") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 2000 * P;
+			opt_show_longlongval_si(buf, &i);
+			ok1(strcmp(buf, "2E") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+		}
+
+		/* opt_show_uintval_si */
+		{
+			unsigned int i;
+			char buf[OPT_SHOW_LEN+2] = { 0 };
+			buf[OPT_SHOW_LEN] = '!';
+			i = 77;
+			opt_show_uintval_si(buf, &i);
+			ok1(strcmp(buf, "77") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1234 * k;
+			opt_show_uintval_si(buf, &i);
+			ok1(strcmp(buf, "1234k") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 500 * M;
+			opt_show_uintval_si(buf, &i);
+			ok1(strcmp(buf, "500M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1000 * M;
+			opt_show_uintval_si(buf, &i);
+			ok1(strcmp(buf, "1G") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+		}
+
+		/* opt_show_ulongval_si */
+		{
+			unsigned long i;
+			char buf[OPT_SHOW_LEN+2] = { 0 };
+			buf[OPT_SHOW_LEN] = '!';
+			i = 77;
+			opt_show_ulongval_si(buf, &i);
+			ok1(strcmp(buf, "77") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = k;
+			opt_show_ulongval_si(buf, &i);
+			ok1(strcmp(buf, "1k") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 500 * M;
+			opt_show_ulongval_si(buf, &i);
+			ok1(strcmp(buf, "500M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1024 * M;
+			opt_show_ulongval_si(buf, &i);
+			ok1(strcmp(buf, "1024M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 0;
+			opt_show_ulongval_si(buf, &i);
+			ok1(strcmp(buf, "0") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+		}
+
+		/* opt_show_ullongval_si */
+		{
+			long long i;
+			char buf[OPT_SHOW_LEN+2] = { 0 };
+			buf[OPT_SHOW_LEN] = '!';
+			i = 7777;
+			opt_show_ulonglongval_si(buf, (unsigned long long *)&i);
+			ok1(strcmp(buf, "7777") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 10240000 * k;
+			opt_show_ulonglongval_si(buf, (unsigned long long *)&i);
+			ok1(strcmp(buf, "10240M") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 5 * P;
+			opt_show_ulonglongval_si(buf, (unsigned long long *)&i);
+			ok1(strcmp(buf, "5P") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+			i = 1000 * P;
+			opt_show_ulonglongval_si(buf, (unsigned long long *)&i);
+			ok1(strcmp(buf, "1E") == 0);
+			ok1(buf[OPT_SHOW_LEN] == '!');
+		}
+
 	}
 
 
@@ -670,11 +987,7 @@ int main(int argc, char *argv[])
 		/* parse_args allocates argv */
 		free(argv);
 
-		argc = 2;
-		argv = malloc(sizeof(argv[0]) * 3);
-		argv[0] = "thisprog";
-		argv[1] = "-a";
-		argv[2] = NULL;
+		set_args(&argc, &argv, "thisprog", "-a", NULL);
 
 		exitval = setjmp(exited);
 		if (exitval == 0) {
@@ -682,6 +995,8 @@ int main(int argc, char *argv[])
 			fail("opt_show_version_and_exit returned?");
 		} else {
 			ok1(exitval - 1 == 0);
+			/* We should have freed table!. */
+			ok1(opt_table == NULL);
 		}
 		ok1(strcmp(output, "1.2.3\n") == 0);
 		free(output);
@@ -696,11 +1011,7 @@ int main(int argc, char *argv[])
 		opt_register_noarg("-a",
 				   opt_usage_and_exit, "[args]", "");
 
-		argc = 2;
-		argv = malloc(sizeof(argv[0]) * 3);
-		argv[0] = "thisprog";
-		argv[1] = "-a";
-		argv[2] = NULL;
+		set_args(&argc, &argv, "thisprog", "-a", NULL);
 
 		exitval = setjmp(exited);
 		if (exitval == 0) {
@@ -708,14 +1019,14 @@ int main(int argc, char *argv[])
 			fail("opt_usage_and_exit returned?");
 		} else {
 			ok1(exitval - 1 == 0);
+			/* We should have freed table!. */
+			ok1(opt_table == NULL);
 		}
 		ok1(strstr(output, "[args]"));
 		ok1(strstr(output, argv[0]));
 		ok1(strstr(output, "[-a]"));
 		free(output);
 		free(argv);
-		/* It exits without freeing usage string. */
-		free(last_allocation);
 		output = NULL;
 	}
 
@@ -835,11 +1146,7 @@ int main(int argc, char *argv[])
 		opt_register_noarg("-a",
 				   opt_usage_and_exit, "[args]", "");
 
-		argc = 2;
-		argv = malloc(sizeof(argv[0]) * 3);
-		argv[0] = "thisprog";
-		argv[1] = "--garbage";
-		argv[2] = NULL;
+		set_args(&argc, &argv, "thisprog", "--garbage", NULL);
 		ok1(!opt_parse(&argc, argv, opt_log_stderr));
 		ok1(!strcmp(output,
 			    "thisprog: --garbage: unrecognized option\n"));
@@ -854,11 +1161,7 @@ int main(int argc, char *argv[])
 		reset_options();
 		opt_register_noarg("-a",
 				   opt_usage_and_exit, "[args]", "");
-		argc = 2;
-		argv = malloc(sizeof(argv[0]) * 3);
-		argv[0] = "thisprog";
-		argv[1] = "--garbage";
-		argv[2] = NULL;
+		set_args(&argc, &argv, "thisprog", "--garbage", NULL);
 		exitval = setjmp(exited);
 		if (exitval == 0) {
 			opt_parse(&argc, argv, opt_log_stderr_exit);