Re: [PATCH 3/6] cli: make the hacky from guessing more liberal

diff --git a/b9/11cd38cb87db785147d42c42e970bcac690416 b/b9/11cd38cb87db785147d42c42e970bcac690416
new file mode 100644 (file)
index 0000000..3d15b4d
--- /dev/null
+++ b/b9/11cd38cb87db785147d42c42e970bcac690416
@@ -0,0 +1,120 @@
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 3E59C431FB6\r
+       for <notmuch@notmuchmail.org>; Thu, 17 Oct 2013 01:11:39 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.148\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.148 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_BL_SPAMCOP_NET=1.246,\r
+       RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id W76O8k8t69f5 for <notmuch@notmuchmail.org>;\r
+       Thu, 17 Oct 2013 01:11:35 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 4990A431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 17 Oct 2013 01:11:35 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1VWig9-00015Q-A6; Thu, 17 Oct 2013 09:11:33 +0100\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1VWig8-0002Nu-WD; Thu, 17 Oct 2013 09:11:33 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 3/6] cli: make the hacky from guessing more liberal\r
+In-Reply-To:\r
+ <7dd03cd9c1677be8c5937d11b376d4cbd26c64f5.1381948853.git.jani@nikula.org>\r
+References: <cover.1381948853.git.jani@nikula.org>\r
+       <7dd03cd9c1677be8c5937d11b376d4cbd26c64f5.1381948853.git.jani@nikula.org>\r
+User-Agent: Notmuch/0.15.2+334~gafd5c6a (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Thu, 17 Oct 2013 09:11:31 +0100\r
+Message-ID: <87li1sb9l8.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 5ba659eccdfd841c24be8792a840488c (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored 0.0 points. Summary of the scoring: \r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.0 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 17 Oct 2013 08:11:39 -0000\r
+\r
+On Wed, 16 Oct 2013, Jani Nikula <jani@nikula.org> wrote:\r
+> This is in preparation of switching to gmime header parsing. Accept\r
+> "for" and "by" preceded by tabs in the received header. This is a bit\r
+> flaky, but so is the whole guessing code.\r
+\r
+I am happy with the change but I think a little more explanation of the\r
+problem it fixes would be helpful. Is it that there could be a \n \t\r
+before the "for"/"by" or something else?\r
+\r
+> ---\r
+>  notmuch-reply.c | 4 ++--\r
+>  1 file changed, 2 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+> index 9d6f843..4b67e66 100644\r
+> --- a/notmuch-reply.c\r
+> +++ b/notmuch-reply.c\r
+> @@ -423,7 +423,7 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message\r
+>      /* First we look for a " for <email@add.res>" in the received\r
+>       * header\r
+>       */\r
+> -    ptr = strstr (received, " for ");\r
+> +    ptr = strstr (received, "for ");\r
+\r
+The comment should be updated to match the code (and depending on the\r
+answer to the above maybe explain that too)\r
+\r
+Best wishes\r
+\r
+Mark\r
+>  \r
+>      /* Note: ptr potentially contains a list of email addresses. */\r
+>      addr = user_address_in_string (ptr, config);\r
+> @@ -440,7 +440,7 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message\r
+>       * system in this step of the receive chain\r
+>       */\r
+>      by = received;\r
+> -    while((by = strstr (by, " by ")) != NULL) {\r
+> +    while((by = strstr (by, "by ")) != NULL) {\r
+>      by += 4;\r
+>      if (*by == '\0')\r
+>          break;\r
+> -- \r
+> 1.8.4.rc3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r