opt: avoid using err.h.

[ccan] / ccan / opt / opt.c

diff --git a/ccan/opt/opt.c b/ccan/opt/opt.c
index 5aaa000b64a1cd31fd1078c021d62c4117c47146..94eb0d5ab7f2808e0f1a4fb155b617cebf9422b6 100644 (file)
--- a/ccan/opt/opt.c
+++ b/ccan/opt/opt.c
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <err.h>
 #include <assert.h>
 #include <stdarg.h>
 #include <stdint.h>
@@ -102,32 +101,40 @@ 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;
        unsigned len;
 
-       if (entry->type != OPT_HASARG && entry->type != OPT_NOARG)
-               errx(1, "Option %s: unknown entry type %u",
-                    entry->names, entry->type);
+       if (entry->type != OPT_HASARG && entry->type != OPT_NOARG
+           && entry->type != (OPT_EARLY|OPT_HASARG)
+           && entry->type != (OPT_EARLY|OPT_NOARG))
+               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++;
@@ -135,8 +142,8 @@ 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);
                }
        }
 }
@@ -196,7 +203,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 +233,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, ...)