[PATCH 05/17] new: Don't lose messages on SIGINT.
Austin Clements
amdragon at MIT.EDU
Sat Jun 11 13:04:31 PDT 2011
Previously, message removals were always performed, even after a
SIGINT. As a result, when a message was moved from one folder to
another, a SIGINT between processing the directory the message was
removed from and processing the directory it was added to would result
in notmuch removing that message from the database.
---
notmuch-new.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/notmuch-new.c b/notmuch-new.c
index 744f4ca..6859594 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -841,7 +841,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
removed_files = 0;
renamed_files = 0;
gettimeofday (&tv_start, NULL);
- for (f = add_files_state.removed_files->head; f; f = f->next) {
+ for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) {
status = notmuch_database_remove_message (notmuch, f->filename);
if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)
renamed_files++;
@@ -856,7 +856,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
}
gettimeofday (&tv_start, NULL);
- for (f = add_files_state.removed_directories->head, i = 0; f; f = f->next, i++) {
+ for (f = add_files_state.removed_directories->head, i = 0; f && !interrupted; f = f->next, i++) {
_remove_directory (ctx, notmuch, f->filename,
&renamed_files, &removed_files);
if (do_print_progress) {
--
1.7.5.1
More information about the notmuch
mailing list