diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/index.cc | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/lib/index.cc b/lib/index.cc index 78c18cf3..2100cce0 100644 --- a/lib/index.cc +++ b/lib/index.cc @@ -436,8 +436,6 @@ _notmuch_message_index_file (notmuch_message_t *message, notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; static int initialized = 0; char from_buf[5]; - bool is_mbox = false; - static bool mbox_warning = false; if (! initialized) { g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS); @@ -453,36 +451,20 @@ _notmuch_message_index_file (notmuch_message_t *message, /* Is this mbox? */ if (fread (from_buf, sizeof (from_buf), 1, file) == 1 && - strncmp (from_buf, "From ", 5) == 0) - is_mbox = true; + strncmp (from_buf, "From ", 5) == 0) { + ret = NOTMUCH_STATUS_FILE_NOT_EMAIL; + goto DONE; + } rewind (file); /* Evil GMime steals my FILE* here so I won't fclose it. */ stream = g_mime_stream_file_new (file); parser = g_mime_parser_new_with_stream (stream); - g_mime_parser_set_scan_from (parser, is_mbox); + g_mime_parser_set_scan_from (parser, FALSE); mime_message = g_mime_parser_construct_message (parser); - if (is_mbox) { - if (!g_mime_parser_eos (parser)) { - /* This is a multi-message mbox. */ - ret = NOTMUCH_STATUS_FILE_NOT_EMAIL; - goto DONE; - } - /* For historical reasons, we support single-message mboxes, - * but this behavior is likely to change in the future, so - * warn. */ - if (!mbox_warning) { - mbox_warning = true; - fprintf (stderr, "\ -Warning: %s is an mbox containing a single message,\n\ -likely caused by misconfigured mail delivery. Support for single-message\n\ -mboxes is deprecated and may be removed in the future.\n", filename); - } - } - from = g_mime_message_get_sender (mime_message); addresses = internet_address_list_parse_string (from); |