[PATCH 03/14] util: Const version of strtok_len

diff --git a/f8/f7894a387b4449868219214372c7a144ee975c b/f8/f7894a387b4449868219214372c7a144ee975c
new file mode 100644 (file)
index 0000000..0657aec
--- /dev/null
+++ b/f8/f7894a387b4449868219214372c7a144ee975c
@@ -0,0 +1,121 @@
+Return-Path: <amdragon@mit.edu>\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 A5532429E43\r
+       for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:41 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[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 Ifjy6GaXZucE for <notmuch@notmuchmail.org>;\r
+       Sat, 26 Jul 2014 20:53:36 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7340A431FD4\r
+       for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:09 -0700 (PDT)\r
+X-AuditID: 12074422-f79be6d000007518-50-53d477a27def\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id ED.39.29976.3A774D35; Sat, 26 Jul 2014 23:53:07 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s6R3r54F004155; \r
+       Sat, 26 Jul 2014 23:53:06 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6R3r0L0016392\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 26 Jul 2014 23:53:05 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1XBFW8-00051B-7q; Sat, 26 Jul 2014 23:53:00 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 03/14] util: Const version of strtok_len\r
+Date: Sat, 26 Jul 2014 23:52:42 -0400\r
+Message-Id: <1406433173-19169-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
+References: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFlrPIsWRmVeSWpSXmKPExsUixCmqrbu4/EqwwacFLBbXb85kdmD0eLbq\r
+       FnMAYxSXTUpqTmZZapG+XQJXxvW3RQWvuCtmTClrYNzF2cXIySEhYCKxYst1NghbTOLCvfVA\r
+       NheHkMBsJok5p04xQjgbGSXOXjvGCuHcYZLonNDCDOHMZZT4cekCI0g/m4CGxLb9y8FsEQFp\r
+       iZ13ZwN1cHAwC6hJ/OlSATGFBSwk3iwsBalgEVCVuPinlx3E5hVwkPjzpZcR4go5iYYbn8Au\r
+       4hRwlDj+7AQbSKsQUM2tS4kTGPkXMDKsYpRNya3SzU3MzClOTdYtTk7My0st0jXVy80s0UtN\r
+       Kd3ECAoXdhelHYw/DyodYhTgYFTi4c1guxIsxJpYVlyZe4hRkoNJSZR3vxlQiC8pP6UyI7E4\r
+       I76oNCe1+BCjBAezkgivUDFQjjclsbIqtSgfJiXNwaIkzvvW2ipYSCA9sSQ1OzW1ILUIJivD\r
+       waEkwSsFjAshwaLU9NSKtMycEoQ0EwcnyHAeoOEbSkGGFxck5hZnpkPkTzEqSonz/gJJCIAk\r
+       Mkrz4Hph8fyKURzoFWFe1jKgKh5gKoDrfgU0mAloMIv/ZZDBJYkIKakGRlGOjw9SHour7bDI\r
+       W79g/ZfCLKFFZ41OMOf8vnbJtarzUoibf/fjh6a3Xq51K3+4/tin1IfcomwMnenf3OSP3RBb\r
+       3PhiyYbLSe1+39fKlon87vwgU73x9uKfP7ku/ZCTYcu7P9vmT87zR67r2d5Od90S7Cr9UDtg\r
+       cZwCo8Is1wdzbjOzmMWwRSixFGckGmoxFxUnAgBGQRtJwgIAAA==\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: Sun, 27 Jul 2014 03:53:41 -0000\r
+\r
+Because of limitations in the C type system, we can't a strtok_len\r
+that can work on both const string and non-const strings.  The C\r
+library solves this by taking a const char* and returning a char*\r
+in functions like this (e.g., strchr), but that's not const-safe.\r
+Solve it by introducing strtok_len_c, a version of strtok_len for\r
+const strings.\r
+---\r
+ util/string-util.c | 8 ++++++++\r
+ util/string-util.h | 3 +++\r
+ 2 files changed, 11 insertions(+)\r
+\r
+diff --git a/util/string-util.c b/util/string-util.c\r
+index 3e7066c..a90501e 100644\r
+--- a/util/string-util.c\r
++++ b/util/string-util.c\r
+@@ -37,6 +37,14 @@ strtok_len (char *s, const char *delim, size_t *len)\r
+     return *len ? s : NULL;\r
+ }\r
+ \r
++const char *\r
++strtok_len_c (const char *s, const char *delim, size_t *len)\r
++{\r
++    /* strtok_len is already const-safe, but we can't express both\r
++     * versions in the C type system. */\r
++    return strtok_len ((char*)s, delim, len);\r
++}\r
++\r
+ char *\r
+ sanitize_string (const void *ctx, const char *str)\r
+ {\r
+diff --git a/util/string-util.h b/util/string-util.h\r
+index ccad17f..e409cb3 100644\r
+--- a/util/string-util.h\r
++++ b/util/string-util.h\r
+@@ -23,6 +23,9 @@ extern "C" {\r
+ \r
+ char *strtok_len (char *s, const char *delim, size_t *len);\r
+ \r
++/* Const version of strtok_len. */\r
++const char *strtok_len_c (const char *s, const char *delim, size_t *len);\r
++\r
+ /* Return a talloced string with str sanitized.\r
+  *\r
+  * Whitespace characters (tabs and newlines) are replaced with spaces,\r
+-- \r
+2.0.0\r
+\r