Merge branch 'debian' into rebuild

[notmuch] / notmuch-tag.c

diff --git a/notmuch-tag.c b/notmuch-tag.c
index b9cbb77d243f2a4b6534f8dc0e17ff9001c1c406..8b6f7dc081f4dcd79cba27539ccc0dca9fdfc246 100644 (file)
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -20,37 +20,50 @@
 
 #include "notmuch-client.h"
 
+static volatile sig_atomic_t interrupted;
+
+static void
+handle_sigint (unused (int sig))
+{
+    ssize_t ignored;
+
+    static char msg[] = "Stopping...         \n";
+    ignored = write(2, msg, sizeof(msg)-1);
+    interrupted = 1;
+}
+
 int
 notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 {
-    void *local;
     int *add_tags, *remove_tags;
     int add_tags_count = 0;
     int remove_tags_count = 0;
     char *query_string;
-    notmuch_database_t *notmuch = NULL;
+    notmuch_config_t *config;
+    notmuch_database_t *notmuch;
     notmuch_query_t *query;
     notmuch_messages_t *messages;
     notmuch_message_t *message;
-    int ret = 0;
+    struct sigaction action;
     int i;
 
-    local = talloc_new (ctx);
-    if (local == NULL) {
-       ret = 1;
-       goto DONE;
-    }
+    /* Setup our handler for SIGINT */
+    memset (&action, 0, sizeof (struct sigaction));
+    action.sa_handler = handle_sigint;
+    sigemptyset (&action.sa_mask);
+    action.sa_flags = SA_RESTART;
+    sigaction (SIGINT, &action, NULL);
 
-    add_tags = talloc_size (local, argc * sizeof (int));
+    add_tags = talloc_size (ctx, argc * sizeof (int));
     if (add_tags == NULL) {
-       ret = 1;
-       goto DONE;
+       fprintf (stderr, "Out of memory.\n");
+       return 1;
     }
 
-    remove_tags = talloc_size (local, argc * sizeof (int));
+    remove_tags = talloc_size (ctx, argc * sizeof (int));
     if (remove_tags == NULL) {
-       ret = 1;
-       goto DONE;
+       fprintf (stderr, "Out of memory.\n");
+       return 1;
     }
 
     for (i = 0; i < argc; i++) {
@@ -69,34 +82,34 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 
     if (add_tags_count == 0 && remove_tags_count == 0) {
        fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
-       ret = 1;
-       goto DONE;
+       return 1;
     }
 
-    if (i == argc) {
-       fprintf (stderr, "Error: 'notmuch tag' requires at least one search term.\n");
-       ret = 1;
-       goto DONE;
-    }
+    query_string = query_string_from_args (ctx, argc - i, &argv[i]);
 
-    notmuch = notmuch_database_open (NULL);
-    if (notmuch == NULL) {
-       ret = 1;
-       goto DONE;
+    if (*query_string == '\0') {
+       fprintf (stderr, "Error: notmuch tag requires at least one search term.\n");
+       return 1;
     }
 
-    query_string = query_string_from_args (local, argc - i, &argv[i]);
+    config = notmuch_config_open (ctx, NULL, NULL);
+    if (config == NULL)
+       return 1;
+
+    notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
+                                    NOTMUCH_DATABASE_MODE_READ_WRITE);
+    if (notmuch == NULL)
+       return 1;
 
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL) {
        fprintf (stderr, "Out of memory.\n");
-       ret = 1;
-       goto DONE;
+       return 1;
     }
 
     for (messages = notmuch_query_search_messages (query);
-        notmuch_messages_has_more (messages);
-        notmuch_messages_advance (messages))
+        notmuch_messages_valid (messages) && !interrupted;
+        notmuch_messages_move_to_next (messages))
     {
        message = notmuch_messages_get (messages);
 
@@ -115,12 +128,7 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
     }
 
     notmuch_query_destroy (query);
+    notmuch_database_close (notmuch);
 
-  DONE:
-    if (notmuch)
-       notmuch_database_close (notmuch);
-
-    talloc_free (local);
-
-    return ret;
+    return interrupted;
 }