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 B13F2429E40
\r
6 for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:49:12 -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 Ze3SmhrymQ7T for <notmuch@notmuchmail.org>;
\r
16 Tue, 29 Jul 2014 09:49:06 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu
\r
19 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 3026A431FD8
\r
22 for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:48:30 -0700 (PDT)
\r
23 X-AuditID: 1209190e-f79946d000007db1-ff-53d7d05d6d7e
\r
24 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\r
25 (using TLS with cipher AES256-SHA (256/256 bits))
\r
26 (Client did not present a certificate)
\r
27 by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP
\r
28 id AC.F5.32177.D50D7D35; Tue, 29 Jul 2014 12:48:29 -0400 (EDT)
\r
29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
30 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s6TGmIIJ002608;
\r
31 Tue, 29 Jul 2014 12:48:18 -0400
\r
32 Received: from drake.dyndns.org (31-33-71.wireless.csail.mit.edu
\r
33 [128.31.33.71]) (authenticated bits=0)
\r
34 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
35 by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6TGmFJt030248
\r
36 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
37 Tue, 29 Jul 2014 12:48:17 -0400
\r
38 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)
\r
39 (envelope-from <amdragon@mit.edu>)
\r
40 id 1XCAZS-0007Gg-O0; Tue, 29 Jul 2014 12:48:14 -0400
\r
41 From: Austin Clements <amdragon@MIT.EDU>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v2 03/14] util: Const version of strtok_len
\r
44 Date: Tue, 29 Jul 2014 12:48:01 -0400
\r
45 Message-Id: <1406652492-27803-4-git-send-email-amdragon@mit.edu>
\r
46 X-Mailer: git-send-email 2.0.0
\r
47 In-Reply-To: <1406652492-27803-1-git-send-email-amdragon@mit.edu>
\r
48 References: <1406652492-27803-1-git-send-email-amdragon@mit.edu>
\r
49 X-Brightmail-Tracker:
\r
50 H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixG6nrht74XqwQedbVYvVc3ksrt+cyezA
\r
51 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZVx/W1TwirtixpSyBsZdnF2MnBwSAiYSOy5v
\r
52 Y4SwxSQu3FvP1sXIxSEkMJtJYseEOYwQzkZGiR+XrrNDOMeYJI6232WBcOYySsy4sJ4FpJ9N
\r
53 QENi2/7lYLNEBKQldt6dzQpiMws4Snzev4gNxBYWsJaYuvccWD2LgKrEnTt9YDavgINE/5EX
\r
54 LBB3yEk03PgEVs8J1Hvr3l0mEFsIqObQrM0sExj5FzAyrGKUTcmt0s1NzMwpTk3WLU5OzMtL
\r
55 LdI11svNLNFLTSndxAgKI05Jvh2MXw8qHWIU4GBU4uHdMPdasBBrYllxZe4hRkkOJiVRXr19
\r
56 14OF+JLyUyozEosz4otKc1KLDzFKcDArifDynQXK8aYkVlalFuXDpKQ5WJTEed9aWwULCaQn
\r
57 lqRmp6YWpBbBZGU4OJQkeF+fB2oULEpNT61Iy8wpQUgzcXCCDOcBGr4PpIa3uCAxtzgzHSJ/
\r
58 ilFRSpx3E0hCACSRUZoH1wuL81eM4kCvCPMeBKniAaYIuO5XQIOZgAazuoANLklESEk1MBqv
\r
59 0bQ6//lX1iy/G3n7FzwNv3T0nodr6Ms7DVLTxIKWzix+eTFi41nVu5w7g7cknarlKXWRv/+r
\r
60 l0+jaWeoxbvPK7bUW//Y++9eiKJc3EmRAjmf6QbHm24eMnzJ4/sqe1bCYXvOG9WpfQIH9rCd
\r
61 evTGXPDViiMv5RfmOs1j567nW+k4LV7vnZYSS3FGoqEWc1FxIgCZUloLzgIAAA==
\r
62 X-BeenThere: notmuch@notmuchmail.org
\r
63 X-Mailman-Version: 2.1.13
\r
65 List-Id: "Use and development of the notmuch mail system."
\r
66 <notmuch.notmuchmail.org>
\r
67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
70 List-Post: <mailto:notmuch@notmuchmail.org>
\r
71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
73 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
74 X-List-Received-Date: Tue, 29 Jul 2014 16:49:13 -0000
\r
76 Because of limitations in the C type system, we can't a strtok_len
\r
77 that can work on both const string and non-const strings. The C
\r
78 library solves this by taking a const char* and returning a char*
\r
79 in functions like this (e.g., strchr), but that's not const-safe.
\r
80 Solve it by introducing strtok_len_c, a version of strtok_len for
\r
83 util/string-util.c | 8 ++++++++
\r
84 util/string-util.h | 3 +++
\r
85 2 files changed, 11 insertions(+)
\r
87 diff --git a/util/string-util.c b/util/string-util.c
\r
88 index 3e7066c..a90501e 100644
\r
89 --- a/util/string-util.c
\r
90 +++ b/util/string-util.c
\r
91 @@ -37,6 +37,14 @@ strtok_len (char *s, const char *delim, size_t *len)
\r
92 return *len ? s : NULL;
\r
96 +strtok_len_c (const char *s, const char *delim, size_t *len)
\r
98 + /* strtok_len is already const-safe, but we can't express both
\r
99 + * versions in the C type system. */
\r
100 + return strtok_len ((char*)s, delim, len);
\r
104 sanitize_string (const void *ctx, const char *str)
\r
106 diff --git a/util/string-util.h b/util/string-util.h
\r
107 index ccad17f..e409cb3 100644
\r
108 --- a/util/string-util.h
\r
109 +++ b/util/string-util.h
\r
110 @@ -23,6 +23,9 @@ extern "C" {
\r
112 char *strtok_len (char *s, const char *delim, size_t *len);
\r
114 +/* Const version of strtok_len. */
\r
115 +const char *strtok_len_c (const char *s, const char *delim, size_t *len);
\r
117 /* Return a talloced string with str sanitized.
\r
119 * Whitespace characters (tabs and newlines) are replaced with spaces,
\r