X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Fopt.c;h=094b15c7e1b48c25aed1256aa741921ad8091f52;hp=5aaa000b64a1cd31fd1078c021d62c4117c47146;hb=c438ec17d7b2efe76e56e5fc5ab88bd4a02735e8;hpb=74257cee33ae3033f961d5f22a0313b8cb1b18d4;ds=sidebyside

diff --git a/ccan/opt/opt.c b/ccan/opt/opt.c
index 5aaa000b..094b15c7 100644
--- a/ccan/opt/opt.c
+++ b/ccan/opt/opt.c
@@ -107,7 +107,9 @@ static void check_opt(const struct opt_table *entry)
 	const char *p;
 	unsigned len;
 
-	if (entry->type != OPT_HASARG && entry->type != OPT_NOARG)
+	if (entry->type != OPT_HASARG && entry->type != OPT_NOARG
+	    && entry->type != (OPT_EARLY|OPT_HASARG)
+	    && entry->type != (OPT_EARLY|OPT_NOARG))
 		errx(1, "Option %s: unknown entry type %u",
 		     entry->names, entry->type);
 
@@ -196,7 +198,28 @@ bool opt_parse(int *argc, char *argv[], void (*errlog)(const char *fmt, ...))
 	/* This helps opt_usage. */
 	opt_argv0 = argv[0];
 
-	while ((ret = parse_one(argc, argv, &offset, errlog)) == 1);
+	while ((ret = parse_one(argc, argv, 0, &offset, errlog)) == 1);
+
+	/* parse_one returns 0 on finish, -1 on error */
+	return (ret == 0);
+}
+
+bool opt_early_parse(int argc, char *argv[],
+		     void (*errlog)(const char *fmt, ...))
+{
+	int ret;
+	unsigned off = 0;
+	char **tmpargv = malloc(sizeof(argv[0]) * (argc + 1));
+
+	/* We could avoid a copy and skip instead, but this is simple. */
+	memcpy(tmpargv, argv, sizeof(argv[0]) * (argc + 1));
+
+	/* This helps opt_usage. */
+	opt_argv0 = argv[0];
+
+	while ((ret = parse_one(&argc, tmpargv, OPT_EARLY, &off, errlog)) == 1);
+
+	free(tmpargv);
 
 	/* parse_one returns 0 on finish, -1 on error */
 	return (ret == 0);
@@ -205,7 +228,8 @@ bool opt_parse(int *argc, char *argv[], void (*errlog)(const char *fmt, ...))
 void opt_free_table(void)
 {
 	free(opt_table);
-	opt_table=0;
+	opt_table = NULL;
+	opt_count = opt_num_short = opt_num_short_arg = opt_num_long = 0;
 }
 
 void opt_log_stderr(const char *fmt, ...)