util: Fix two corner-cases in boolean term quoting function

[notmuch] / tag-util.c

diff --git a/tag-util.c b/tag-util.c
index 0a4fe789c61c90e0669f976801f348870ff5e541..343c161f471aa827ff186df01e7c24afe71e5d06 100644 (file)
--- a/tag-util.c
+++ b/tag-util.c
@@ -31,22 +31,16 @@ line_error (tag_parse_status_t status,
     return status;
 }
 
-/*
- * Test tags for some forbidden cases.
- *
- * return: NULL if OK,
- *        explanatory message otherwise.
- */
-
-static const char *
+const char *
 illegal_tag (const char *tag, notmuch_bool_t remove)
 {
 
     if (*tag == '\0' && ! remove)
        return "empty tag forbidden";
 
-    /* This disallows adding the non-removable tag "-" and
-     * enables notmuch tag to take long options more easily.
+    /* This disallows adding tags starting with "-", in particular the
+     * non-removable tag "-" and enables notmuch tag to take long
+     * options more easily.
      */
 
     if (*tag == '-' && ! remove)
@@ -157,6 +151,45 @@ parse_tag_line (void *ctx, char *line,
     return ret;
 }
 
+tag_parse_status_t
+parse_tag_command_line (void *ctx, int argc, char **argv,
+                       char **query_str, tag_op_list_t *tag_ops)
+{
+
+    int i;
+
+    for (i = 0; i < argc; i++) {
+       if (strcmp (argv[i], "--") == 0) {
+           i++;
+           break;
+       }
+
+       if (argv[i][0] != '+' && argv[i][0] != '-')
+           break;
+
+       notmuch_bool_t is_remove = argv[i][0] == '-';
+       const char *msg;
+
+       msg = illegal_tag (argv[i] + 1, is_remove);
+       if (msg) {
+           fprintf (stderr, "Error: %s\n", msg);
+           return TAG_PARSE_INVALID;
+       }
+
+       tag_op_list_append (tag_ops, argv[i] + 1, is_remove);
+    }
+
+    *query_str = query_string_from_args (ctx, argc - i, &argv[i]);
+
+    if (*query_str == NULL) {
+       fprintf (stderr, "Out of memory.\n");
+       return TAG_PARSE_OUT_OF_MEMORY;
+    }
+
+    return TAG_PARSE_SUCCESS;
+}
+
+
 static inline void
 message_error (notmuch_message_t *message,
               notmuch_status_t status,