Merge branch 'release'

[notmuch] / command-line-arguments.c

diff --git a/command-line-arguments.c b/command-line-arguments.c
index 844d6c3d18bf9db03be5368cbd20c66cc9e058b9..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,16 +122,18 @@ 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->opt_type == NOTMUCH_OPT_INHERIT &&
+           parse_option (_arg, try->output_var))
+           return TRUE;
+
        if (! try->name)
            continue;
 
@@ -152,6 +157,7 @@ parse_option (const char *arg,
 
        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);
@@ -166,7 +172,6 @@ parse_option (const char *arg,
            /*UNREACHED*/
        }
     }
-    fprintf (stderr, "Unrecognized option: --%s\n", arg);
     return FALSE;
 }
 
@@ -197,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;
            }