X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Ftest%2Frun-helpers.c;h=34ffbab834cb11923d2ba7719fd1091850860b5e;hp=48b7cd8b11dfba607bdc32a501bde99f37370487;hb=cdc32f6d35066fe264a228fe20aa75729e41726e;hpb=f20e4f235ac89f3901f248f91c3ac5a33088349d

diff --git a/ccan/opt/test/run-helpers.c b/ccan/opt/test/run-helpers.c
index 48b7cd8b..34ffbab8 100644
--- a/ccan/opt/test/run-helpers.c
+++ b/ccan/opt/test/run-helpers.c
@@ -13,6 +13,12 @@ static jmp_buf exited;
 #define printf saved_printf
 static int saved_printf(const char *fmt, ...);
 
+#define fprintf saved_fprintf
+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);
+
 #include <ccan/opt/helpers.c>
 #include <ccan/opt/opt.c>
 #include <ccan/opt/usage.c>
@@ -26,15 +32,10 @@ static void reset_options(void)
 
 static char *output = NULL;
 
-static int saved_printf(const char *fmt, ...)
+static int saved_vprintf(const char *fmt, va_list ap)
 {
-	va_list ap;
 	char *p;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = vasprintf(&p, fmt, ap);
-	va_end(ap);
+	int ret = vasprintf(&p, fmt, ap);
 
 	if (output) {
 		output = realloc(output, strlen(output) + strlen(p) + 1);
@@ -42,23 +43,44 @@ static int saved_printf(const char *fmt, ...)
 		free(p);
 	} else
 		output = p;
+	return ret;
+}
 
