debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: resurrect support for single-message mbox files

Browse source 
This is effectively a revert of

commit 6812136bf5
Author: Jani Nikula <jani@nikula.org>
Date:   Mon Mar 31 00:21:48 2014 +0300

    lib: drop support for single-message mbox files

The intention was to drop support for indexing new single-message mbox
files (and whether that was a good idea in the first place is
arguable). However this inadvertently broke support for reading
headers from previously indexed single-message mbox files, which is
far worse.

Distinguishing between the two cases would require more code than
simply bringing back support for single-message mbox files.
This commit is contained in:
Jani Nikula 2014-06-05 08:34:09 +02:00 committed by David Bremner
parent 2d722bf032
commit 0cc0144875
2 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/message-file.c
View file

@ -117,7 +117,7 @@ notmuch_message_file_close (notmuch_message_file_t *message)
} }
static notmuch_bool_t static notmuch_bool_t
is_mbox (FILE *file) _is_mbox (FILE *file)
{ {
char from_buf[5]; char from_buf[5];
notmuch_bool_t ret = FALSE; notmuch_bool_t ret = FALSE;
@ -139,13 +139,12 @@ _notmuch_message_file_parse (notmuch_message_file_t *message)
GMimeParser *parser; GMimeParser *parser;
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS; notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
static int initialized = 0; static int initialized = 0;
notmuch_bool_t is_mbox;
if (message->message) if (message->message)
return NOTMUCH_STATUS_SUCCESS; return NOTMUCH_STATUS_SUCCESS;
/* We no longer support mboxes at all. */ is_mbox = _is_mbox (message->file);
if (is_mbox (message->file))
return NOTMUCH_STATUS_FILE_NOT_EMAIL;
if (! initialized) { if (! initialized) {
g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS); g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
@ -163,7 +162,7 @@ _notmuch_message_file_parse (notmuch_message_file_t *message)
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE); g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
parser = g_mime_parser_new_with_stream (stream); parser = g_mime_parser_new_with_stream (stream);
g_mime_parser_set_scan_from (parser, FALSE); g_mime_parser_set_scan_from (parser, is_mbox);
message->message = g_mime_parser_construct_message (parser); message->message = g_mime_parser_construct_message (parser);
if (! message->message) { if (! message->message) {
@ -171,6 +170,27 @@ _notmuch_message_file_parse (notmuch_message_file_t *message)
goto DONE; goto DONE;
} }
if (is_mbox) {
if (! g_mime_parser_eos (parser)) {
/* This is a multi-message mbox. */
status = 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.
*/
static notmuch_bool_t mbox_warning = FALSE;
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", message->filename);
}
}
DONE: DONE:
g_object_unref (stream); g_object_unref (stream);
g_object_unref (parser); g_object_unref (parser);

26
test/T050-new.sh
View file

@ -163,6 +163,22 @@ rm -rf "${MAIL_DIR}"/two
output=$(NOTMUCH_NEW) output=$(NOTMUCH_NEW)
test_expect_equal "$output" "No new mail. Removed 3 messages." test_expect_equal "$output" "No new mail. Removed 3 messages."
test_begin_subtest "Support single-message mbox (deprecated)"
cat > "${MAIL_DIR}"/mbox_file1 <<EOF
From test_suite@notmuchmail.org Fri Jan 5 15:43:57 2001
From: Notmuch Test Suite <test_suite@notmuchmail.org>
To: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Test mbox message 1
Body.
EOF
output=$(NOTMUCH_NEW 2>&1)
test_expect_equal "$output" \
"Warning: ${MAIL_DIR}/mbox_file1 is an mbox containing a single message,
likely caused by misconfigured mail delivery. Support for single-message
mboxes is deprecated and may be removed in the future.
Added 1 new message to the database."
# This test requires that notmuch new has been run at least once. # This test requires that notmuch new has been run at least once.
test_begin_subtest "Skip and report non-mail files" test_begin_subtest "Skip and report non-mail files"
generate_message generate_message
@ -184,24 +200,14 @@ Subject: Test mbox message 2
Body 2. Body 2.
EOF EOF
cat > "${MAIL_DIR}"/mbox_file1 <<EOF
From test_suite@notmuchmail.org Fri Jan 5 15:43:57 2001
From: Notmuch Test Suite <test_suite@notmuchmail.org>
To: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Test mbox message 1
Body.
EOF
output=$(NOTMUCH_NEW 2>&1) output=$(NOTMUCH_NEW 2>&1)
test_expect_equal "$output" \ test_expect_equal "$output" \
"Note: Ignoring non-mail file: ${MAIL_DIR}/.git/config "Note: Ignoring non-mail file: ${MAIL_DIR}/.git/config
Note: Ignoring non-mail file: ${MAIL_DIR}/.ignored_hidden_file Note: Ignoring non-mail file: ${MAIL_DIR}/.ignored_hidden_file
Note: Ignoring non-mail file: ${MAIL_DIR}/ignored_file Note: Ignoring non-mail file: ${MAIL_DIR}/ignored_file
Note: Ignoring non-mail file: ${MAIL_DIR}/mbox_file Note: Ignoring non-mail file: ${MAIL_DIR}/mbox_file
Note: Ignoring non-mail file: ${MAIL_DIR}/mbox_file1
Added 1 new message to the database." Added 1 new message to the database."
rm "${MAIL_DIR}"/mbox_file rm "${MAIL_DIR}"/mbox_file
rm "${MAIL_DIR}"/mbox_file1
test_begin_subtest "Ignore files and directories specified in new.ignore" test_begin_subtest "Ignore files and directories specified in new.ignore"
generate_message generate_message