cli: change the data structure for notmuch address deduplication

[notmuch] / command-line-arguments.c

diff --git a/command-line-arguments.c b/command-line-arguments.c
index bf9aecabe86923e7dc3f560bd61f5e7119c5289b..de6b453684cbd1bff5177a974fc2ff7f4b92138f 100644 (file)
--- a/command-line-arguments.c
+++ b/command-line-arguments.c
@@ -23,7 +23,10 @@ _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, char next, const char
     while (keywords->name) {
        if (strcmp (arg_str, keywords->name) == 0) {
            if (arg_desc->output_var) {
-               *((int *)arg_desc->output_var) = keywords->value;
+               if (arg_desc->opt_type == NOTMUCH_OPT_KEYWORD_FLAGS)
+                   *((int *)arg_desc->output_var) |= keywords->value;
+               else
+                   *((int *)arg_desc->output_var) = keywords->value;
            }
            return TRUE;
        }
@@ -119,53 +122,56 @@ parse_position_arg (const char *arg_str, int pos_arg_index,
  */
 
 notmuch_bool_t
-parse_option (const char *arg,
-             const notmuch_opt_desc_t *options) {
-
-    assert(arg);
+parse_option (const char *_arg, const notmuch_opt_desc_t *options)
+{
+    assert(_arg);
     assert(options);
 
-    arg += 2;
-
+    const char *arg = _arg + 2; /* _arg starts with -- */
     const notmuch_opt_desc_t *try;
     for (try = options; try->opt_type != NOTMUCH_OPT_END; try++) {
-       if (try->name && strncmp (arg, try->name, strlen (try->name)) == 0) {
-           char next = arg[strlen (try->name)];
-           const char *value= arg+strlen(try->name)+1;
-
-           /* If we have not reached the end of the argument
-              (i.e. the next character is not a space or delimiter)
-              then the argument could still match a longer option
-              name later in the option table.
-           */
-           if (next != '=' && next != ':' && next != '\0')
-               continue;
-
-           if (try->output_var == NULL)
-               INTERNAL_ERROR ("output pointer NULL for option %s", try->name);
-
-           switch (try->opt_type) {
-           case NOTMUCH_OPT_KEYWORD:
-               return _process_keyword_arg (try, next, value);
-               break;
-           case NOTMUCH_OPT_BOOLEAN:
-               return _process_boolean_arg (try, next, value);
-               break;
-           case NOTMUCH_OPT_INT:
-               return _process_int_arg (try, next, value);
-               break;
-           case NOTMUCH_OPT_STRING:
-               return _process_string_arg (try, next, value);
-               break;
-           case NOTMUCH_OPT_POSITION:
-           case NOTMUCH_OPT_END:
-           default:
-               INTERNAL_ERROR ("unknown or unhandled option type %d", try->opt_type);
-               /*UNREACHED*/
-           }
+       if (try->opt_type == NOTMUCH_OPT_INHERIT &&
+           parse_option (_arg, try->output_var))
+           return TRUE;
+
+       if (! try->name)
+           continue;
+
+       if (strncmp (arg, try->name, strlen (try->name)) != 0)
+           continue;
+
+       char next = arg[strlen (try->name)];
+       const char *value = arg + strlen(try->name) + 1;
+
+       /*
+        * If we have not reached the end of the argument (i.e. the
+        * next character is not a space or delimiter) then the
+        * argument could still match a longer option name later in
+        * the option table.
+        */
+       if (next != '=' && next != ':' && next != '\0')
+           continue;
+
+       if (try->output_var == NULL)
+           INTERNAL_ERROR ("output pointer NULL for option %s", try->name);
+
+       switch (try->opt_type) {
+       case NOTMUCH_OPT_KEYWORD:
+       case NOTMUCH_OPT_KEYWORD_FLAGS:
+           return _process_keyword_arg (try, next, value);
+       case NOTMUCH_OPT_BOOLEAN:
+           return _process_boolean_arg (try, next, value);
+       case NOTMUCH_OPT_INT:
+           return _process_int_arg (try, next, value);
+       case NOTMUCH_OPT_STRING:
+           return _process_string_arg (try, next, value);
+       case NOTMUCH_OPT_POSITION:
+       case NOTMUCH_OPT_END:
+       default:
+           INTERNAL_ERROR ("unknown or unhandled option type %d", try->opt_type);
+           /*UNREACHED*/
        }
     }
-    fprintf (stderr, "Unrecognized option: --%s\n", arg);
     return FALSE;
 }
 
@@ -196,6 +202,7 @@ parse_arguments (int argc, char **argv,
            if (more_args) {
                opt_index++;
            } else {
+               fprintf (stderr, "Unrecognized option: %s\n", argv[opt_index]);
                opt_index = -1;
            }