isl_arg_parse: support ISL_ARG_BOOL_ARG flag

[platform/upstream/isl.git] / isl_arg.c

diff --git a/isl_arg.c b/isl_arg.c
index 5f1950f..533efac 100644 (file)
--- a/isl_arg.c
+++ b/isl_arg.c
@@ -100,6 +100,7 @@ void isl_arg_set_defaults(struct isl_arg *arg, void *opt)
                case isl_arg_str:
                        set_default_str(&arg[i], opt);
                        break;
+               case isl_arg_alias:
                case isl_arg_version:
                case isl_arg_end:
                        break;
@@ -128,6 +129,7 @@ void isl_arg_free(struct isl_arg *arg, void *opt)
                        if (arg[i].u.user.clear)
                                arg[i].u.user.clear(((char *)opt) + arg[i].offset);
                        break;
+               case isl_arg_alias:
                case isl_arg_bool:
                case isl_arg_choice:
                case isl_arg_flags:
@@ -151,11 +153,16 @@ static int print_arg_help(struct isl_arg *decl, const char *prefix, int no)
                return 4;
        }
 
-       if (decl->short_name)
+       if (decl->short_name) {
                printf("  -%c, --", decl->short_name);
-       else
+               len += 8;
+       } else if (decl->flags & ISL_ARG_SINGLE_DASH) {
+               printf("  -");
+               len += 3;
+       } else {
                printf("      --");
-       len += 8;
+               len += 8;
+       }
 
        if (prefix) {
                printf("%s-", prefix);
@@ -168,6 +175,17 @@ static int print_arg_help(struct isl_arg *decl, const char *prefix, int no)
        printf("%s", decl->long_name);
        len += strlen(decl->long_name);
 
+       while ((++decl)->type == isl_arg_alias) {
+               printf(", --");
+               len += 4;
+               if (no) {
+                       printf("no-");
+                       len += 3;
+               }
+               printf("%s", decl->long_name);
+               len += strlen(decl->long_name);
+       }
+
        return len;
 }
 
@@ -428,6 +446,7 @@ static void print_help(struct isl_arg *arg, const char *prefix)
                case isl_arg_str:
                        print_str_help(&arg[i], prefix);
                        break;
+               case isl_arg_alias:
                case isl_arg_version:
                case isl_arg_arg:
                case isl_arg_child:
@@ -502,6 +521,27 @@ static void print_help_and_exit(struct isl_arg *arg, const char *prog)
        exit(0);
 }
 
+static int match_long_name(struct isl_arg *decl,
+       const char *start, const char *end)
+{
+       do {
+               if (end - start == strlen(decl->long_name) &&
+                   !strncmp(start, decl->long_name, end - start))
+                       return 1;
+       } while ((++decl)->type == isl_arg_alias);
+
+       return 0;
+}
+
+static const char *skip_dash_dash(struct isl_arg *decl, const char *arg)
+{
+       if (!strncmp(arg, "--", 2))
+               return arg + 2;
+       if ((decl->flags & ISL_ARG_SINGLE_DASH) && arg[0] == '-')
+               return arg + 1;
+       return NULL;
+}
+
 static const char *skip_name(struct isl_arg *decl, const char *arg,
        const char *prefix, int need_argument, int *has_argument)
 {
@@ -519,10 +559,10 @@ static const char *skip_name(struct isl_arg *decl, const char *arg,
        if (!decl->long_name)
                return NULL;
 
-       if (strncmp(arg, "--", 2))
+       name = skip_dash_dash(decl, arg);
+       if (!name)
                return NULL;
 
-       name = arg + 2;
        equal = strchr(name, '=');
        if (need_argument && !equal)
                return NULL;
@@ -538,8 +578,7 @@ static const char *skip_name(struct isl_arg *decl, const char *arg,
                        name += prefix_len + 1;
        }
 
-       if (end - name != strlen(decl->long_name) ||
-           strncmp(name, decl->long_name, end - name))
+       if (!match_long_name(decl, name, end))
                return NULL;
 
        return equal ? equal + 1 : end;
@@ -638,12 +677,24 @@ static int parse_flags_option(struct isl_arg *decl, char **arg,
        return has_argument ? 1 : 2;
 }
 
-static int parse_bool_option(struct isl_arg *decl, const char *arg,
+static int parse_bool_option(struct isl_arg *decl, char **arg,
        const char *prefix, void *opt)
 {
+       const char *name;
        unsigned *p = (unsigned *)(((char *)opt) + decl->offset);
 
-       if (skip_name(decl, arg, prefix, 0, NULL)) {
+       if (skip_name(decl, arg[0], prefix, 0, NULL)) {
+               if ((decl->flags && ISL_ARG_BOOL_ARG) && arg[1]) {
+                       char *endptr;
+                       int val = strtol(arg[1], &endptr, 0);
+                       if (*endptr == '\0' && (val == 0 || val == 1)) {
+                               if (decl->u.b.set)
+                                       decl->u.b.set(opt, val);
+                               else if (decl->offset != (size_t) -1)
+                                       *p = val;
+                               return 2;
+                       }
+               }
                if (decl->u.b.set)
                        decl->u.b.set(opt, 1);
                else if (decl->offset != (size_t) -1)
@@ -655,31 +706,31 @@ static int parse_bool_option(struct isl_arg *decl, const char *arg,
        if (!decl->long_name)
                return 0;
 
-       if (strncmp(arg, "--", 2))
+       name = skip_dash_dash(decl, arg[0]);
+       if (!name)
                return 0;
-       arg += 2;
 
        if (prefix) {
                size_t prefix_len = strlen(prefix);
-               if (strncmp(arg, prefix, prefix_len) == 0 &&
-                   arg[prefix_len] == '-') {
-                       arg += prefix_len + 1;
+               if (strncmp(name, prefix, prefix_len) == 0 &&
+                   name[prefix_len] == '-') {
+                       name += prefix_len + 1;
                        prefix = NULL;
                }
        }
 
-       if (strncmp(arg, "no-", 3))
+       if (strncmp(name, "no-", 3))
                return 0;
-       arg += 3;
+       name += 3;
 
        if (prefix) {
                size_t prefix_len = strlen(prefix);
-               if (strncmp(arg, prefix, prefix_len) == 0 &&
-                   arg[prefix_len] == '-')
-                       arg += prefix_len + 1;
+               if (strncmp(name, prefix, prefix_len) == 0 &&
+                   name[prefix_len] == '-')
+                       name += prefix_len + 1;
        }
 
-       if (!strcmp(arg, decl->long_name)) {
+       if (match_long_name(decl, name, name + strlen(name))) {
                if (decl->u.b.set)
                        decl->u.b.set(opt, 0);
                else if (decl->offset != (size_t) -1)
@@ -818,7 +869,7 @@ static int parse_option(struct isl_arg *decl, char **arg,
                        parsed = parse_ulong_option(&decl[i], arg, prefix, opt);
                        break;
                case isl_arg_bool:
-                       parsed = parse_bool_option(&decl[i], *arg, prefix, opt);
+                       parsed = parse_bool_option(&decl[i], arg, prefix, opt);
                        break;
                case isl_arg_str:
                        parsed = parse_str_option(&decl[i], arg, prefix, opt);
@@ -826,6 +877,7 @@ static int parse_option(struct isl_arg *decl, char **arg,
                case isl_arg_child:
                        parsed = parse_child_option(&decl[i], arg, opt);
                        break;
+               case isl_arg_alias:
                case isl_arg_arg:
                case isl_arg_user:
                case isl_arg_version: