X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-tag.c;h=60e21e0deb8c89e02e29d3845233fa7687701668;hp=12ab86c58d8429229b27a870ec98962ea1e70304;hb=bb74e9dff80e64734308d5997c756fd96d041235;hpb=394cb1c46d91a1bb28df9cc4a563e1115cc9af34

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 12ab86c5..60e21e0d 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;
 }
 
@@ -43,6 +45,7 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     struct sigaction action;
+    notmuch_bool_t synchronize_flags;
     int i;
 
     /* Setup our handler for SIGINT */
@@ -94,19 +97,25 @@ 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;
 
+    synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
+
     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);
-	 notmuch_messages_has_more (messages) && !interrupted;
-	 notmuch_messages_advance (messages))
+    /* 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_valid (messages) && !interrupted;
+	 notmuch_messages_move_to_next (messages))
     {
 	message = notmuch_messages_get (messages);
 
@@ -121,6 +130,9 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 
 	notmuch_message_thaw (message);
 
+	if (synchronize_flags)
+	    notmuch_message_tags_to_maildir_flags (message);
+
 	notmuch_message_destroy (message);
     }