+static int saved_printf(const char *fmt, ...)
+{
+	va_list ap;
+	int ret;
+
+	va_start(ap, fmt);
+	ret = saved_vprintf(fmt, ap);
+	va_end(ap);
+	return ret;
+}	
+
+static int saved_fprintf(FILE *ignored, const char *fmt, ...)
+{
+	va_list ap;
+	int ret;
+
+	va_start(ap, fmt);
+	ret = saved_vprintf(fmt, ap);
+	va_end(ap);
 	return ret;
 }	
 
 /* Test helpers. */
 int main(int argc, char *argv[])
 {
-	plan_tests(96);
+	plan_tests(100);
 
 	/* opt_set_bool */
 	{
 		bool arg = false;
 		reset_options();
-		opt_register_noarg("-a", opt_set_bool, &arg, NULL);
+		opt_register_noarg("-a", opt_set_bool, &arg, "");
 		ok1(parse_args(&argc, &argv, "-a", NULL));
 		ok1(arg);
-		opt_register_arg("-b", opt_set_bool_arg, NULL, &arg, NULL);
+		opt_register_arg("-b", opt_set_bool_arg, NULL, &arg, "");
 		ok1(parse_args(&argc, &argv, "-b", "no", NULL));
 		ok1(!arg);
 		ok1(parse_args(&argc, &argv, "-b", "yes", NULL));
@@ -75,11 +97,11 @@ int main(int argc, char *argv[])
 	{
 		bool arg = true;
 		reset_options();
-		opt_register_noarg("-a", opt_set_invbool, &arg, NULL);
+		opt_register_noarg("-a", opt_set_invbool, &arg, "");
 		ok1(parse_args(&argc, &argv, "-a", NULL));
 		ok1(!arg);
 		opt_register_arg("-b", opt_set_invbool_arg, NULL,
-				 &arg, NULL);
+				 &arg, "");
 		ok1(parse_args(&argc, &argv, "-b", "no", NULL));
 		ok1(arg);
 		ok1(parse_args(&argc, &argv, "-b", "yes", NULL));
@@ -96,7 +118,7 @@ int main(int argc, char *argv[])
 	{
 		char *arg = (char *)"wrong";
 		reset_options();
-		opt_register_arg("-a", opt_set_charp, NULL, &arg, NULL);
+		opt_register_arg("-a", opt_set_charp, NULL, &arg, "All");
 		ok1(parse_args(&argc, &argv, "-a", "string", NULL));
 		ok1(strcmp(arg, "string") == 0);
 	}
@@ -104,7 +126,7 @@ int main(int argc, char *argv[])
 	{
 		int arg = 1000;
 		reset_options();
-		opt_register_arg("-a", opt_set_intval, NULL, &arg, NULL);
+		opt_register_arg("-a", opt_set_intval, NULL, &arg, "All");
 		ok1(parse_args(&argc, &argv, "-a", "9999", NULL));
 		ok1(arg == 9999);
 		ok1(parse_args(&argc, &argv, "-a", "-9999", NULL));
@@ -121,7 +143,7 @@ int main(int argc, char *argv[])
 	{
 		unsigned int arg = 1000;
 		reset_options();
-		opt_register_arg("-a", opt_set_uintval, NULL, &arg, NULL);
+		opt_register_arg("-a", opt_set_uintval, NULL, &arg, "All");
 		ok1(parse_args(&argc, &argv, "-a", "9999", NULL));
 		ok1(arg == 9999);
 		ok1(!parse_args(&argc, &argv, "-a", "-9999", NULL));
@@ -145,7 +167,7 @@ int main(int argc, char *argv[])
 	{
 		long int arg = 1000;
 		reset_options();
-		opt_register_arg("-a", opt_set_longval, NULL, &arg, NULL);
+		opt_register_arg("-a", opt_set_longval, NULL, &arg, "All");
 		ok1(parse_args(&argc, &argv, "-a", "9999", NULL));
 		ok1(arg == 9999);
 		ok1(parse_args(&argc, &argv, "-a", "-9999", NULL));
@@ -164,7 +186,7 @@ int main(int argc, char *argv[])
 	{
 		unsigned long int arg = 1000;
 		reset_options();
-		opt_register_arg("-a", opt_set_ulongval, NULL, &arg, NULL);
+		opt_register_arg("-a", opt_set_ulongval, NULL, &arg, "All");
 		ok1(parse_args(&argc, &argv, "-a", "9999", NULL));
 		ok1(arg == 9999);
 		ok1(!parse_args(&argc, &argv, "-a", "-9999", NULL));
@@ -182,7 +204,7 @@ int main(int argc, char *argv[])
 	{
 		int arg = 1000;
 		reset_options();
-		opt_register_noarg("-a", opt_inc_intval, &arg, NULL);
+		opt_register_noarg("-a", opt_inc_intval, &arg, "");
 		ok1(parse_args(&argc, &argv, "-a", NULL));
 		ok1(arg == 1001);
 		ok1(parse_args(&argc, &argv, "-a", "-a", NULL));
@@ -196,7 +218,7 @@ int main(int argc, char *argv[])
 		int exitval;
 		reset_options();
 		opt_register_noarg("-a",
-				   opt_version_and_exit, "1.2.3", NULL);
+				   opt_version_and_exit, "1.2.3", "");
 		exitval = setjmp(exited);
 		if (exitval == 0) {
 			parse_args(&argc, &argv, "-a", NULL);
@@ -214,7 +236,7 @@ int main(int argc, char *argv[])
 		int exitval;
 		reset_options();
 		opt_register_noarg("-a",
-				   opt_usage_and_exit, "[args]", NULL);
+				   opt_usage_and_exit, "[args]", "");
 		exitval = setjmp(exited);
 		if (exitval == 0) {
 			parse_args(&argc, &argv, "-a", NULL);
@@ -339,5 +361,47 @@ int main(int argc, char *argv[])
 		ok1(buf[OPT_SHOW_LEN] == '!');
 	}
 
+	/* opt_log_stderr. */
+	{
+		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;
+		ok1(!opt_parse(&argc, argv, opt_log_stderr));
+		ok1(!strcmp(output,
+			    "thisprog: --garbage: unrecognized option\n"));
+		free(output);
+		output = NULL;
+	}
+
+	/* opt_log_stderr_exit. */
+	{
+		int exitval;
+		reset_options();
+		opt_register_noarg("-a",
+				   opt_usage_and_exit, "[args]", "");
+		exitval = setjmp(exited);
+		if (exitval == 0) {
+			argc = 2;
+			argv = malloc(sizeof(argv[0]) * 3);
+			argv[0] = "thisprog";
+			argv[1] = "--garbage";
+			argv[2] = NULL;
+			opt_parse(&argc, argv, opt_log_stderr_exit);
+			fail("opt_log_stderr_exit returned?");
+		} else {
+			ok1(exitval - 1 == 1);
+		}
+		ok1(!strcmp(output,
+			    "thisprog: --garbage: unrecognized option\n"));
+		free(output);
+		output = NULL;
+	}
+
 	return exit_status();
 }