Re: [PATCH 3/8] hex-escape: add function to decode escaped string in-place

diff --git a/c4/9206ee088acb93f72b2c7ce26deb32614efa95 b/c4/9206ee088acb93f72b2c7ce26deb32614efa95
new file mode 100644 (file)
index 0000000..e3df020
--- /dev/null
+++ b/c4/9206ee088acb93f72b2c7ce26deb32614efa95
@@ -0,0 +1,123 @@
+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 6CF13431FB6\r
+       for <notmuch@notmuchmail.org>; Thu,  5 Apr 2012 05:00:55 -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 Y-xrZIb6WdM6 for <notmuch@notmuchmail.org>;\r
+       Thu,  5 Apr 2012 05:00:55 -0700 (PDT)\r
+Received: from mail-qa0-f43.google.com (mail-qa0-f43.google.com\r
+       [209.85.216.43]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D4DDC431FAE\r
+       for <notmuch@notmuchmail.org>; Thu,  5 Apr 2012 05:00:54 -0700 (PDT)\r
+Received: by qadb15 with SMTP id b15so1348954qad.2\r
+       for <notmuch@notmuchmail.org>; Thu, 05 Apr 2012 05:00:54 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type:x-gm-message-state;\r
+       bh=Y+C/Ja8vCfqWISx60fFzLBTn+WOXMgIEwbf1mA7QvjM=;\r
+       b=H9Ie8/+exKiLQO9Vwkj+w4Omewg9H7mkbnkPhzUVfT5ba5XRfs7p6Ru5b2X+H5JGjv\r
+       l5eG74KNd1luQ+f4egdV8iCbESudQyPC9msXFFQtrT0AC42dkWWQDqhXHDhEFhTfy0qr\r
+       /fvtxTQJZdnjuO1XaGGyEo4K7PjQJGMs/jZ1kf54RGPCBuj+Rf4odcWKZgEBXjr9nAw4\r
+       XZ5OCzY6PB+CxRvfDLhhQFjkc9JhLdFYvNlPql87Sfz8s8PGCsCtq4GluDmqlyXBx/eZ\r
+       e33y8NY9rb9aOJblBHvi3MjpAiqOl4trkWdXr+CwjS+Saa5tIG3R11P2rC70K66+3nCa\r
+       U46w==\r
+Received: by 10.224.35.130 with SMTP id p2mr3582239qad.32.1333627254129;\r
+       Thu, 05 Apr 2012 05:00:54 -0700 (PDT)\r
+Received: from localhost (nikula.org. [92.243.24.172])\r
+       by mx.google.com with ESMTPS id ha3sm5817040qab.13.2012.04.05.05.00.51\r
+       (version=SSLv3 cipher=OTHER); Thu, 05 Apr 2012 05:00:52 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: David Bremner <bremner@unb.ca>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 3/8] hex-escape: add function to decode escaped string\r
+       in-place\r
+In-Reply-To: <87d37mtms7.fsf@zancas.localnet>\r
+References: <cover.1333231401.git.jani@nikula.org>\r
+       <026815054d3e01e6f29c0834d43ccabdf6eda481.1333231401.git.jani@nikula.org>User-Agent:    Notmuch/0.12+70~g46e73fe (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu) <87d37mtms7.fsf@zancas.localnet>\r
+User-Agent: Notmuch/0.11.1+222~ga47a98c (http://notmuchmail.org) Emacs/23.1.1\r
+       (i686-pc-linux-gnu)\r
+Date: Thu, 05 Apr 2012 12:00:50 +0000\r
+Message-ID: <87ehs2xua5.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQmWDVbyz/nM7YU1sWTV6xZM34L0J7Mr9Apv+e2PWBTvDq25MF65Rtj8yXKIl1NeW33qv9w5\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, 05 Apr 2012 12:00:55 -0000\r
+\r
+\r
+Thanks for the review, David. Agreed on all points.\r
+\r
+J.\r
+\r
+\r
+On Thu, 05 Apr 2012 08:56:24 -0300, David Bremner <bremner@unb.ca> wrote:\r
+> Jani Nikula <jani@nikula.org> writes:\r
+> \r
+> > Add function hex_decode_inplace() to decode the input string onto\r
+> > itself.\r
+> >\r
+> > Signed-off-by: Jani Nikula <jani@nikula.org>\r
+> >\r
+> > ---\r
+> >\r
+> > This could be folded to "hex-escape: (en|de)code strings to/from\r
+> > restricted character set".\r
+> \r
+> Probably. It's a bit hard to follow as is; somehow the code movement is\r
+> a bit noisy.\r
+> \r
+> >      while (*p) {\r
+> > -\r
+> >    if (*p == escape_char) {\r
+> > -\r
+> unrelated whitespace changes, naughty naughty.\r
+> \r
+> > +hex_status_t\r
+> > +hex_decode_inplace (char *p)\r
+> > +{\r
+> > +    return hex_decode_internal (p, (unsigned char *) p);\r
+> this could probably use a comment to the effect that there _will_ be\r
+> enough space.\r
+> \r
+> > +\r
+> > +    p = in;\r
+> > +    q = (unsigned char *) *out;\r
+> \r
+> I understand trying to minimize changes, but do p and q serve any\r
+> purpose here?\r
+> \r
+> > +\r
+> > +    return hex_decode_internal (p, q);\r
+> > +}\r
+> \r
+> \r
+> > +/*\r
+> > + * Decode 'in' onto itself.\r
+> > + */\r
+> \r
+> This is just a bit terse for my taste.\r
+> \r
+> d\r