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

diff --git a/fa/b3d5df05e67ca0f3f7a5be8bff6cfcf950fe55 b/fa/b3d5df05e67ca0f3f7a5be8bff6cfcf950fe55
new file mode 100644 (file)
index 0000000..c08e1f3
--- /dev/null
+++ b/fa/b3d5df05e67ca0f3f7a5be8bff6cfcf950fe55
@@ -0,0 +1,119 @@
+Return-Path: <jani@nikula.org>\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 BBF08431FBC\r
+       for <notmuch@notmuchmail.org>; Thu, 17 Oct 2013 07:10:54 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 ZBYKJx5tbolU for <notmuch@notmuchmail.org>;\r
+       Thu, 17 Oct 2013 07:10:50 -0700 (PDT)\r
+Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com\r
+ [74.125.83.43])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 303FA431FAE   for <notmuch@notmuchmail.org>; Thu, 17 Oct 2013 07:10:50 -0700\r
+ (PDT)\r
+Received: by mail-ee0-f43.google.com with SMTP id e52so1091194eek.2\r
+       for <notmuch@notmuchmail.org>; Thu, 17 Oct 2013 07:10:48 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:subject:in-reply-to:references\r
+       :user-agent:date:message-id:mime-version:content-type;\r
+       bh=IEd07YvC21rUK0zF1Ybv7Rw0CPN9UjKb4AQ4vsQ1Gco=;\r
+       b=BlGh7tEaTJophZiUtoJTDqE2TQail3U1v1eUjA5t4MKAUeKD8uv6j06uXdQI3TWHau\r
+       l0FxJGTZsry1bMp8IyoWbs4nlV7jqK840Iz7renJVW4EUqooqjyMWuJjlO8ffC76ydrH\r
+       Eaco+B5nwaI/xkCyjsMSh/dg/i8LsDrgv0n78IdqOy262XX3366BXIJefQAqmHdzMqDa\r
+       mW4BPqctzjBpERrLvu6nLUTyC5YLfnt7WEgT/2zvViJJIUfIKsmUg24vLuEQmnIVPaeT\r
+       kutjhK3fLLjb0mizCtkF0bqj5lH65qVNKuaoUDqkblPmDPJFeiNgc8kOjdSklv3+1Y/+\r
+       1rBw==\r
+X-Gm-Message-State:\r
+ ALoCoQkibq6HsyeQr3JbiffPQYfA7L4xksl7blcZ1HLdfLfTDBKFvu++F8TH2FO/pa2/m3aGc5Rx\r
+X-Received: by 10.15.22.2 with SMTP id e2mr2128781eeu.89.1382018595820;\r
+       Thu, 17 Oct 2013 07:03:15 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91]) by mx.google.com with ESMTPSA id\r
+       r48sm193385379eev.14.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Thu, 17 Oct 2013 07:03:14 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Moritz Wilhelmy <mw+notmuch@barfooze.de>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 3/6] cli: make the hacky from guessing more liberal\r
+In-Reply-To: <20131017135804.GH49348@barfooze.de>\r
+References: <cover.1381948853.git.jani@nikula.org>\r
+       <7dd03cd9c1677be8c5937d11b376d4cbd26c64f5.1381948853.git.jani@nikula.org>\r
+       <20131017135804.GH49348@barfooze.de>\r
+User-Agent: Notmuch/0.16+97~g6878b0b (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Thu, 17 Oct 2013 17:03:14 +0300\r
+Message-ID: <87eh7kuh99.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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 14:10:54 -0000\r
+\r
+On Thu, 17 Oct 2013, Moritz Wilhelmy <mw+notmuch@barfooze.de> wrote:\r
+> Hello,\r
+>\r
+> On Wed, Oct 16, 2013 at 22:00:10 +0300, Jani Nikula 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
+>>  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
+>>      /* 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
+>\r
+> FWIW, I didn't read the rest of the code, but shouldn't the last line\r
+> be changed to "by += 3" when you're dropping a space from the strstr?\r
+\r
+Absolutely, same in the "for" case. Thanks.\r
+\r
+Jani.\r
+\r
+\r
+>\r
+>\r
+> Best,\r
+>\r
+> Moritz\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r