reply: add test for multiple Delivered-To headers

[notmuch] / notmuch-tag.c

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 205f27334066ac1485bed439c7beaf88e694cd56..de428c8e9d99b902701a296a577cba87cb00c99c 100644 (file)
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -27,7 +27,7 @@ static volatile sig_atomic_t interrupted;
 static void
 handle_sigint (unused (int sig))
 {
-    static char msg[] = "Stopping...         \n";
+    static const char msg[] = "Stopping...         \n";
 
     /* This write is "opportunistic", so it's okay to ignore the
      * result.  It is not required for correctness, and if it does
@@ -187,11 +187,10 @@ tag_file (void *ctx, notmuch_database_t *notmuch, tag_op_flag_t flags,
 }
 
 int
-notmuch_tag_command (notmuch_config_t *config, unused(notmuch_database_t *notmuch), int argc, char *argv[])
+notmuch_tag_command (notmuch_database_t *notmuch, int argc, char *argv[])
 {
     tag_op_list_t *tag_ops = NULL;
     char *query_string = NULL;
-    notmuch_database_t *notmuch;
     struct sigaction action;
     tag_op_flag_t tag_flags = TAG_FLAG_NONE;
     bool batch = false;
@@ -200,6 +199,7 @@ notmuch_tag_command (notmuch_config_t *config, unused(notmuch_database_t *notmuc
     const char *input_file_name = NULL;
     int opt_index;
     int ret;
+    notmuch_bool_t synchronize_flags;
 
     /* Set up our handler for SIGINT */
     memset (&action, 0, sizeof (struct sigaction));
@@ -240,13 +240,13 @@ notmuch_tag_command (notmuch_config_t *config, unused(notmuch_database_t *notmuc
            return EXIT_FAILURE;
        }
     } else {
-       tag_ops = tag_op_list_create (config);
+       tag_ops = tag_op_list_create (notmuch);
        if (tag_ops == NULL) {
            fprintf (stderr, "Out of memory.\n");
            return EXIT_FAILURE;
        }
 
-       if (parse_tag_command_line (config, argc - opt_index, argv + opt_index,
+       if (parse_tag_command_line (notmuch, argc - opt_index, argv + opt_index,
                                    &query_string, tag_ops))
            return EXIT_FAILURE;
 
@@ -261,22 +261,25 @@ notmuch_tag_command (notmuch_config_t *config, unused(notmuch_database_t *notmuc
        }
     }
 
-    if (notmuch_database_open (notmuch_config_get_database_path (config),
-                              NOTMUCH_DATABASE_MODE_READ_WRITE, &notmuch))
-       return EXIT_FAILURE;
-
     notmuch_exit_if_unmatched_db_uuid (notmuch);
 
-    if (notmuch_config_get_maildir_synchronize_flags (config))
+    if (print_status_database (
+           "notmuch restore",
+           notmuch,
+           notmuch_config_get_bool (notmuch, NOTMUCH_CONFIG_SYNC_MAILDIR_FLAGS,
+                                    &synchronize_flags)))
+       return EXIT_FAILURE;
+
+    if (synchronize_flags)
        tag_flags |= TAG_FLAG_MAILDIR_SYNC;
 
     if (remove_all)
        tag_flags |= TAG_FLAG_REMOVE_ALL;
 
     if (batch)
-       ret = tag_file (config, notmuch, tag_flags, input);
+       ret = tag_file (notmuch, notmuch, tag_flags, input);
     else
-       ret = tag_query (config, notmuch, query_string, tag_ops, tag_flags);
+       ret = tag_query (notmuch, notmuch, query_string, tag_ops, tag_flags);
 
     notmuch_database_destroy (notmuch);