From: "Keith Packard" <keithp@keithp.com>
To: notmuch@notmuchmail.org
Subject: [PATCH] Don't bother checking for mbox files
User-Agent: Notmuch/0.21 (http://notmuchmail.org) Emacs/24.5.1
 (x86_64-pc-linux-gnu)
Date: Wed, 09 Mar 2016 16:08:17 -0800
Message-ID: <86io0v9oum.fsf@hiro.keithp.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha256; protocol="application/pgp-signature"
Precedence: list

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable


Postfix adds mbox-style From lines when used in combination with
maildrop or .forward files. If they have another line starting with
'From ' in them, notmuch complains about them not being mail files.

If we assume the user hasn't screwed up and misconfigured their mail
system, then we can safely ignore whether the file started with an
mbox header and just parse it as a single-message file.

I can't see any harm in doing this; in the worst case, you'll have a
single 'message' which contains multiple emails now, while the
alternative is to miss mail entirely.

I could be convinced to add a config option to enable this behaviour,
but I'd really rather not.

Signed-off-by: Keith Packard <keithp@keithp.com>
=2D--
 lib/message-file.c | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/lib/message-file.c b/lib/message-file.c
index ee30520..f03e1db 100644
=2D-- a/lib/message-file.c
+++ b/lib/message-file.c
@@ -98,22 +98,6 @@ _notmuch_message_file_close (notmuch_message_file_t *mes=
sage)
     talloc_free (message);
 }
=20
=2Dstatic notmuch_bool_t
=2D_is_mbox (FILE *file)
=2D{
=2D    char from_buf[5];
=2D    notmuch_bool_t ret =3D FALSE;
=2D
=2D    /* Is this mbox? */
=2D    if (fread (from_buf, sizeof (from_buf), 1, file) =3D=3D 1 &&
=2D	strncmp (from_buf, "From ", 5) =3D=3D 0)
=2D	ret =3D TRUE;
=2D
=2D    rewind (file);
=2D
=2D    return ret;
=2D}
=2D
 notmuch_status_t
 _notmuch_message_file_parse (notmuch_message_file_t *message)
 {
@@ -121,13 +105,10 @@ _notmuch_message_file_parse (notmuch_message_file_t *=
message)
     GMimeParser *parser;
     notmuch_status_t status =3D NOTMUCH_STATUS_SUCCESS;
     static int initialized =3D 0;
=2D    notmuch_bool_t is_mbox;
=20
     if (message->message)
 	return NOTMUCH_STATUS_SUCCESS;
=20
=2D    is_mbox =3D _is_mbox (message->file);
=2D
     if (! initialized) {
 	g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
 	initialized =3D 1;
@@ -144,7 +125,7 @@ _notmuch_message_file_parse (notmuch_message_file_t *me=
ssage)
     g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
=20
     parser =3D g_mime_parser_new_with_stream (stream);
=2D    g_mime_parser_set_scan_from (parser, is_mbox);
+    g_mime_parser_set_scan_from (parser, FALSE);
=20
     message->message =3D g_mime_parser_construct_message (parser);
     if (! message->message) {
@@ -152,14 +133,6 @@ _notmuch_message_file_parse (notmuch_message_file_t *m=
essage)
 	goto DONE;
     }
=20
=2D    if (is_mbox && ! g_mime_parser_eos (parser)) {
=2D	/*
=2D	 * This is a multi-message mbox. (For historical reasons, we
=2D	 * do support single-message mboxes.)
=2D	 */
=2D	status =3D NOTMUCH_STATUS_FILE_NOT_EMAIL;
=2D    }
=2D
   DONE:
     g_object_unref (stream);
     g_object_unref (parser);
=2D-=20
2.7.0


=2D-=20
=2Dkeith

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIVAwUBVuC68tsiGmkAAAARAQgs8A/9FPH/S8fAm+4eKV5WhbtdqJSOH1UV1oD1
TgR/e68BoetNGXwsolvyTADYf/u6R/JxSAHQwkgRPvL/LbsG+gwrt+MCSFfburwW
rcJ7snYzpRhyvlone7wEGt2xlzuQGbZC43YSkL5npVupnKqgaoL/7x26ciF+u6Qq
OBz7CDGs530WGlgSyoQYfjLkVhY1S3zBL1+INfevK0DUIB+TZmh9bAppTxp3hewH
bF+YoZA/KaAzys0oNMHH7oMJRPYzLnKGjriqq/H2HUwKjZcf/VU+TFOcXL2RBoN4
KxUf7O6/flhb6CY40iJuhzLVuX0geckVmRchbFnIYxKpYIaf26BWK7dWJTBZCvdK
bwPJzHhVapsnk9grRYbguJHxomqBVfPqrFZYYzIzLqEbAybqcWCuZ88cnzqTdHqd
Rhqg2xlUnBYqkp8DmTv+qiNSQ0h8V8Gq5MZ7LZ9g93NCMkfD0MaoslgYaDIIDCpG
Yu8jnqet+vdvMIYE936yfRUvSSy53qjFxAg90NlMgpjGm2TorD3Z66wfI5c2Oby+
z3Tr0EHCEZYfRVbdZaFQBaSdFyUmuMB6HiL9s49Y9CkY/6ncJPqKwpNvA/WLPOow
RcP10f659lMCRVOVePTCsmXUKIhypKWGuXuge+wqnVfpCtAuvbb0FMD9vrF2sET7
YYAJ5AWJAUE=
=hHCz
-----END PGP SIGNATURE-----
--=-=-=--