test: Test upgrade to ghost messages feature

[notmuch] / tag-util.c

diff --git a/tag-util.c b/tag-util.c
index 705b7baa383589468aa816b6a5811fe0725671a5..343c161f471aa827ff186df01e7c24afe71e5d06 100644 (file)
--- a/tag-util.c
+++ b/tag-util.c
@@ -31,6 +31,24 @@ line_error (tag_parse_status_t status,
     return status;
 }
 
     return status;
 }
 

+const char *
+illegal_tag (const char *tag, notmuch_bool_t 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,
 tag_parse_status_t
 parse_tag_line (void *ctx, char *line,
                tag_op_flag_t flags,


@@ -40,14 +58,14 @@ parse_tag_line (void *ctx, char *line,
     char *tok = line;
     size_t tok_len = 0;
     char *line_for_error;
     char *tok = line;
     size_t tok_len = 0;
     char *line_for_error;

-    int ret = 0;
+    tag_parse_status_t ret = TAG_PARSE_SUCCESS;

 
     chomp_newline (line);
 
     line_for_error = talloc_strdup (ctx, line);
     if (line_for_error == NULL) {
        fprintf (stderr, "Error: out of memory\n");
 
     chomp_newline (line);
 
     line_for_error = talloc_strdup (ctx, line);
     if (line_for_error == NULL) {
        fprintf (stderr, "Error: out of memory\n");

-       return -1;
+       return TAG_PARSE_OUT_OF_MEMORY;

     }
 
     /* remove leading space */
     }
 
     /* remove leading space */


@@ -95,11 +113,13 @@ parse_tag_line (void *ctx, char *line,
        remove = (*tok == '-');
        tag = tok + 1;
 
        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. */
        }
 
        /* Decode tag. */


@@ -124,12 +144,6 @@ parse_tag_line (void *ctx, char *line,
     }
 
     /* tok now points to the query string */
     }
 
     /* 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:
     *query_string = tok;
 
   DONE:


@@ -137,6 +151,45 @@ parse_tag_line (void *ctx, char *line,
     return ret;
 }
 
     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,
 static inline void
 message_error (notmuch_message_t *message,
               notmuch_status_t status,