From 484639453a8eee0581d00e7d7da85c31df39c4c8 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Fri, 5 Nov 2010 17:17:53 -0700 Subject: [PATCH] test: Update mail corpus with original mails (with attachments). The original mails used to pupulate the mail corpus had had their attachments (obnoxiously) scrubbed by the pipermail mail archiver. Since we actually want to test the handling of attachments, this is less than useful. Restore these files from my own collection, (with some Received and similar headers pruned). --- test/corpus/03 | 80 ++++++-- test/corpus/04 | 80 ++++++-- test/corpus/05 | 97 +++++++-- test/corpus/08 | 82 ++++++-- test/corpus/20 | 71 +++++-- test/corpus/21 | 85 ++++++-- test/corpus/22 | 82 ++++++-- test/corpus/23 | 126 +++++++++--- test/corpus/24 | 186 ++++++++++++++---- .../notmuch-hello-view-inbox | 6 +- .../notmuch-search-tag-inbox | 6 +- .../notmuch-show-thread-maildir-storage | 96 +++++---- 12 files changed, 787 insertions(+), 210 deletions(-) diff --git a/test/corpus/03 b/test/corpus/03 index 09cceece..c154ac5e 100644 --- a/test/corpus/03 +++ b/test/corpus/03 @@ -1,8 +1,37 @@ -From: "Lars Kellogg-Stedman" -To: notmuch@notmuchmail.org Date: Tue, 17 Nov 2009 14:00:54 -0500 -Subject: [notmuch] Working with Maildir storage? +From: Lars Kellogg-Stedman +To: notmuch@notmuchmail.org Message-ID: <20091117190054.GU3165@dottiness.seas.harvard.edu> +MIME-Version: 1.0 +User-Agent: Mutt/1.5.19 (2009-01-05) +Subject: [notmuch] Working with Maildir storage? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: multipart/mixed; boundary="===============1685355122==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + + +--===============1685355122== +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="5Dr6Wqe9hdyl7LAI" +Content-Disposition: inline + + +--5Dr6Wqe9hdyl7LAI +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable I saw the LWN article and decided to take a look at notmuch. I'm currently using mutt and mairix to index and read a collection of @@ -16,7 +45,8 @@ searching bombed out. Running, for example: Resulted in 4604 lines of errors along the lines of: Error opening - /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S: + /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U= +=3D3026:2,S: Too many open files I'm curious if this is expected behavior (i.e., notmuch does not work @@ -24,16 +54,40 @@ with Maildir) or if something else is going on. Cheers, --- -Lars Kellogg-Stedman +--=20 +Lars Kellogg-Stedman Senior Technologist, Computing and Information Technology Harvard University School of Engineering and Applied Sciences --------------- next part -------------- -A non-text attachment was scrubbed... -Name: not available -Type: application/pgp-signature -Size: 489 bytes -Desc: not available -URL: + +--5Dr6Wqe9hdyl7LAI +Content-Type: application/pgp-signature +Content-Disposition: inline + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJLAvLmAAoJENdGlQYxQazYRtcH/0usClQ1Z+EoTsA+URwIK6hD +FsZUxFxRjMuOQRn2idZ/zhhg5jJj11ZaHjqxSkDvi2ywkTKUf1vX9LLzVy5hSR9M +E6XQUd5QWAQXo1VsTeKkukIL0YqsPjdgrT8+Yt+OS2NvhEncql23oxnL2/pHkIFq +r0NdTmVV5Jcar7w9J6X1Mi9m229a/9jV5FImsWISkIhIWznXU5SiU6zIw8xhP4E0 +xhvVSNJnFryjVHtva870aSQduhHfeLPzpYhqbkMPvlq+bcz6Q/Q2SwxJcGLNMPHa +os9s9FGhCvFKUhVzezHWPgXNCcNT8qK89rcUldb5Oq4jaJb8RCZCYABplfoyaFs= +=vO4s +-----END PGP SIGNATURE----- + +--5Dr6Wqe9hdyl7LAI-- + +--===============1685355122== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============1685355122==-- diff --git a/test/corpus/04 b/test/corpus/04 index 4431a6dc..0ce678bf 100644 --- a/test/corpus/04 +++ b/test/corpus/04 @@ -1,30 +1,84 @@ -From: "Mikhail Gusarov" +From: Mikhail Gusarov To: notmuch@notmuchmail.org +References: <20091117190054.GU3165@dottiness.seas.harvard.edu> Date: Wed, 18 Nov 2009 01:02:38 +0600 -Subject: [notmuch] Working with Maildir storage? In-Reply-To: <20091117190054.GU3165@dottiness.seas.harvard.edu> (Lars Kellogg-Stedman's message of "Tue, 17 Nov 2009 14:00:54 -0500") -References: <20091117190054.GU3165@dottiness.seas.harvard.edu> Message-ID: <87iqd9rn3l.fsf@vertex.dottedmag> +User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) +MIME-Version: 1.0 +Subject: Re: [notmuch] Working with Maildir storage? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: multipart/mixed; boundary="===============1958295626==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + +--===============1958295626== +Content-Type: multipart/signed; boundary="=-=-="; + micalg=pgp-sha1; protocol="application/pgp-signature" +--=-=-= +Content-Transfer-Encoding: quoted-printable -Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars at seas.harvard.edu did gyre and gimble: + +Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did g= +yre and gimble: LK> Resulted in 4604 lines of errors along the lines of: LK> Error opening - LK> /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S: + LK> /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostna= +me,U=3D3026:2,S: LK> Too many open files See the patch just posted here. --- +=2D-=20 http://fossarchy.blogspot.com/ --------------- next part -------------- -A non-text attachment was scrubbed... -Name: not available -Type: application/pgp-signature -Size: 834 bytes -Desc: not available -URL: + +--=-=-= +Content-Type: application/pgp-signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQIcBAEBAgAGBQJLAvNOAAoJEJ0g9lA+M4iIjLYQAKp0PXEgl3JMOEBisH52AsIK +CzzfP4Fzd41K9VH/c1EdQWDYR6FCAA4IUSNICnJhITsYUb0eC5AKJiey3JP0+rmd +s4qEFBKH2iuphv8Llltcv2Q8DyPuJBkVa3mO9XCCeABZ6v4UvnTSWRVG12csSEih +ScgienU8sMrM9LwvvVI1ZB2flm2TzsH2hWi30jIgmtBntIKJaTgbFXB50FYFwULa +gGL/oH3u+YpumedWzPZdCJrw2q7nMvYx8aQ29EDCNLZibAZe+6oDTa6Fv6/0ldpQ +U+DptR0nJGbJTWa26OTSvmyeIORjAfM+TEI68n7KO9VHYPmVh6awcf0MNKYh2xWk +eRQNBcKyQNWxeKyCCpT/rrTlpxBWahpvg+V8lkDH2W09wjRp6CUKvifK3Sz3am9m +5ZUMpvXbwkZD6Ci6l/QytbYK50e8UpvFSu5DBaxBz59ykoypuNg2ayO5Kdi6IF5d +T+Sw6wo8UKn9a33+vheIc0fkhZXbeSotEmDm7huazm6CgM3dcWXUpTuJvik1cSWp +4buv98gY6IKWKoUTXODWUr+7VR4gei8du8qOsKem+QDfNX7tmaIRjhrbB24B91Wy +td3MTJD7GjMNid0INqRY1CRMLo8YlPaq6NBZfcYtYgwa6gpJijz1/MAn8+GMrfhF +9LI8b9jopNP+pMYBohLA +=/ksP +-----END PGP SIGNATURE----- +--=-=-=-- + +--===============1958295626== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============1958295626==-- diff --git a/test/corpus/05 b/test/corpus/05 index b918d1ce..75b05fa4 100644 --- a/test/corpus/05 +++ b/test/corpus/05 @@ -1,8 +1,30 @@ -From: "Alex Botero-Lowry" -To: notmuch@notmuchmail.org +MIME-Version: 1.0 Date: Tue, 17 Nov 2009 11:36:14 -0800 -Subject: [notmuch] preliminary FreeBSD support Message-ID: +From: Alex Botero-Lowry +To: notmuch@notmuchmail.org +Content-Type: multipart/mixed; boundary=0016e687869333b1570478963d35 +Subject: [notmuch] preliminary FreeBSD support +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + +--0016e687869333b1570478963d35 +Content-Type: multipart/alternative; boundary=0016e687869333b14e0478963d33 + +--0016e687869333b14e0478963d33 +Content-Type: text/plain; charset=ISO-8859-1 I saw the announcement this morning, and was very excited, as I had been hoping sup would be turned into a library, @@ -20,14 +42,63 @@ is acceptable behavior, and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically uses 64 as the buffer size. --------------- next part -------------- -An HTML attachment was scrubbed... -URL: --------------- next part -------------- -A non-text attachment was scrubbed... -Name: 0001-Deal-with-situation-where-sysconf-_SC_GETPW_R_SIZE_M.patch -Type: application/octet-stream -Size: 1050 bytes -Desc: not available -URL: + +--0016e687869333b14e0478963d33 +Content-Type: text/html; charset=ISO-8859-1 +Content-Transfer-Encoding: quoted-printable + +I saw the announcement this morning, and was very excited, as I had been ho= +ping sup would be turned into a library,
since I like the concept more t= +han the UI (I'd rather an emacs interface).

I did a preliminary = +compile which worked out fine, but sysconf(_SC_SC_GETPW_R_SIZE_MAX) returns= + -1 on
+FreeBSD, so notmuch_config_open segfaulted.

Attached is a patch that= + supplies a default buffer size of 64 in cases where -1 is returned.
http://www= +.opengroup.org/austin/docs/austin_328.txt - seems to indicate this is a= +cceptable behavior,
+and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.html<= +/a> specifically uses 64 as the
buffer size.


+ +--0016e687869333b14e0478963d33-- +--0016e687869333b1570478963d35 +Content-Type: application/octet-stream; + name="0001-Deal-with-situation-where-sysconf-_SC_GETPW_R_SIZE_M.patch" +Content-Disposition: attachment; + filename="0001-Deal-with-situation-where-sysconf-_SC_GETPW_R_SIZE_M.patch" +Content-Transfer-Encoding: base64 +X-Attachment-Id: f_g252e6gs0 + +RnJvbSBlM2JjNGJiZDdiOWQwZDA4NjgxNmFiNWY4ZjJkNmZmZWExZGQzZWE0IE1vbiBTZXAgMTcg +MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgQm90ZXJvLUxvd3J5IDxhbGV4LmJvdGVyb2xv +d3J5QGdtYWlsLmNvbT4KRGF0ZTogVHVlLCAxNyBOb3YgMjAwOSAxMTozMDozOSAtMDgwMApTdWJq +ZWN0OiBbUEFUQ0hdIERlYWwgd2l0aCBzaXR1YXRpb24gd2hlcmUgc3lzY29uZihfU0NfR0VUUFdf +Ul9TSVpFX01BWCkgcmV0dXJucyAtMQoKLS0tCiBub3RtdWNoLWNvbmZpZy5jIHwgICAgMiArKwog +MSBmaWxlcyBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0t +Z2l0IGEvbm90bXVjaC1jb25maWcuYyBiL25vdG11Y2gtY29uZmlnLmMKaW5kZXggMjQ4MTQ5Yy4u +ZTcyMjBkOCAxMDA2NDQKLS0tIGEvbm90bXVjaC1jb25maWcuYworKysgYi9ub3RtdWNoLWNvbmZp +Zy5jCkBAIC03Nyw2ICs3Nyw3IEBAIHN0YXRpYyBjaGFyICoKIGdldF9uYW1lX2Zyb21fcGFzc3dk +X2ZpbGUgKHZvaWQgKmN0eCkKIHsKICAgICBsb25nIHB3X2J1Zl9zaXplID0gc3lzY29uZihfU0Nf +R0VUUFdfUl9TSVpFX01BWCk7CisgICAgaWYgKHB3X2J1Zl9zaXplID09IC0xKSBwd19idWZfc2l6 +ZSA9IDY0OwogICAgIGNoYXIgKnB3X2J1ZiA9IHRhbGxvY196ZXJvX3NpemUgKGN0eCwgcHdfYnVm +X3NpemUpOwogICAgIHN0cnVjdCBwYXNzd2QgcGFzc3dkLCAqaWdub3JlZDsKICAgICBjaGFyICpu +YW1lOwpAQCAtMTAxLDYgKzEwMiw3IEBAIHN0YXRpYyBjaGFyICoKIGdldF91c2VybmFtZV9mcm9t +X3Bhc3N3ZF9maWxlICh2b2lkICpjdHgpCiB7CiAgICAgbG9uZyBwd19idWZfc2l6ZSA9IHN5c2Nv +bmYoX1NDX0dFVFBXX1JfU0laRV9NQVgpOworICAgIGlmIChwd19idWZfc2l6ZSA9PSAtMSkgcHdf +YnVmX3NpemUgPSA2NDsKICAgICBjaGFyICpwd19idWYgPSB0YWxsb2NfemVyb19zaXplIChjdHgs +IHB3X2J1Zl9zaXplKTsKICAgICBzdHJ1Y3QgcGFzc3dkIHBhc3N3ZCwgKmlnbm9yZWQ7CiAgICAg +Y2hhciAqbmFtZTsKLS0gCjEuNi41LjIKCg== +--0016e687869333b1570478963d35 +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--0016e687869333b1570478963d35-- diff --git a/test/corpus/08 b/test/corpus/08 index 6cfc48a9..baf34d1f 100644 --- a/test/corpus/08 +++ b/test/corpus/08 @@ -1,11 +1,41 @@ -From: "Lars Kellogg-Stedman" -To: notmuch@notmuchmail.org Date: Tue, 17 Nov 2009 15:33:01 -0500 -Subject: [notmuch] Working with Maildir storage? -In-Reply-To: <87iqd9rn3l.fsf@vertex.dottedmag> +From: Lars Kellogg-Stedman +To: Mikhail Gusarov +Message-ID: <20091117203301.GV3165@dottiness.seas.harvard.edu> References: <20091117190054.GU3165@dottiness.seas.harvard.edu> <87iqd9rn3l.fsf@vertex.dottedmag> -Message-ID: <20091117203301.GV3165@dottiness.seas.harvard.edu> +MIME-Version: 1.0 +In-Reply-To: <87iqd9rn3l.fsf@vertex.dottedmag> +User-Agent: Mutt/1.5.19 (2009-01-05) +Cc: notmuch@notmuchmail.org +Subject: Re: [notmuch] Working with Maildir storage? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: multipart/mixed; boundary="===============0063752545==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + + +--===============0063752545== +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="GGxZz/e2pmGePzrA" +Content-Disposition: inline + + +--GGxZz/e2pmGePzrA +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable > See the patch just posted here. @@ -18,16 +48,40 @@ It doesn't look like the patch is in git yet. -- Lars --- -Lars Kellogg-Stedman +--=20 +Lars Kellogg-Stedman Senior Technologist, Computing and Information Technology Harvard University School of Engineering and Applied Sciences --------------- next part -------------- -A non-text attachment was scrubbed... -Name: not available -Type: application/pgp-signature -Size: 489 bytes -Desc: not available -URL: + +--GGxZz/e2pmGePzrA +Content-Type: application/pgp-signature +Content-Disposition: inline + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJLAwh9AAoJENdGlQYxQazYHJMIAI+XTPOyBTZIxEGTdgVKd2fR +k27ucKs6lXozfMIIGchNUDXQho+KmiuTfX1XFJeBkqOlhrd9zlGjBGoBM0YBq/Gs +aStPdonREzsHORjmyQCCpjg4AcqCRTXFbDXzAeXlxMPOrZ3P0XNPzTEM1mVksbmg +mBBDLdHncy4sSCfFgXwRGGgLv9z5Acqm8xGYr68c9PIXY939ozIKV9LVUhxiNz9g +We2a9rLDhfwxUqDlGdiNwZZimiKvD/fsYSrBZMDb5HgIYkeNZ4SD8Xu+OgB550wN +OFfwGi3o8WFK2AyDe5QJDh9Ub+euPNlVzePoGpkltZEHuCcLFJqCHv5XYpbxcjA= +=GO2Q +-----END PGP SIGNATURE----- + +--GGxZz/e2pmGePzrA-- + +--===============0063752545== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============0063752545==-- diff --git a/test/corpus/20 b/test/corpus/20 index 7b9873e0..f08a3145 100644 --- a/test/corpus/20 +++ b/test/corpus/20 @@ -1,8 +1,35 @@ -From: "Adrian Perez de Castro" -To: notmuch@notmuchmail.org Date: Wed, 18 Nov 2009 00:20:59 +0100 -Subject: [notmuch] Introducing myself +From: Adrian Perez de Castro +To: notmuch@notmuchmail.org Message-ID: <20091118002059.067214ed@hikari> +Organization: Igalia +X-Mailer: Claws Mail 3.7.3 (GTK+ 2.18.3; x86_64-redhat-linux-gnu) +Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAAXNSR0IArs4c6QAAADBQTFRFBwcHFhYWKCgoNzc3SEhIV1dXaGhod3d3iIiIlpaWqKiouLi4x8fH2NjY5+fn/v7+rSjDkgAAAjVJREFUOE9l07tvE0EQwOHfrkV9O+eko7g701BBfECJsIigT2IpooIqaSiRUEB0REj00FBQgYSCkhry+gecUPJybJeIxLumTbilsH2PMNXufDOa3ZVW+1JkpbUmD/8+vXR3c7or4Gz93mH309Kz8/C9/RQge7VfhW/LW+PF8IkrQ7Z6OKmQr1tl+LU/yWP9mxJka9O88fZHPwf/7u0kLyCnX3I4fQhgjAgIfi+HHw5A1Y2ggIMcFKAEnRoL0M3BosI4TI2IATjuT8DvSNJoNNJgkIhxlr9TUHeSpDnfohlIrMBlU+BGmsZqfr69FMfGMw4NoG835+J62riWyjQ/uXlTQjNUIoYegMsBM0pCD8oDas7n4HQsBghXFxJTW42KDs+4XLfjsN0wOYgABqARjMKIHIaAQnmHjsI5Cvi9Cf6k03OoWBkpIP3Q7354+dEimFBKHbMP9oKjwfd9gbrxR5KDToczK4uPF8UgNomKU2GaENRi77zyDKICxKBS4xXYbONPMQMdYZTBwMiMWiUg9g6UJ3OBogzjV8E7sBVwyvfAOYdQhsABzuOxI1MGZbs98Q6Md5UOfbbR2R0eWOesrnRw5ajT6f60LrNhWIHZpBnUWv2s14ukArWWTqTes3YQxRXgFkcMu70TPYqqUBs0YwmO967OVIdTG4bY4a7WLaqgLm5vbHdH5np0Dri//fmg7y8scB4u3+zsuNlH0X+g19bby69b+TYH6isvns8VdQWgxj9tHP8AR5/hSdYqkwsAAAAASUVORK5CYII= +Mime-Version: 1.0 +Subject: [notmuch] Introducing myself +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: multipart/mixed; boundary="===============1167731900==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + +--===============1167731900== +Content-Type: multipart/signed; micalg=PGP-SHA1; + boundary="Sig_/ayZz9m37AOMROJCyUudvXvZ"; protocol="application/pgp-signature" + +--Sig_/ayZz9m37AOMROJCyUudvXvZ +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: quoted-printable Hello to all, @@ -41,14 +68,34 @@ Best regards, --- [1] http://software.complete.org/software/projects/show/offlineimap --- -Adrian Perez de Castro +--=20 +Adrian Perez de Castro Igalia - Free Software Engineering --------------- next part -------------- -A non-text attachment was scrubbed... -Name: signature.asc -Type: application/pgp-signature -Size: 198 bytes -Desc: not available -URL: + +--Sig_/ayZz9m37AOMROJCyUudvXvZ +Content-Type: application/pgp-signature; name=signature.asc +Content-Disposition: attachment; filename=signature.asc + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.13 (GNU/Linux) + +iEYEARECAAYFAksDL+AACgkQkcVZ2+TJEjtsuQCfXmilW8WpMQHCnwwJjRE1PWZy +oFAAn3MmXC5sW7MvCFjs7ks6U16zgMEg +=eL9p +-----END PGP SIGNATURE----- + +--Sig_/ayZz9m37AOMROJCyUudvXvZ-- + +--===============1167731900== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============1167731900==-- diff --git a/test/corpus/21 b/test/corpus/21 index bc9361d8..7ff55ccf 100644 --- a/test/corpus/21 +++ b/test/corpus/21 @@ -1,9 +1,31 @@ -From: "Alex Botero-Lowry" -To: notmuch@notmuchmail.org +MIME-Version: 1.0 Date: Tue, 17 Nov 2009 16:23:53 -0800 +Message-ID: +From: Alex Botero-Lowry +To: notmuch@notmuchmail.org +Content-Type: multipart/mixed; boundary=0016e64ca4d8f27a4804789a4139 Subject: [notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop -Message-ID: +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + +--0016e64ca4d8f27a4804789a4139 +Content-Type: multipart/alternative; boundary=0016e64ca4d8f27a3604789a4137 + +--0016e64ca4d8f27a3604789a4137 +Content-Type: text/plain; charset=ISO-8859-1 In this case error out when no query is supplied. There seems to be an infinite-loop casued by i think notmuch_query_search_threads having @@ -30,14 +52,51 @@ I'll look into that bug specifically a bit later. It might be better to do a usage instead of just throwing an error here? alex --------------- next part -------------- -An HTML attachment was scrubbed... -URL: --------------- next part -------------- -A non-text attachment was scrubbed... -Name: 0001-Error-out-if-no-query-is-supplied-to-search-instead-.patch -Type: application/octet-stream -Size: 793 bytes -Desc: not available -URL: + +--0016e64ca4d8f27a3604789a4137 +Content-Type: text/html; charset=ISO-8859-1 + +In this case error out when no query is supplied. There seems to be an infinite-loop casued by i think notmuch_query_search_threads having
an exception:

A Xapian exception occurred: Syntax: <expression> AND <expression>
+A Xapian exception occurred: Syntax: <expression> AND <expression>
A Xapian exception occurred: Syntax: <expression> AND <expression>
A Xapian exception occurred: Syntax: <expression> AND <expression>
+A Xapian exception occurred: Syntax: <expression> AND <expression>
A Xapian exception occurred: Syntax: <expression> AND <expression>
A Xapian exception occurred: Syntax: <expression> AND <expression>
+A Xapian exception occurred: Syntax: <expression> AND <expression>
A Xapian exception occurred: Syntax: <expression> AND <expression>
A Xapian exception occurred: Syntax: <expression> AND <expression>
+A Xapian exception occurred: Syntax: <expression> AND <expression>
A Xapian exception occurred: Syntax: <expression> AND <expression>
A Xapian exception occurred: Syntax: <expression> AND <expression>
+A Xapian exception occurred: Syntax: <expression> AND <expression>
A Xapian exception occurred: Syntax: <expression> AND <expression>

I'll look into that bug specifically a bit later.
+
It might be better to do a usage instead of just throwing an error here?

alex
+ +--0016e64ca4d8f27a3604789a4137-- +--0016e64ca4d8f27a4804789a4139 +Content-Type: application/octet-stream; + name="0001-Error-out-if-no-query-is-supplied-to-search-instead-.patch" +Content-Disposition: attachment; + filename="0001-Error-out-if-no-query-is-supplied-to-search-instead-.patch" +Content-Transfer-Encoding: base64 +X-Attachment-Id: f_g25cms190 + +RnJvbSAzZjk0MzFmNzRhNWZmNjZjODRjODY5YTNlMjZjMmJhZDQyYmVkMWIxIE1vbiBTZXAgMTcg +MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgQm90ZXJvLUxvd3J5IDxhbGV4LmJvdGVyb2xv +d3J5QGdtYWlsLmNvbT4KRGF0ZTogVHVlLCAxNyBOb3YgMjAwOSAxNjoyMDoyOCAtMDgwMApTdWJq +ZWN0OiBbUEFUQ0hdIEVycm9yIG91dCBpZiBubyBxdWVyeSBpcyBzdXBwbGllZCB0byBzZWFyY2gg +aW5zdGVhZCBvZiBnb2luZyBpbnRvIGFuIGluZmluaXRlIGxvb3AKCi0tLQogbm90bXVjaC1zZWFy +Y2guYyB8ICAgIDUgKysrKysKIDEgZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCAwIGRl +bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL25vdG11Y2gtc2VhcmNoLmMgYi9ub3RtdWNoLXNlYXJj +aC5jCmluZGV4IDhkYjA5YzcuLmQ5NGZjY2QgMTAwNjQ0Ci0tLSBhL25vdG11Y2gtc2VhcmNoLmMK +KysrIGIvbm90bXVjaC1zZWFyY2guYwpAQCAtNjYsNiArNjYsMTEgQEAgbm90bXVjaF9zZWFyY2hf +Y29tbWFuZCAodm9pZCAqY3R4LCBpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgIGFyZ2MgLT0g +aTsKICAgICBhcmd2ICs9IGk7CiAKKyAgICBpZiAoYXJnYyA9PSAwKSB7CisgICAgICAgIGZwcmlu +dGYgKHN0ZGVyciwgIk5vIHF1ZXJ5IHByb3ZpZGVkXG4iKTsKKyAgICAgICAgcmV0dXJuIDE7Cisg +ICAgfQorCiAgICAgY29uZmlnID0gbm90bXVjaF9jb25maWdfb3BlbiAoY3R4LCBOVUxMLCBOVUxM +KTsKICAgICBpZiAoY29uZmlnID09IE5VTEwpCiAJcmV0dXJuIDE7Ci0tIAoxLjYuNS4yCgo= +--0016e64ca4d8f27a4804789a4139 +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--0016e64ca4d8f27a4804789a4139-- diff --git a/test/corpus/22 b/test/corpus/22 index fa3d2681..08adada6 100644 --- a/test/corpus/22 +++ b/test/corpus/22 @@ -1,13 +1,43 @@ -From: "Lars Kellogg-Stedman" -To: notmuch@notmuchmail.org Date: Tue, 17 Nov 2009 19:50:40 -0500 -Subject: [notmuch] Working with Maildir storage? -In-Reply-To: +From: Lars Kellogg-Stedman +To: Keith Packard +Message-ID: <20091118005040.GA25380@dottiness.seas.harvard.edu> References: <20091117190054.GU3165@dottiness.seas.harvard.edu> <87iqd9rn3l.fsf@vertex.dottedmag> <20091117203301.GV3165@dottiness.seas.harvard.edu> -Message-ID: <20091118005040.GA25380@dottiness.seas.harvard.edu> +MIME-Version: 1.0 +In-Reply-To: +User-Agent: Mutt/1.5.19 (2009-01-05) +Cc: notmuch@notmuchmail.org +Subject: Re: [notmuch] Working with Maildir storage? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: multipart/mixed; boundary="===============1483126515==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + + +--===============1483126515== +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="9amGYk9869ThD9tj" +Content-Disposition: inline + + +--9amGYk9869ThD9tj +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable > I've also pushed a slightly more complicated (and complete) fix to my > private notmuch repository @@ -15,16 +45,40 @@ Message-ID: <20091118005040.GA25380@dottiness.seas.harvard.edu> The version of lib/messages.cc in your repo doesn't build because it's missing "#include " (for the uint32_t on line 466). --- -Lars Kellogg-Stedman +--=20 +Lars Kellogg-Stedman Senior Technologist, Computing and Information Technology Harvard University School of Engineering and Applied Sciences --------------- next part -------------- -A non-text attachment was scrubbed... -Name: not available -Type: application/pgp-signature -Size: 489 bytes -Desc: not available -URL: + +--9amGYk9869ThD9tj +Content-Type: application/pgp-signature +Content-Disposition: inline + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJLA0TgAAoJENdGlQYxQazYsG0IAJ1t9h4Q3ma8z8ejeKR22Xh0 +WcuRX2x9yEXy/+aG9W7Mot0mqUQCiLdmHM/2h5N9BFHyJvfOUf8lmssrJ5OS/kp5 +j7FIx3GUELBmEZqFUPjRSQPk1hZURYdRsloKkrbQ2kAivjjb50zAAQ8Av4Cgj6cS +3HvNNmeVfJt1NS75vm+/wn48M8Vrcdv4gvNlSOhgFOixknvRoxSyNDOHYBKvHnSV +2HnO0GzhAQzDZAwdHBzJtb8vRmglrH33TVdrE7OW+sojYB3Wyz8r9+HIt8Q8ovzX +nQ8p0Nf5DlF7tye3JYo0EeNm5EQJ4q0YyVYInhmtpi3A5Cyu50GcB/GZ5Sd6ajo= +=WULe +-----END PGP SIGNATURE----- + +--9amGYk9869ThD9tj-- + +--===============1483126515== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============1483126515==-- diff --git a/test/corpus/23 b/test/corpus/23 index c2b26dc8..9bb62d73 100644 --- a/test/corpus/23 +++ b/test/corpus/23 @@ -1,40 +1,79 @@ -From: "Lars Kellogg-Stedman" -To: notmuch@notmuchmail.org Date: Tue, 17 Nov 2009 19:58:29 -0500 -Subject: [notmuch] "notmuch help" outputs to stderr? +From: Lars Kellogg-Stedman +To: notmuch Message-ID: <20091118005829.GB25380@dottiness.seas.harvard.edu> +MIME-Version: 1.0 +User-Agent: Mutt/1.5.19 (2009-01-05) +Subject: [notmuch] "notmuch help" outputs to stderr? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: multipart/mixed; boundary="===============1359248349==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + + +--===============1359248349== +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="L6iaP+gRLNZHKoI4" +Content-Disposition: inline + + +--L6iaP+gRLNZHKoI4 +Content-Type: multipart/mixed; boundary="z6Eq5LdranGa6ru8" +Content-Disposition: inline + + +--z6Eq5LdranGa6ru8 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable I'm just noticing that 'notmuch help ...' outputs to stderr, which isn't terribly intuitive. For example, the obvious invocation: notmuch help | less -...isn't terribly helpful. +=2E..isn't terribly helpful. I've attached a patch that lets usage() take a FILE * argument so that you can output to stderr in response to usage errors, and stdout in response to an explicit request. --- -Lars Kellogg-Stedman +--=20 +Lars Kellogg-Stedman Senior Technologist, Computing and Information Technology Harvard University School of Engineering and Applied Sciences --------------- next part -------------- + +--z6Eq5LdranGa6ru8 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename="notmuch-help.patch" +Content-Transfer-Encoding: quoted-printable + diff --git a/notmuch.c b/notmuch.c index c47e640..a35cb99 100644 --- a/notmuch.c +++ b/notmuch.c -@@ -157,23 +157,23 @@ command_t commands[] = { +@@ -157,23 +157,23 @@ command_t commands[] =3D { }; - +=20 static void -usage (void) +usage (FILE *out) { command_t *command; unsigned int i; - +=20 - fprintf (stderr, "Usage: notmuch [args...]\n"); - fprintf (stderr, "\n"); - fprintf (stderr, "Where and [args...] are as follows:\n"); @@ -43,35 +82,64 @@ index c47e640..a35cb99 100644 + fprintf (out, "\n"); + fprintf (out, "Where and [args...] are as follows:\n"); + fprintf (out, "\n"); - - for (i = 0; i < ARRAY_SIZE (commands); i++) { - command = &commands[i]; - +=20 + for (i =3D 0; i < ARRAY_SIZE (commands); i++) { + command =3D &commands[i]; +=20 - fprintf (stderr, "\t%s\t%s\n\n", command->name, command->summary); + fprintf (out, "\t%s\t%s\n\n", command->name, command->summary); } - -- fprintf (stderr, "Use \"notmuch help \" for more details on each command.\n\n"); -+ fprintf (out, "Use \"notmuch help \" for more details on each command.\n\n"); +=20 +- fprintf (stderr, "Use \"notmuch help \" for more details on e= +ach command.\n\n"); ++ fprintf (out, "Use \"notmuch help \" for more details on each= + command.\n\n"); } - +=20 static int -@@ -183,8 +183,8 @@ notmuch_help_command (unused (void *ctx), int argc, char *argv[]) +@@ -183,8 +183,8 @@ notmuch_help_command (unused (void *ctx), int argc, cha= +r *argv[]) unsigned int i; - - if (argc == 0) { +=20 + if (argc =3D=3D 0) { - fprintf (stderr, "The notmuch mail system.\n\n"); - usage (); + fprintf (stdout, "The notmuch mail system.\n\n"); + usage (stdout); return 0; } - --------------- next part -------------- -A non-text attachment was scrubbed... -Name: not available -Type: application/pgp-signature -Size: 489 bytes -Desc: not available -URL: +=20 + +--z6Eq5LdranGa6ru8-- + +--L6iaP+gRLNZHKoI4 +Content-Type: application/pgp-signature +Content-Disposition: inline + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJLA0a1AAoJENdGlQYxQazYr78IAJtqTWIpBqSdOWqTzt/r4XNn +KJ5mWAoNfq4H+3kx3xoWOFYS7qAYeJoHQWCDbMdb+zEXvPX6hMFn9+OxRN+N5FdQ +uxGTugSG9xSsK28oGDCQUtr5uheo+tH0jygPjI+LTD97vjUYS4K2qzhLGFJmpLcj +1akMJXM0gSdPZT8dJyjxvC15pgboLspE4+b6jexXmd4UoFvXgqvjkYHeV4Wk+s0L +xu+HkCGXL9WHYc3t171fFAru4Zd1AUxFQl4BZ2Y+OqRZUrD28Mtz3zGQxbJQoifl +JFrgPAWioLN71SkVq/y+efjvGSl0osPpKU5dftMmyY1zV7k7mMlO08ZSJU+wANA= +=Iijt +-----END PGP SIGNATURE----- + +--L6iaP+gRLNZHKoI4-- + +--===============1359248349== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============1359248349==-- diff --git a/test/corpus/24 b/test/corpus/24 index 03049d85..c8000207 100644 --- a/test/corpus/24 +++ b/test/corpus/24 @@ -1,10 +1,93 @@ -From: "Lars Kellogg-Stedman" -To: notmuch@notmuchmail.org +Return-path: +Envelope-to: cworth@localhost +Delivery-date: Wed, 18 Nov 2009 01:43:47 -0800 +Received: from yoom.home.cworth.org ([127.0.0.1]) + by yoom.home.cworth.org with esmtp (Exim 4.69) + (envelope-from ) + id 1NAgpH-0005Ab-20 + for cworth@localhost; Wed, 18 Nov 2009 01:27:47 -0800 +X-Original-To: cworth@cworth.org +Delivered-To: cworth@cworth.org +Received: from olra.theworths.org [82.165.184.25] + by yoom.home.cworth.org with IMAP (fetchmail-6.3.9-rc2) + for (single-drop); Wed, 18 Nov 2009 01:27:47 -0800 (PST) +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 12248431FC3 + for ; Tue, 17 Nov 2009 17:01:22 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -6.17 +X-Spam-Level: +X-Spam-Status: No, score=-6.17 tagged_above=-999 required=2 tests=[AWL=0.429, + BAYES_00=-2.599, RCVD_IN_DNSWL_MED=-4] autolearn=unavailable +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id TmBdVd1i-Wjb; Tue, 17 Nov 2009 17:01:20 -0800 (PST) +Received: from olra.theworths.org (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id AF876431FBC; + Tue, 17 Nov 2009 17:01:20 -0800 (PST) +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 75784431FBC + for ; Tue, 17 Nov 2009 17:01:19 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id IoYHzHoKBskU for ; + Tue, 17 Nov 2009 17:01:18 -0800 (PST) +Received: from smtp-outbound.seas.harvard.edu (smtp-outbound.seas.harvard.edu + [140.247.51.171]) + by olra.theworths.org (Postfix) with ESMTP id 7E033431FAE + for ; Tue, 17 Nov 2009 17:01:18 -0800 (PST) +Received: from dottiness.seas.harvard.edu (dottiness.seas.harvard.edu + [140.247.52.224]) + by smtp-outbound.seas.harvard.edu (8.13.8/8.13.8) with SMTP id + nAI11Gkj008772 + for ; Tue, 17 Nov 2009 20:01:16 -0500 +Received: by dottiness.seas.harvard.edu (sSMTP sendmail emulation); + Tue, 17 Nov 2009 20:01:16 -0500 Date: Tue, 17 Nov 2009 20:01:16 -0500 -Subject: [notmuch] "notmuch help" outputs to stderr? -In-Reply-To: <20091118005829.GB25380@dottiness.seas.harvard.edu> -References: <20091118005829.GB25380@dottiness.seas.harvard.edu> +From: Lars Kellogg-Stedman +To: notmuch Message-ID: <20091118010116.GC25380@dottiness.seas.harvard.edu> +References: <20091118005829.GB25380@dottiness.seas.harvard.edu> +MIME-Version: 1.0 +In-Reply-To: <20091118005829.GB25380@dottiness.seas.harvard.edu> +User-Agent: Mutt/1.5.19 (2009-01-05) +Subject: Re: [notmuch] "notmuch help" outputs to stderr? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: multipart/mixed; boundary="===============0848253760==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + + +--===============0848253760== +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="ZInfyf7laFu/Kiw7" +Content-Disposition: inline + + +--ZInfyf7laFu/Kiw7 +Content-Type: multipart/mixed; boundary="KdquIMZPjGJQvRdI" +Content-Disposition: inline + + +--KdquIMZPjGJQvRdI +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable > I've attached a patch that lets usage() take a FILE * argument so that > you can output to stderr in response to usage errors, and stdout in @@ -13,26 +96,31 @@ Message-ID: <20091118010116.GC25380@dottiness.seas.harvard.edu> Whoops, missed a couple of stderr's in that last patch. New one attached. --- -Lars Kellogg-Stedman +--=20 +Lars Kellogg-Stedman Senior Technologist, Computing and Information Technology Harvard University School of Engineering and Applied Sciences --------------- next part -------------- + +--KdquIMZPjGJQvRdI +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename="notmuch-help.patch" +Content-Transfer-Encoding: quoted-printable + diff --git a/notmuch.c b/notmuch.c index c47e640..446c810 100644 --- a/notmuch.c +++ b/notmuch.c -@@ -157,23 +157,23 @@ command_t commands[] = { +@@ -157,23 +157,23 @@ command_t commands[] =3D { }; - +=20 static void -usage (void) +usage (FILE *out) { command_t *command; unsigned int i; - +=20 - fprintf (stderr, "Usage: notmuch [args...]\n"); - fprintf (stderr, "\n"); - fprintf (stderr, "Where and [args...] are as follows:\n"); @@ -41,34 +129,38 @@ index c47e640..446c810 100644 + fprintf (out, "\n"); + fprintf (out, "Where and [args...] are as follows:\n"); + fprintf (out, "\n"); - - for (i = 0; i < ARRAY_SIZE (commands); i++) { - command = &commands[i]; - +=20 + for (i =3D 0; i < ARRAY_SIZE (commands); i++) { + command =3D &commands[i]; +=20 - fprintf (stderr, "\t%s\t%s\n\n", command->name, command->summary); + fprintf (out, "\t%s\t%s\n\n", command->name, command->summary); } - -- fprintf (stderr, "Use \"notmuch help \" for more details on each command.\n\n"); -+ fprintf (out, "Use \"notmuch help \" for more details on each command.\n\n"); +=20 +- fprintf (stderr, "Use \"notmuch help \" for more details on e= +ach command.\n\n"); ++ fprintf (out, "Use \"notmuch help \" for more details on each= + command.\n\n"); } - +=20 static int -@@ -183,8 +183,8 @@ notmuch_help_command (unused (void *ctx), int argc, char *argv[]) +@@ -183,8 +183,8 @@ notmuch_help_command (unused (void *ctx), int argc, cha= +r *argv[]) unsigned int i; - - if (argc == 0) { +=20 + if (argc =3D=3D 0) { - fprintf (stderr, "The notmuch mail system.\n\n"); - usage (); + fprintf (stdout, "The notmuch mail system.\n\n"); + usage (stdout); return 0; } - -@@ -192,8 +192,8 @@ notmuch_help_command (unused (void *ctx), int argc, char *argv[]) - command = &commands[i]; - - if (strcmp (argv[0], command->name) == 0) { +=20 +@@ -192,8 +192,8 @@ notmuch_help_command (unused (void *ctx), int argc, cha= +r *argv[]) + command =3D &commands[i]; +=20 + if (strcmp (argv[0], command->name) =3D=3D 0) { - fprintf (stderr, "Help for \"notmuch %s\":\n\n", argv[0]); - fprintf (stderr, "\t%s\t%s\n\n%s\n\n", command->name, + fprintf (stdout, "Help for \"notmuch %s\":\n\n", argv[0]); @@ -76,11 +168,37 @@ index c47e640..446c810 100644 command->summary, command->documentation); return 0; } --------------- next part -------------- -A non-text attachment was scrubbed... -Name: not available -Type: application/pgp-signature -Size: 489 bytes -Desc: not available -URL: + +--KdquIMZPjGJQvRdI-- + +--ZInfyf7laFu/Kiw7 +Content-Type: application/pgp-signature +Content-Disposition: inline + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJLA0dcAAoJENdGlQYxQazY4nIIAIBCds86/uTmnouvyoPruUUR +Bg5mXcnjuopz1Nwotl9s9U5sGeZuZngxyEvDz1Z1aTEjwab8ndNTf1xCwIoqBs+l +i/sc4nPYubLdy1Ab/84DKVtCSbj+v5rtqhegwUWV7S1BY7t8dKNPNv7YBg7P0Azs +6s3CUxDV5eJCcxCGxxWHH8JDKRf7rDs6vzDwyPWLxlg1Xb1lEM/sRgPCKiShPdO3 +Ak2hECusjskALhSDYX8/FLMd9HwLBC13sfWuSi/pHUAIOI2jru2p5sXrVSlTnFIJ +fiMbPhKWiEaJj2kmm4pRwAhbTWp/J8ZvXWp0AyosxXQhQUWqujiyxgfiXS70SdQ= +=t3Yc +-----END PGP SIGNATURE----- + +--ZInfyf7laFu/Kiw7-- + +--===============0848253760== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============0848253760==-- diff --git a/test/emacs.expected-output/notmuch-hello-view-inbox b/test/emacs.expected-output/notmuch-hello-view-inbox index 8f44411f..3ba2b291 100644 --- a/test/emacs.expected-output/notmuch-hello-view-inbox +++ b/test/emacs.expected-output/notmuch-hello-view-inbox @@ -1,6 +1,6 @@ 2009-11-17 [5/5] Carl Worth, Keith Packard, Mikhail Gusarov [notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-17 [7/7] Carl Worth, Lars Kellogg-Stedman, Keith Packard, Mikhail Gusarov [notmuch] Working with Maildir storage? (inbox unread) - 2009-11-17 [2/2] Carl Worth, Alex Botero-Lowry [notmuch] preliminary FreeBSD support (inbox unread) + 2009-11-17 [2/2] Carl Worth, Alex Botero-Lowry [notmuch] preliminary FreeBSD support (attachment inbox unread) 2009-11-17 [1/1] Mikhail Gusarov [notmuch] [PATCH] Handle rename of message file (inbox unread) 2009-11-17 [2/2] Carl Worth, Keith Packard [notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) 2009-11-17 [2/2] Carl Worth, Jan Janak [notmuch] [PATCH] Older versions of install do not support -C. (inbox unread) @@ -9,8 +9,8 @@ 2009-11-17 [3/3] Carl Worth, Keith Packard, Adrian Perez de Castro [notmuch] Introducing myself (inbox unread) 2009-11-17 [3/3] Carl Worth, Keith Packard, Aron Griffis [notmuch] archive (inbox unread) 2009-11-17 [2/2] Carl Worth, Ingmar Vanhassel [notmuch] [PATCH] Typsos (inbox unread) - 2009-11-18 [2/2] Carl Worth, Alex Botero-Lowry [notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (inbox unread) - 2009-11-18 [2/2] Lars Kellogg-Stedman [notmuch] "notmuch help" outputs to stderr? (inbox unread) + 2009-11-18 [2/2] Carl Worth, Alex Botero-Lowry [notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) + 2009-11-18 [2/2] Lars Kellogg-Stedman [notmuch] "notmuch help" outputs to stderr? (attachment inbox unread) 2009-11-18 [1/1] Stewart Smith [notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox unread) 2009-11-18 [1/1] Stewart Smith [notmuch] [PATCH 2/2] Read mail directory in inode number order (inbox unread) 2009-11-18 [1/1] Stewart Smith [notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox unread) diff --git a/test/emacs.expected-output/notmuch-search-tag-inbox b/test/emacs.expected-output/notmuch-search-tag-inbox index 8804fa3b..146f63a6 100644 --- a/test/emacs.expected-output/notmuch-search-tag-inbox +++ b/test/emacs.expected-output/notmuch-search-tag-inbox @@ -1,5 +1,5 @@ 2009-11-18 [1/1] Chris Wilson [notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once (inbox unread) - 2009-11-18 [2/2] Carl Worth, Alex Botero-Lowry [notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (inbox unread) + 2009-11-18 [2/2] Carl Worth, Alex Botero-Lowry [notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) 2009-11-18 [2/2] Carl Worth, Ingmar Vanhassel [notmuch] [PATCH] Typsos (inbox unread) 2009-11-18 [3/3] Carl Worth, Keith Packard, Adrian Perez de Castro [notmuch] Introducing myself (inbox unread) 2009-11-18 [3/3] Carl Worth, Keith Packard, Israel Herraiz [notmuch] New to the list (inbox unread) @@ -17,7 +17,7 @@ 2009-11-18 [1/1] Stewart Smith [notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox unread) 2009-11-18 [1/1] Stewart Smith [notmuch] [PATCH 2/2] Read mail directory in inode number order (inbox unread) 2009-11-18 [1/1] Stewart Smith [notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox unread) - 2009-11-18 [2/2] Lars Kellogg-Stedman [notmuch] "notmuch help" outputs to stderr? (inbox unread) + 2009-11-18 [2/2] Lars Kellogg-Stedman [notmuch] "notmuch help" outputs to stderr? (attachment inbox unread) 2009-11-17 [1/1] Mikhail Gusarov [notmuch] [PATCH] Handle rename of message file (inbox unread) - 2009-11-17 [2/2] Carl Worth, Alex Botero-Lowry [notmuch] preliminary FreeBSD support (inbox unread) + 2009-11-17 [2/2] Carl Worth, Alex Botero-Lowry [notmuch] preliminary FreeBSD support (attachment inbox unread) End of search results. diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage b/test/emacs.expected-output/notmuch-show-thread-maildir-storage index 8f18afd8..92cdd19c 100644 --- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage +++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage @@ -1,4 +1,4 @@ -"Lars Kellogg-Stedman" (2009-11-17) (inbox) +Lars Kellogg-Stedman (2009-11-17) (inbox) Subject: [notmuch] Working with Maildir storage? To: notmuch@notmuchmail.org Date: Tue, 17 Nov 2009 14:00:54 -0500 @@ -23,27 +23,26 @@ with Maildir) or if something else is going on. Cheers, -[ 12-line signature. Click/Enter to toggle visibility. ] +[ 4-line signature. Click/Enter to toggle visibility. ] -- -Lars Kellogg-Stedman +Lars Kellogg-Stedman Senior Technologist, Computing and Information Technology Harvard University School of Engineering and Applied Sciences --------------- next part -------------- -A non-text attachment was scrubbed... -Name: not available -Type: application/pgp-signature -Size: 489 bytes -Desc: not available -URL: - - "Mikhail Gusarov" (2009-11-17) (inbox unread) - Subject: [notmuch] Working with Maildir storage? +[ application/pgp-signature ] +[ text/plain ] +[ 3-line signature. Click/Enter to toggle visibility. ] +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + Mikhail Gusarov (2009-11-17) (inbox unread) + Subject: Re: [notmuch] Working with Maildir storage? To: notmuch@notmuchmail.org Date: Wed, 18 Nov 2009 01:02:38 +0600 - Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars at seas.harvard.edu did gyre and gimble: + Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did gyre and gimble: LK> Resulted in 4604 lines of errors along the lines of: @@ -53,20 +52,20 @@ URL: - - "Lars Kellogg-Stedman" (2009-11-17) (inbox unread) - Subject: [notmuch] Working with Maildir storage? - To: notmuch@notmuchmail.org + [ application/pgp-signature ] + [ text/plain ] + [ 3-line signature. Click/Enter to toggle visibility. ] + _______________________________________________ + notmuch mailing list + notmuch@notmuchmail.org + http://notmuchmail.org/mailman/listinfo/notmuch + Lars Kellogg-Stedman (2009-11-17) (inbox unread) + Subject: Re: [notmuch] Working with Maildir storage? + To: Mikhail Gusarov + Cc: notmuch@notmuchmail.org Date: Tue, 17 Nov 2009 15:33:01 -0500 > See the patch just posted here. @@ -80,20 +79,19 @@ URL: + Lars Kellogg-Stedman Senior Technologist, Computing and Information Technology Harvard University School of Engineering and Applied Sciences - -------------- next part -------------- - A non-text attachment was scrubbed... - Name: not available - Type: application/pgp-signature - Size: 489 bytes - Desc: not available - URL: - + [ application/pgp-signature ] + [ text/plain ] + [ 3-line signature. Click/Enter to toggle visibility. ] + _______________________________________________ + notmuch mailing list + notmuch@notmuchmail.org + http://notmuchmail.org/mailman/listinfo/notmuch "Mikhail Gusarov" (2009-11-17) (inbox unread) Subject: [notmuch] Working with Maildir storage? To: notmuch@notmuchmail.org @@ -144,9 +142,10 @@ URL: (2009-11-18) (inbox unread) - Subject: [notmuch] Working with Maildir storage? - To: notmuch@notmuchmail.org + Lars Kellogg-Stedman (2009-11-18) (inbox unread) + Subject: Re: [notmuch] Working with Maildir storage? + To: Keith Packard + Cc: notmuch@notmuchmail.org Date: Tue, 17 Nov 2009 19:50:40 -0500 > I've also pushed a slightly more complicated (and complete) fix to my @@ -155,20 +154,19 @@ URL: " (for the uint32_t on line 466). - [ 12-line signature. Click/Enter to toggle visibility. ] + [ 4-line signature. Click/Enter to toggle visibility. ] -- - Lars Kellogg-Stedman + Lars Kellogg-Stedman Senior Technologist, Computing and Information Technology Harvard University School of Engineering and Applied Sciences - -------------- next part -------------- - A non-text attachment was scrubbed... - Name: not available - Type: application/pgp-signature - Size: 489 bytes - Desc: not available - URL: - + [ application/pgp-signature ] + [ text/plain ] + [ 3-line signature. Click/Enter to toggle visibility. ] + _______________________________________________ + notmuch mailing list + notmuch@notmuchmail.org + http://notmuchmail.org/mailman/listinfo/notmuch "Carl Worth" (2009-11-18) (inbox unread) Subject: [notmuch] Working with Maildir storage? To: notmuch@notmuchmail.org -- 2.43.0