X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Fopt.c;h=0514dc8702dfc8ef2327d892f7cbd7606dec2b06;hp=094b15c7e1b48c25aed1256aa741921ad8091f52;hb=c656dceb3f04c2e3da7af40824c97eff5119a0b9;hpb=50212d0d271f967d9f5d14c116ec54c0050882a8

diff --git a/ccan/opt/opt.c b/ccan/opt/opt.c
index 094b15c7..0514dc87 100644
--- a/ccan/opt/opt.c
+++ b/ccan/opt/opt.c
@@ -1,10 +1,9 @@
-/* Licensed under GPLv3+ - see LICENSE file for details */
+/* Licensed under GPLv2+ - see LICENSE file for details */
 #include <ccan/opt/opt.h>
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <err.h>
 #include <assert.h>
 #include <stdarg.h>
 #include <stdint.h>
@@ -13,6 +12,9 @@
 struct opt_table *opt_table;
 unsigned int opt_count, opt_num_short, opt_num_short_arg, opt_num_long;
 const char *opt_argv0;
+struct opt_alloc opt_alloc = {
+	malloc, realloc, free
+};
 
 /* Returns string after first '-'. */
 static const char *first_name(const char *names, unsigned *len)
@@ -102,6 +104,12 @@ const char *next_sopt(const char *p, unsigned *i)
 	return p;
 }
 
+/* Avoids dependency on err.h or ccan/err */
+#ifndef failmsg
+#define failmsg(fmt, ...) \
+	do { fprintf(stderr, fmt, __VA_ARGS__); exit(1); } while(0)
+#endif
+
 static void check_opt(const struct opt_table *entry)
 {
 	const char *p;
@@ -110,26 +118,26 @@ static void check_opt(const struct opt_table *entry)
 	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);
+		failmsg("Option %s: unknown entry type %u",
+			entry->names, entry->type);
 
 	if (!entry->desc)
-		errx(1, "Option %s: description cannot be NULL", entry->names);
+		failmsg("Option %s: description cannot be NULL", entry->names);
 
 
 	if (entry->names[0] != '-')
-		errx(1, "Option %s: does not begin with '-'", entry->names);
+		failmsg("Option %s: does not begin with '-'", entry->names);
 
 	for (p = first_name(entry->names, &len); p; p = next_name(p, &len)) {
 		if (*p == '-') {
 			if (len == 1)
-				errx(1, "Option %s: invalid long option '--'",
-				     entry->names);
+				failmsg("Option %s: invalid long option '--'",
+					entry->names);
 			opt_num_long++;
 		} else {
 			if (len != 1)
-				errx(1, "Option %s: invalid short option"
-				     " '%.*s'", entry->names, len+1, p-1);
+				failmsg("Option %s: invalid short option"
+					" '%.*s'", entry->names, len+1, p-1);
 			opt_num_short++;
 			if (entry->type == OPT_HASARG)
 				opt_num_short_arg++;
@@ -137,15 +145,16 @@ static void check_opt(const struct opt_table *entry)
 		/* Don't document args unless there are some. */
 		if (entry->type == OPT_NOARG) {
 			if (p[len] == ' ' || p[len] == '=')
-				errx(1, "Option %s: does not take arguments"
-				     " '%s'", entry->names, p+len+1);
+				failmsg("Option %s: does not take arguments"
+					" '%s'", entry->names, p+len+1);
 		}
 	}
 }
 
 static void add_opt(const struct opt_table *entry)
 {
-	opt_table = realloc(opt_table, sizeof(opt_table[0]) * (opt_count+1));
+	opt_table = opt_alloc.realloc(opt_table,
+				      sizeof(opt_table[0]) * (opt_count+1));
 	opt_table[opt_count++] = *entry;
 }
 
@@ -198,18 +207,19 @@ 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, 0, &offset, errlog)) == 1);
+	while ((ret = parse_one(argc, argv, 0, &offset, errlog, false)) == 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, ...))
+static bool early_parse(int argc, char *argv[],
+			void (*errlog)(const char *fmt, ...),
+			bool ignore_unknown)
 {
 	int ret;
 	unsigned off = 0;
-	char **tmpargv = malloc(sizeof(argv[0]) * (argc + 1));
+	char **tmpargv = opt_alloc.alloc(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));
@@ -217,17 +227,29 @@ bool opt_early_parse(int argc, char *argv[],
 	/* This helps opt_usage. */
 	opt_argv0 = argv[0];
 
-	while ((ret = parse_one(&argc, tmpargv, OPT_EARLY, &off, errlog)) == 1);
+	while ((ret = parse_one(&argc, tmpargv, OPT_EARLY, &off, errlog, ignore_unknown)) == 1);
 
-	free(tmpargv);
+	opt_alloc.free(tmpargv);
 
 	/* 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, ...))
+{
+	return early_parse(argc, argv, errlog, false);
+}
+
+bool opt_early_parse_incomplete(int argc, char *argv[],
+				void (*errlog)(const char *fmt, ...))
+{
+	return early_parse(argc, argv, errlog, true);
+}
+
 void opt_free_table(void)
 {
-	free(opt_table);
+	opt_alloc.free(opt_table);
 	opt_table = NULL;
 	opt_count = opt_num_short = opt_num_short_arg = opt_num_long = 0;
 }
@@ -255,7 +277,16 @@ void opt_log_stderr_exit(const char *fmt, ...)
 
 char *opt_invalid_argument(const char *arg)
 {
-	char *str = malloc(sizeof("Invalid argument '%s'") + strlen(arg));
+	char *str = opt_alloc.alloc(sizeof("Invalid argument '%s'") + strlen(arg));
 	sprintf(str, "Invalid argument '%s'", arg);
 	return str;
 }
+
+void opt_set_alloc(void *(*allocfn)(size_t size),
+		   void *(*reallocfn)(void *ptr, size_t size),
+		   void (*freefn)(void *ptr))
+{
+	opt_alloc.alloc = allocfn;
+	opt_alloc.realloc = reallocfn;
+	opt_alloc.free = freefn;
+}