emacs: Add new option notmuch-search-hide-excluded

[notmuch] / tag-util.c

diff --git a/tag-util.c b/tag-util.c
index 17d7ac2f28ace0fa377bfb069fdff06fcabb36e9..accf299e0fedbe25e317c47be7aa6e09548a5a1b 100644 (file)
--- a/tag-util.c
+++ b/tag-util.c
@@ -7,7 +7,7 @@
 
 struct _tag_operation_t {
     const char *tag;
-    notmuch_bool_t remove;
+    bool remove;
 };
 
 struct _tag_op_list_t {
@@ -28,9 +28,29 @@ line_error (tag_parse_status_t status,
     fprintf (stderr, status < 0 ? "Error: " : "Warning: ");
     vfprintf (stderr, format, va_args);
     fprintf (stderr, " [%s]\n", line);
+
+    va_end (va_args);
+
     return status;
 }
 
+const char *
+illegal_tag (const char *tag, bool remove)
+{
+    if (*tag == '\0' && ! remove)
+       return "empty tag forbidden";
+
+    /* 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)
+       return "tag starting with '-' forbidden";
+
+    return NULL;
+}
+
 tag_parse_status_t
 parse_tag_line (void *ctx, char *line,
                tag_op_flag_t flags,
@@ -64,7 +84,7 @@ parse_tag_line (void *ctx, char *line,
 
     /* Parse tags. */
     while ((tok = strtok_len (tok + tok_len, " ", &tok_len)) != NULL) {
-       notmuch_bool_t remove;
+       bool remove;
        char *tag;
 
        /* Optional explicit end of tags marker. */
@@ -95,11 +115,13 @@ parse_tag_line (void *ctx, char *line,
        remove = (*tok == '-');
        tag = tok + 1;
 
-       /* Maybe refuse empty tags. */
-       if (! (flags & TAG_FLAG_BE_GENEROUS) && *tag == '\0') {
-           ret = line_error (TAG_PARSE_INVALID, line_for_error,
-                             "empty tag");
-           goto DONE;
+       /* Maybe refuse illegal tags. */
+       if (! (flags & TAG_FLAG_BE_GENEROUS)) {
+           const char *msg = illegal_tag (tag, remove);
+           if (msg) {
+               ret = line_error (TAG_PARSE_INVALID, line_for_error, msg);
+               goto DONE;
+           }
        }
 
        /* Decode tag. */
@@ -124,12 +146,6 @@ parse_tag_line (void *ctx, char *line,
     }
 
     /* tok now points to the query string */
-    if (hex_decode_inplace (tok) != HEX_SUCCESS) {
-       ret = line_error (TAG_PARSE_INVALID, line_for_error,
-                         "hex decoding of query %s failed", tok);
-       goto DONE;
-    }
-
     *query_string = tok;
 
   DONE:
@@ -137,6 +153,44 @@ 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;
+
+       bool 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,
@@ -149,6 +203,8 @@ message_error (notmuch_message_t *message,
     vfprintf (stderr, format, va_args);
     fprintf (stderr, "Message-ID: %s\n", notmuch_message_get_message_id (message));
     fprintf (stderr, "Status: %s\n", notmuch_status_to_string (status));
+
+    va_end (va_args);
 }
 
 static int
@@ -156,14 +212,12 @@ makes_changes (notmuch_message_t *message,
               tag_op_list_t *list,
               tag_op_flag_t flags)
 {
-
     size_t i;
 
     notmuch_tags_t *tags;
-    notmuch_bool_t changes = FALSE;
+    bool changes = false;
 
     /* First, do we delete an existing tag? */
-    changes = FALSE;
     for (tags = notmuch_message_get_tags (message);
         ! changes && notmuch_tags_valid (tags);
         notmuch_tags_move_to_next (tags)) {
@@ -185,11 +239,11 @@ makes_changes (notmuch_message_t *message,
     notmuch_tags_destroy (tags);
 
     if (changes)
-       return TRUE;
+       return true;
 
     /* Now check for adding new tags */
     for (i = 0; i < list->count; i++) {
-       notmuch_bool_t exists = FALSE;
+       bool exists = false;
 
        if (list->ops[i].remove)
            continue;
@@ -199,7 +253,7 @@ makes_changes (notmuch_message_t *message,
             notmuch_tags_move_to_next (tags)) {
            const char *cur_tag = notmuch_tags_get (tags);
            if (strcmp (cur_tag, list->ops[i].tag) == 0) {
-               exists = TRUE;
+               exists = true;
                break;
            }
        }
@@ -210,9 +264,9 @@ makes_changes (notmuch_message_t *message,
         * but this is OK from a correctness point of view
         */
        if (! exists)
-           return TRUE;
+           return true;
     }
-    return FALSE;
+    return false;
 
 }
 
@@ -269,7 +323,7 @@ tag_op_list_apply (notmuch_message_t *message,
     if (flags & TAG_FLAG_MAILDIR_SYNC) {
        status = notmuch_message_tags_to_maildir_flags (message);
        if (status) {
-           message_error (message, status, "synching tags to maildir");
+           message_error (message, status, "syncing tags to maildir");
            return status;
        }
     }
@@ -305,7 +359,7 @@ tag_op_list_create (void *ctx)
 int
 tag_op_list_append (tag_op_list_t *list,
                    const char *tag,
-                   notmuch_bool_t remove)
+                   bool remove)
 {
     /* Make room if current array is full.  This should be a fairly
      * rare case, considering the initial array size.
@@ -333,7 +387,7 @@ tag_op_list_append (tag_op_list_t *list,
  *   Is the i'th tag operation a remove?
  */
 
-notmuch_bool_t
+bool
 tag_op_list_isremove (const tag_op_list_t *list, size_t i)
 {
     assert (i < list->count);