Avoid abbreviation, preferring notmuch_config_get_maildir_synchronize_flags

[notmuch] / notmuch-tag.c

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 7d92ec485eabc7233d176bc2b8374a81bde494c5..53f08f43dc1019a9f8ada6e905dc1d36f5c43d5c 100644 (file)
--- 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;
 }
 
@@ -83,8 +85,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,11 +96,12 @@ 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]);
+    notmuch_database_set_maildir_sync (notmuch,
+                                      notmuch_config_get_maildir_synchronize_flags (config));
 
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL) {
@@ -104,9 +109,12 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
        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);