X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=command-line-arguments.c;h=b0a0dab098bc7bec9c6d25901eb77ea71c549028;hp=3aa87aa598c8232b318e044b927d9a291fd8bb1c;hb=8a745d310f966194e82f12f6453f05cc877379d6;hpb=2cf7b27a0c4b4e746e2e40752c55ddb4d54798b2

diff --git a/command-line-arguments.c b/command-line-arguments.c
index 3aa87aa5..b0a0dab0 100644
--- a/command-line-arguments.c
+++ b/command-line-arguments.c
@@ -11,9 +11,14 @@
 */
 
 static notmuch_bool_t
-_process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) {
+_process_keyword_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
 
-    notmuch_keyword_t *keywords = arg_desc->keywords;
+    const notmuch_keyword_t *keywords = arg_desc->keywords;
+
+    if (next == 0) {
+	/* No keyword given */
+	arg_str = "";
+    }
 
     while (keywords->name) {
 	if (strcmp (arg_str, keywords->name) == 0) {
@@ -24,7 +29,28 @@ _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) {
 	}
 	keywords++;
     }
-    fprintf (stderr, "unknown keyword: %s\n", arg_str);
+    if (next != 0)
+	fprintf (stderr, "unknown keyword: %s\n", arg_str);
+    else
+	fprintf (stderr, "option %s needs a keyword\n", arg_desc->name);
+    return FALSE;
+}
+
+static notmuch_bool_t
+_process_boolean_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
+
+    if (next == 0) {
+	*((notmuch_bool_t *)arg_desc->output_var) = TRUE;
+	return TRUE;
+    }
+    if (strcmp (arg_str, "false") == 0) {
+	*((notmuch_bool_t *)arg_desc->output_var) = FALSE;
+	return TRUE;
+    }
+    if (strcmp (arg_str, "true") == 0) {
+	*((notmuch_bool_t *)arg_desc->output_var) = TRUE;
+	return TRUE;
+    }
     return FALSE;
 }
 
@@ -76,14 +102,16 @@ parse_option (const char *arg,
 	    char *endptr;
 
 	    /* Everything but boolean arguments (switches) needs a
-	     * delimiter, and a non-zero length value
+	     * delimiter, and a non-zero length value. Boolean
+	     * arguments may take an optional =true or =false value.
 	     */
-
-	    if (try->opt_type != NOTMUCH_OPT_BOOLEAN) {
-		if (next != '=' && next != ':') return FALSE;
-		if (value[0] == 0) return FALSE;
+	    if (next != '=' && next != ':' && next != 0) return FALSE;
+	    if (next == 0) {
+		if (try->opt_type != NOTMUCH_OPT_BOOLEAN &&
+		    try->opt_type != NOTMUCH_OPT_KEYWORD)
+		    return FALSE;
 	    } else {
-		if (next != 0) return FALSE;
+		if (value[0] == 0) return FALSE;
 	    }
 
 	    if (try->output_var == NULL)
@@ -91,11 +119,10 @@ parse_option (const char *arg,
 
 	    switch (try->opt_type) {
 	    case NOTMUCH_OPT_KEYWORD:
-		return _process_keyword_arg (try, value);
+		return _process_keyword_arg (try, next, value);
 		break;
 	    case NOTMUCH_OPT_BOOLEAN:
-		*((notmuch_bool_t *)try->output_var) = TRUE;
-		return TRUE;
+		return _process_boolean_arg (try, next, value);
 		break;
 	    case NOTMUCH_OPT_INT:
 		*((int *)try->output_var) = strtol (value, &endptr, 10);