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 B1246431FCF
\r
6 for <notmuch@notmuchmail.org>; Thu, 31 Jul 2014 19:10:17 -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 z3-YlBSpDwZA for <notmuch@notmuchmail.org>;
\r
16 Thu, 31 Jul 2014 19:10:11 -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 688B9431FAE
\r
20 for <notmuch@notmuchmail.org>; Thu, 31 Jul 2014 19:10:11 -0700 (PDT)
\r
21 X-AuditID: 12074422-f79be6d000007518-7e-53daf70279fb
\r
22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])
\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 CA.05.29976.207FAD35; Thu, 31 Jul 2014 22:10:10 -0400 (EDT)
\r
27 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
28 by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id s712A92M014709;
\r
29 Thu, 31 Jul 2014 22:10:09 -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 s712A6N4029973
\r
35 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
36 Thu, 31 Jul 2014 22:10:08 -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 1XD2IH-00033W-S4; Thu, 31 Jul 2014 22:10:05 -0400
\r
40 From: Austin Clements <amdragon@MIT.EDU>
\r
41 To: notmuch@notmuchmail.org
\r
42 Subject: [PATCH v3 02/13] util: Const version of strtok_len
\r
43 Date: Thu, 31 Jul 2014 22:09:52 -0400
\r
44 Message-Id: <1406859003-11561-3-git-send-email-amdragon@mit.edu>
\r
45 X-Mailer: git-send-email 2.0.0
\r
46 In-Reply-To: <1406859003-11561-1-git-send-email-amdragon@mit.edu>
\r
47 References: <1406859003-11561-1-git-send-email-amdragon@mit.edu>
\r
48 X-Brightmail-Tracker:
\r
49 H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixCmqrMv0/VawwZfZPBar5/JYXL85k9mB
\r
50 yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgyrj+tqjgFXfFjCllDYy7OLsYOTkkBEwk5n9b
\r
51 zgJhi0lcuLeerYuRi0NIYDaTxKT7exkhnI2MEhevNLNCOHeYJOZe7GGGcOYySryf95YJpJ9N
\r
52 QENi2/7ljCC2iIC0xM67s1lBbGYBR4nP+xexgdjCAtYSq3tWgdWzCKhKnP2/FKyGV8BBYuL8
\r
53 Y4wQd8hJNNz4BFbPCdT7/98CsBohoJrW01uZJzDyL2BkWMUom5JbpZubmJlTnJqsW5ycmJeX
\r
54 WqRrqpebWaKXmlK6iREURuwuSjsYfx5UOsQowMGoxMPrEHorWIg1say4MvcQoyQHk5Ior81H
\r
55 oBBfUn5KZUZicUZ8UWlOavEhRgkOZiUR3pcfgHK8KYmVValF+TApaQ4WJXHet9ZWwUIC6Ykl
\r
56 qdmpqQWpRTBZGQ4OJQneM1+BGgWLUtNTK9Iyc0oQ0kwcnCDDeYCGXwOp4S0uSMwtzkyHyJ9i
\r
57 VJQS590DkhAASWSU5sH1wuL8FaM40CvCvA9BqniAKQKu+xXQYCagwc9vXQcZXJKIkJJqYGST
\r
58 vlzRWOjmlCYjuPag+ITdl/573LvlI7mYY868Y2c3a2X+r/ASC+p5I6S2/2Hp7KvCN0+GRTXM
\r
59 CTukc+2kuZrJtE1uqknL72Zrrxdp/RNubNzwoyJSw/L3+9aTB3VC1ikHXzwt+jr/8FqFc+t8
\r
60 ew1+JUg9PFFQZzV9l9QRlofBzQsC38uziyixFGckGmoxFxUnAgB4UsRrzgIAAA==
\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: Fri, 01 Aug 2014 02:10:17 -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