X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Ftest%2Futils.c;h=c2967fca173d51010b810fcaa626eb6ebff420df;hp=fa0a2022e0987368e398161bbce28d60fd43b028;hb=8071ba125bb6893b88c02353638eeac220cb99c1;hpb=39dc9e4612339af669e934c47500605f826a2bb4

diff --git a/ccan/opt/test/utils.c b/ccan/opt/test/utils.c
index fa0a2022..c2967fca 100644
--- a/ccan/opt/test/utils.c
+++ b/ccan/opt/test/utils.c
@@ -3,7 +3,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ccan/opt/opt.h>
-#include <getopt.h>
 #include <string.h>
 #include <stdio.h>
 #include "utils.h"
@@ -29,7 +28,7 @@ void show_arg(char buf[OPT_SHOW_LEN], const char *arg)
 
 char *err_output = NULL;
 
-static void save_err_output(const char *fmt, ...)
+void save_err_output(const char *fmt, ...)
 {
 	va_list ap;
 	char *p;
@@ -49,7 +48,15 @@ static void save_err_output(const char *fmt, ...)
 		err_output = p;
 }	
 
-/* FIXME: This leaks, BTW. */
+void reset_options(void)
+{
+	opt_free_table();
+	free(err_output);
+	err_output = NULL;
+}
+
+static bool allocated = false;
+
 bool parse_args(int *argc, char ***argv, ...)
 {
 	char **a;
@@ -63,13 +70,39 @@ bool parse_args(int *argc, char ***argv, ...)
 		(*argc)++;
 		a = realloc(a, sizeof(*a) * (*argc + 1));
 	}
+
+	if (allocated)
+		free(*argv);
+
 	*argv = a;
-	/* Re-set before parsing. */
-	optind = 0;
+	allocated = true;
 
 	return opt_parse(argc, *argv, save_err_output);
 }
 
+bool parse_early_args(int *argc, char ***argv, ...)
+{
+	char **a;
+	va_list ap;
+
+	va_start(ap, argv);
+	*argc = 1;
+	a = malloc(sizeof(*a) * (*argc + 1));
+	a[0] = (*argv)[0];
+	while ((a[*argc] = va_arg(ap, char *)) != NULL) {
+		(*argc)++;
+		a = realloc(a, sizeof(*a) * (*argc + 1));
+	}
+
+	if (allocated)
+		free(*argv);
+
+	*argv = a;
+	allocated = true;
+
+	return opt_early_parse(*argc, *argv, save_err_output);
+}
+
 struct opt_table short_table[] = {
 	/* Short opts, different args. */
 	OPT_WITHOUT_ARG("-a", test_noarg, "a", "Description of a"),