1 Return-Path: <amdragon@mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id A5532429E43
\r
6 for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:41 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Ifjy6GaXZucE for <notmuch@notmuchmail.org>;
\r
16 Sat, 26 Jul 2014 20:53:36 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu
\r
19 by olra.theworths.org (Postfix) with ESMTP id 7340A431FD4
\r
20 for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:09 -0700 (PDT)
\r
21 X-AuditID: 12074422-f79be6d000007518-50-53d477a27def
\r
22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])
\r
23 (using TLS with cipher AES256-SHA (256/256 bits))
\r
24 (Client did not present a certificate)
\r
25 by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP
\r
26 id ED.39.29976.3A774D35; Sat, 26 Jul 2014 23:53:07 -0400 (EDT)
\r
27 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
28 by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s6R3r54F004155;
\r
29 Sat, 26 Jul 2014 23:53:06 -0400
\r
30 Received: from drake.dyndns.org
\r
31 (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com
\r
32 [216.15.114.40]) (authenticated bits=0)
\r
33 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
34 by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6R3r0L0016392
\r
35 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
36 Sat, 26 Jul 2014 23:53:05 -0400
\r
37 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)
\r
38 (envelope-from <amdragon@mit.edu>)
\r
39 id 1XBFW8-00051B-7q; Sat, 26 Jul 2014 23:53:00 -0400
\r
40 From: Austin Clements <amdragon@MIT.EDU>
\r
41 To: notmuch@notmuchmail.org
\r
42 Subject: [PATCH 03/14] util: Const version of strtok_len
\r
43 Date: Sat, 26 Jul 2014 23:52:42 -0400
\r
44 Message-Id: <1406433173-19169-4-git-send-email-amdragon@mit.edu>
\r
45 X-Mailer: git-send-email 2.0.0
\r
46 In-Reply-To: <1406433173-19169-1-git-send-email-amdragon@mit.edu>
\r
47 References: <1406433173-19169-1-git-send-email-amdragon@mit.edu>
\r
48 X-Brightmail-Tracker:
\r
49 H4sIAAAAAAAAA+NgFlrPIsWRmVeSWpSXmKPExsUixCmqrbu4/EqwwacFLBbXb85kdmD0eLbq
\r
50 FnMAYxSXTUpqTmZZapG+XQJXxvW3RQWvuCtmTClrYNzF2cXIySEhYCKxYst1NghbTOLCvfVA
\r
51 NheHkMBsJok5p04xQjgbGSXOXjvGCuHcYZLonNDCDOHMZZT4cekCI0g/m4CGxLb9y8FsEQFp
\r
52 iZ13ZwN1cHAwC6hJ/OlSATGFBSwk3iwsBalgEVCVuPinlx3E5hVwkPjzpZcR4go5iYYbn8Au
\r
53 4hRwlDj+7AQbSKsQUM2tS4kTGPkXMDKsYpRNya3SzU3MzClOTdYtTk7My0st0jXVy80s0UtN
\r
54 Kd3ECAoXdhelHYw/DyodYhTgYFTi4c1guxIsxJpYVlyZe4hRkoNJSZR3vxlQiC8pP6UyI7E4
\r
55 I76oNCe1+BCjBAezkgivUDFQjjclsbIqtSgfJiXNwaIkzvvW2ipYSCA9sSQ1OzW1ILUIJivD
\r
56 waEkwSsFjAshwaLU9NSKtMycEoQ0EwcnyHAeoOEbSkGGFxck5hZnpkPkTzEqSonz/gJJCIAk
\r
57 Mkrz4Hph8fyKURzoFWFe1jKgKh5gKoDrfgU0mAloMIv/ZZDBJYkIKakGRlGOjw9SHour7bDI
\r
58 W79g/ZfCLKFFZ41OMOf8vnbJtarzUoibf/fjh6a3Xq51K3+4/tin1IfcomwMnenf3OSP3RBb
\r
59 3PhiyYbLSe1+39fKlon87vwgU73x9uKfP7ku/ZCTYcu7P9vmT87zR67r2d5Od90S7Cr9UDtg
\r
60 cZwCo8Is1wdzbjOzmMWwRSixFGckGmoxFxUnAgBGQRtJwgIAAA==
\r
61 X-BeenThere: notmuch@notmuchmail.org
\r
62 X-Mailman-Version: 2.1.13
\r
64 List-Id: "Use and development of the notmuch mail system."
\r
65 <notmuch.notmuchmail.org>
\r
66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
67 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
69 List-Post: <mailto:notmuch@notmuchmail.org>
\r
70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
72 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
73 X-List-Received-Date: Sun, 27 Jul 2014 03:53:41 -0000
\r
75 Because of limitations in the C type system, we can't a strtok_len
\r
76 that can work on both const string and non-const strings. The C
\r
77 library solves this by taking a const char* and returning a char*
\r
78 in functions like this (e.g., strchr), but that's not const-safe.
\r
79 Solve it by introducing strtok_len_c, a version of strtok_len for
\r
82 util/string-util.c | 8 ++++++++
\r
83 util/string-util.h | 3 +++
\r
84 2 files changed, 11 insertions(+)
\r
86 diff --git a/util/string-util.c b/util/string-util.c
\r
87 index 3e7066c..a90501e 100644
\r
88 --- a/util/string-util.c
\r
89 +++ b/util/string-util.c
\r
90 @@ -37,6 +37,14 @@ strtok_len (char *s, const char *delim, size_t *len)
\r
91 return *len ? s : NULL;
\r
95 +strtok_len_c (const char *s, const char *delim, size_t *len)
\r
97 + /* strtok_len is already const-safe, but we can't express both
\r
98 + * versions in the C type system. */
\r
99 + return strtok_len ((char*)s, delim, len);
\r
103 sanitize_string (const void *ctx, const char *str)
\r
105 diff --git a/util/string-util.h b/util/string-util.h
\r
106 index ccad17f..e409cb3 100644
\r
107 --- a/util/string-util.h
\r
108 +++ b/util/string-util.h
\r
109 @@ -23,6 +23,9 @@ extern "C" {
\r
111 char *strtok_len (char *s, const char *delim, size_t *len);
\r
113 +/* Const version of strtok_len. */
\r
114 +const char *strtok_len_c (const char *s, const char *delim, size_t *len);
\r
116 /* Return a talloced string with str sanitized.
\r
118 * Whitespace characters (tabs and newlines) are replaced with spaces,
\r