X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-tag.c;h=07cb8c5f21b53df36452b3fc14415b63f2f0b075;hp=7d92ec485eabc7233d176bc2b8374a81bde494c5;hb=70962fabf9c57cda5af26c28894fc9371fd085f2;hpb=f4245aec94815176a52baae57a6c260b2bbae9c2

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 7d92ec48..07cb8c5f 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -83,8 +83,10 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 	return 1;
     }
 
-    if (i == argc) {
-	fprintf (stderr, "Error: 'notmuch tag' requires at least one search term.\n");
+    query_string = query_string_from_args (ctx, argc - i, &argv[i]);
+
+    if (*query_string == '\0') {
+	fprintf (stderr, "Error: notmuch tag requires at least one search term.\n");
 	return 1;
     }
 
@@ -92,19 +94,18 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
     if (config == NULL)
 	return 1;
 
-    notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
+    notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
+				     NOTMUCH_DATABASE_MODE_READ_WRITE);
     if (notmuch == NULL)
 	return 1;
 
-    query_string = query_string_from_args (ctx, argc - i, &argv[i]);
-
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL) {
 	fprintf (stderr, "Out of memory.\n");
 	return 1;
     }
 
-    for (messages = notmuch_query_search_messages (query, 0, -1);
+    for (messages = notmuch_query_search_messages (query);
 	 notmuch_messages_has_more (messages) && !interrupted;
 	 notmuch_messages_advance (messages))
     {