X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-restore.c;h=b8f99a39f90bf0a8d951df8750f867ce453305f9;hp=18cbece6442b3abbbeef636bdbbe164d8a949b6a;hb=14807ed2de1290740b56952561f745c0a5ab6168;hpb=13569ad6c96c3f3a653ac51274056614647ad7ef 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);