X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-tag.c;h=3a489a97c50e2ed55edd7bdd2ba7cc46abe69441;hb=0b6349d70557589563f6eb2a23c2a1fa1330e54a;hp=07cb8c5f21b53df36452b3fc14415b63f2f0b075;hpb=94eb9aacd40a8aa133f64bbe5ed71c0138fb5ed9;p=notmuch

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 07cb8c5f..3a489a97 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -25,8 +25,10 @@ static volatile sig_atomic_t interrupted;
 static void
 handle_sigint (unused (int sig))
 {
+    ssize_t ignored;
+
     static char msg[] = "Stopping...         \n";
-    write(2, msg, sizeof(msg)-1);
+    ignored = write(2, msg, sizeof(msg)-1);
     interrupted = 1;
 }
 
@@ -98,6 +100,8 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 				     NOTMUCH_DATABASE_MODE_READ_WRITE);
     if (notmuch == NULL)
 	return 1;
+    notmuch_database_set_maildir_sync (notmuch,
+				       notmuch_config_get_maildir_sync (config));
 
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL) {
@@ -105,9 +109,12 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 	return 1;
     }
 
+    /* tagging is not interested in any special sort order */
+    notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
+
     for (messages = notmuch_query_search_messages (query);
-	 notmuch_messages_has_more (messages) && !interrupted;
-	 notmuch_messages_advance (messages))
+	 notmuch_messages_valid (messages) && !interrupted;
+	 notmuch_messages_move_to_next (messages))
     {
 	message = notmuch_messages_get (messages);