cli: make caller check tag count in parse_tag_command_line

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 0e73197cfb59595f5e7782d3e3d1c79aec2066f9..bc61aab8673a532bd3f80526b77db5aedb4284e2 100644 (file)
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -233,6 +233,11 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])
        if (parse_tag_command_line (config, argc - opt_index, argv + opt_index,
                                    &query_string, tag_ops))
            return 1;
+
+       if (tag_op_list_size (tag_ops) == 0) {
+           fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
+           return 1;
+       }
     }
 
     if (notmuch_database_open (notmuch_config_get_database_path (config),

diff --git a/tag-util.c b/tag-util.c
index 701d329794b59a9c13f43a4e257ba752c944454a..c5f585950921af59659dddf8d635c95ae1853a2c 100644 (file)
--- a/tag-util.c
+++ b/tag-util.c
@@ -188,11 +188,6 @@ parse_tag_command_line (void *ctx, int argc, char **argv,
        tag_op_list_append (tag_ops, argv[i] + 1, is_remove);
     }
 
-    if (tag_op_list_size (tag_ops) == 0) {
-       fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
-       return TAG_PARSE_INVALID;
-    }
-
     *query_str = query_string_from_args (ctx, argc - i, &argv[i]);
 
     if (*query_str == NULL || **query_str == '\0') {