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

diff --git a/03/5a2352a27964769248e03d73b8308397689b95 b/03/5a2352a27964769248e03d73b8308397689b95
new file mode 100644 (file)
index 0000000..4ac4bdd
--- /dev/null
+++ b/03/5a2352a27964769248e03d73b8308397689b95
@@ -0,0 +1,101 @@
+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 C103C431FBC\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Oct 2013 12:00:31 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\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 Aia0+NjQfwpL for <notmuch@notmuchmail.org>;\r
+       Wed, 16 Oct 2013 12:00:27 -0700 (PDT)\r
+Received: from mail-ee0-f47.google.com (mail-ee0-f47.google.com\r
+ [74.125.83.47])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 059EB431FB6   for <notmuch@notmuchmail.org>; Wed, 16 Oct 2013 12:00:25 -0700\r
+ (PDT)\r
+Received: by mail-ee0-f47.google.com with SMTP id d49so580083eek.6\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Oct 2013 12:00:24 -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:cc:subject:date:message-id:in-reply-to\r
+       :references:in-reply-to:references;\r
+       bh=mJ/sNzkxRyvvK7xDQmKkzIs57yiqR2k77GY/rkLdWB0=;\r
+       b=ar1UTaMhyr9vmJpIlKlXVS+vKfCcRoa2hj1YVW9lHLew7xgRwio0Ri1k81qm78McQ6\r
+       lq1yEXM/Jj8iSdSEn4qkO48FXNImXRVz31INKr8H/idp95nBpHwlOmFh0sXqtUAHn3MS\r
+       UYfDX94nFDf5ms2SCZsvBcO/pW/FSJx2St0hwaAkZDehQknyrVf1lF0zpN/Thn6e16WW\r
+       TMAavgnAKeHb/VdRptvYpW4zo8jg4aKdSbwId9yd7Y5juM1idTEbE+PQqsXsmJDP01ic\r
+       6SoheCUmC/SI6YY2aR9OeWzP8VkFbhav/ElFNXsa/nO2K/MhOkWijg1BoveuKCrk+qOZ\r
+       TtyQ==\r
+X-Gm-Message-State:\r
+ ALoCoQmd8zSnQSGD1n87iW/iIRroLZjsmXebFpiQ4RuCluEg3xLOZx99XY+9vVegS44QjfvLZAmg\r
+X-Received: by 10.14.42.6 with SMTP id i6mr5709773eeb.65.1381950024909;\r
+       Wed, 16 Oct 2013 12:00:24 -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
+       x47sm183065259eea.16.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Wed, 16 Oct 2013 12:00:24 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/6] cli: make the hacky from guessing more liberal\r
+Date: Wed, 16 Oct 2013 22:00:10 +0300\r
+Message-Id:\r
+ <7dd03cd9c1677be8c5937d11b376d4cbd26c64f5.1381948853.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+In-Reply-To: <cover.1381948853.git.jani@nikula.org>\r
+References: <cover.1381948853.git.jani@nikula.org>\r
+In-Reply-To: <cover.1381948853.git.jani@nikula.org>\r
+References: <cover.1381948853.git.jani@nikula.org>\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: Wed, 16 Oct 2013 19:00:32 -0000\r
+\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
+       if (*by == '\0')\r
+           break;\r
+-- \r
+1.8.4.rc3\r
+\r