tag-util: factor out rules for illegal tags, use in parse_tag_line

[notmuch] / tag-util.c

diff --git a/tag-util.c b/tag-util.c
index eab482f3012888b6c401b85b3775b01c274d7d5f..0a4fe789c61c90e0669f976801f348870ff5e541 100644 (file)
--- a/tag-util.c
+++ b/tag-util.c
@@ -31,6 +31,30 @@ 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 *
+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.
+     */
+
+    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,
@@ -40,14 +64,14 @@ parse_tag_line (void *ctx, char *line,
     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");
-       return -1;
+       return TAG_PARSE_OUT_OF_MEMORY;
     }
 
     /* remove leading space */
@@ -95,11 +119,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. */
@@ -109,7 +135,7 @@ parse_tag_line (void *ctx, char *line,
            goto DONE;
        }
 
-       if (tag_op_list_append (ctx, tag_ops, tag, remove)) {
+       if (tag_op_list_append (tag_ops, tag, remove)) {
            ret = line_error (TAG_PARSE_OUT_OF_MEMORY, line_for_error,
                              "aborting");
            goto DONE;
@@ -124,12 +150,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:
@@ -294,7 +314,7 @@ tag_op_list_create (void *ctx)
     list->size = TAG_OP_LIST_INITIAL_SIZE;
     list->count = 0;
 
-    list->ops = talloc_array (ctx, tag_operation_t, list->size);
+    list->ops = talloc_array (list, tag_operation_t, list->size);
     if (list->ops == NULL)
        return NULL;
 
@@ -303,8 +323,7 @@ tag_op_list_create (void *ctx)
 
 
 int
-tag_op_list_append (void *ctx,
-                   tag_op_list_t *list,
+tag_op_list_append (tag_op_list_t *list,
                    const char *tag,
                    notmuch_bool_t remove)
 {
@@ -314,7 +333,7 @@ tag_op_list_append (void *ctx,
 
     if (list->count == list->size) {
        list->size *= 2;
-       list->ops = talloc_realloc (ctx, list->ops, tag_operation_t,
+       list->ops = talloc_realloc (list, list->ops, tag_operation_t,
                                    list->size);
        if (list->ops == NULL) {
            fprintf (stderr, "Out of memory.\n");