cli: add .present field to opt desc to check if the arg was present

Add pointer to boolean .present field to opt desc, which (if non-NULL)
will be set to TRUE if the argument in question is present on the
command line. Unchanged otherwise.

diff --git a/command-line-arguments.c b/command-line-arguments.c
index f1a5b2324337fb2ceb78f6fcde64133f8f12454c..39940d5fb9fd891076482c389782d93fd2783d20 100644 (file)
--- a/command-line-arguments.c
+++ b/command-line-arguments.c
@@ -128,6 +128,8 @@ parse_position_arg (const char *arg_str, int pos_arg_index,
        if (arg_desc->opt_position) {
            if (pos_arg_counter == pos_arg_index) {
                *arg_desc->opt_position = arg_str;
+               if (arg_desc->present)
+                   *arg_desc->present = TRUE;
                return TRUE;
            }
            pos_arg_counter++;
@@ -202,10 +204,13 @@ parse_option (int argc, char **argv, const notmuch_opt_desc_t *options, int opt_
        else
            INTERNAL_ERROR ("unknown or unhandled option \"%s\"", try->name);
 
-       if (opt_status)
-           return opt_index+1;
-       else
+       if (! opt_status)
            return -1;
+
+       if (try->present)
+           *try->present = TRUE;
+
+       return opt_index+1;
     }
     return -1;
 }

diff --git a/command-line-arguments.h b/command-line-arguments.h
index ff51abceb117dbac79da53c728c8555d56d37263..dfc808bdab7838c81746f7671ba2fa8b3b904ce9 100644 (file)
--- a/command-line-arguments.h
+++ b/command-line-arguments.h
@@ -27,6 +27,9 @@ typedef struct notmuch_opt_desc {
     /* Must be set except for opt_inherit and opt_position. */
     const char *name;
 
+    /* Optional, if non-NULL, set to TRUE if the option is present. */
+    notmuch_bool_t *present;
+
     /* Must be set for opt_keyword and opt_flags. */
     const struct notmuch_keyword *keywords;
 } notmuch_opt_desc_t;