Re: [PATCH 2/6] cli: sanitize tabs to spaces in notmuch search

diff --git a/07/627ce9cc5b3c2fc3d5b5a167d110408bb0bbda b/07/627ce9cc5b3c2fc3d5b5a167d110408bb0bbda
new file mode 100644 (file)
index 0000000..9522930
--- /dev/null
+++ b/07/627ce9cc5b3c2fc3d5b5a167d110408bb0bbda
@@ -0,0 +1,122 @@
+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 CB2FB431FBC\r
+       for <notmuch@notmuchmail.org>; Thu, 17 Oct 2013 01:07:58 -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 1fb6xH1ItOsY for <notmuch@notmuchmail.org>;\r
+       Thu, 17 Oct 2013 01:07:54 -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 D5601431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 17 Oct 2013 01:07:53 -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 1VWicV-0000BQ-K5; Thu, 17 Oct 2013 09:07:50 +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 1VWicV-00017l-1l; Thu, 17 Oct 2013 09:07:47 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/6] cli: sanitize tabs to spaces in notmuch search\r
+In-Reply-To:\r
+ <af8381b86275c4be77cc8527a19d69efbd2e9423.1381948853.git.jani@nikula.org>\r
+References: <cover.1381948853.git.jani@nikula.org>\r
+       <af8381b86275c4be77cc8527a19d69efbd2e9423.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:07:46 +0100\r
+Message-ID: <87ob6ob9rh.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: a3d5a750b9c0cfb97c132851950f5200 (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:07:58 -0000\r
+\r
+\r
+Hi\r
+\r
+I have looked at the whole series and broadly it looks good. However, I\r
+don't know this code so this is not a full review. I do have a few\r
+comments: some of these may be plain wrong in which case my apologies!\r
+\r
+On Wed, 16 Oct 2013, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> This is in preparation of switching to gmime header parsing, but\r
+> arguably converting tabs to spaces rather than question marks is the\r
+> right thing to do anyway.\r
+> ---\r
+\r
+I think it would be worth saying in the commit message that this is only\r
+for text summary output.\r
+\r
+Also why only tabs to spaces but \n to a '?'\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+\r
+\r
+>  notmuch-search.c | 4 +++-\r
+>  1 file changed, 3 insertions(+), 1 deletion(-)\r
+>\r
+> diff --git a/notmuch-search.c b/notmuch-search.c\r
+> index d9d39ec..eab314f 100644\r
+> --- a/notmuch-search.c\r
+> +++ b/notmuch-search.c\r
+> @@ -40,7 +40,9 @@ sanitize_string (const void *ctx, const char *str)\r
+>      loop = out = talloc_strdup (ctx, str);\r
+>  \r
+>      for (; *loop; loop++) {\r
+> -    if ((unsigned char)(*loop) < 32)\r
+> +    if (*loop == '\t')\r
+> +        *loop = ' ';\r
+> +    else if ((unsigned char)(*loop) < 32)\r
+>          *loop = '?';\r
+>      }\r
+>      return out;\r
+> -- \r
+> 1.8.4.rc3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r