From 6e6bafed0f88f914da34ec55087418756e485e52 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 29 Mar 2016 23:03:02 -0300 Subject: [PATCH] cli/new: add better error messages for FILE_ERROR The code in add_file seems to assume that NOTMUCH_STATUS_FILE_ERROR is never returned from add_message. This turns out to be false (although it seems to only happen in certain fairly rare race conditions). --- notmuch-new.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/notmuch-new.c b/notmuch-new.c index e5037761..04cb5cac 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -281,6 +281,10 @@ add_file (notmuch_database_t *notmuch, const char *filename, fprintf (stderr, "Note: Ignoring non-mail file: %s\n", filename); break; /* Fatal issues. Don't process anymore. */ + case NOTMUCH_STATUS_FILE_ERROR: + fprintf (stderr, "Unexpected error with file %s\n", filename); + (void) print_status_database ("add_file", notmuch, status); + goto DONE; case NOTMUCH_STATUS_READ_ONLY_DATABASE: case NOTMUCH_STATUS_XAPIAN_EXCEPTION: case NOTMUCH_STATUS_OUT_OF_MEMORY: