From c004e1e04b9d1b80ea65b26d65a9ec20641cc64c Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 16 Nov 2009 11:53:35 -0800 Subject: [PATCH] notmuch restore was skipping entries with no new tags notmuch restore used to only add tags; now that it clears existing tags, it needs to operate on messages even if the new tag list is empty. Signed-off-by: Keith Packard Reviewed-by: Carl Worth : I fixed up the indentation here, (someday we might switch to 8-space indents, but we haven't yet). --- notmuch-restore.c | 53 ++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/notmuch-restore.c b/notmuch-restore.c index 18cbece6..b8f99a39 100644 --- a/notmuch-restore.c +++ b/notmuch-restore.c @@ -81,37 +81,34 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) tags = xstrndup (line + match[2].rm_so, match[2].rm_eo - match[2].rm_so); - if (strlen (tags)) { - - message = notmuch_database_find_message (notmuch, message_id); - if (message == NULL) { - fprintf (stderr, "Warning: Cannot apply tags to missing message: %s\n", - message_id); - goto NEXT_LINE; - } + message = notmuch_database_find_message (notmuch, message_id); + if (message == NULL) { + fprintf (stderr, "Warning: Cannot apply tags to missing message: %s\n", + message_id); + goto NEXT_LINE; + } - notmuch_message_freeze (message); - - notmuch_message_remove_all_tags (message); - - next = tags; - while (next) { - tag = strsep (&next, " "); - if (*tag == '\0') - continue; - status = notmuch_message_add_tag (message, tag); - if (status) { - fprintf (stderr, - "Error applying tag %s to message %s:\n", - tag, message_id); - fprintf (stderr, "%s\n", - notmuch_status_to_string (status)); - } + notmuch_message_freeze (message); + + notmuch_message_remove_all_tags (message); + + next = tags; + while (next) { + tag = strsep (&next, " "); + if (*tag == '\0') + continue; + status = notmuch_message_add_tag (message, tag); + if (status) { + fprintf (stderr, + "Error applying tag %s to message %s:\n", + tag, message_id); + fprintf (stderr, "%s\n", + notmuch_status_to_string (status)); } - - notmuch_message_thaw (message); - notmuch_message_destroy (message); } + + notmuch_message_thaw (message); + notmuch_message_destroy (message); NEXT_LINE: free (message_id); free (tags); -- 2.26.2