1 Return-Path: <blakej@foo.net>
\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 7F2D8431FC2
\r
6 for <notmuch@notmuchmail.org>; Mon, 5 Nov 2012 11:02:29 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 JiFXnYSUZR7F for <notmuch@notmuchmail.org>;
\r
16 Mon, 5 Nov 2012 11:02:28 -0800 (PST)
\r
17 Received: from foo.net (70-36-235-136.dsl.static.sonic.net [70.36.235.136])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 8F285429E34
\r
21 for <notmuch@notmuchmail.org>; Mon, 5 Nov 2012 11:02:25 -0800 (PST)
\r
22 Received: from foo.net (localhost [127.0.0.1])
\r
23 by foo.net (8.14.5+Sun/8.14.5) with ESMTP id qA5J2OV8019134;
\r
24 Mon, 5 Nov 2012 11:02:24 -0800 (PST)
\r
25 Received: (from blakej@localhost)
\r
26 by foo.net (8.14.5+Sun/8.14.5/Submit) id qA5J2N0j019133;
\r
27 Mon, 5 Nov 2012 11:02:24 -0800 (PST)
\r
28 From: Blake Jones <blakej@foo.net>
\r
29 To: notmuch@notmuchmail.org
\r
30 Subject: [PATCH v2 08/10] notmuch-config: use strchr(),
\r
31 not index() (Solaris support)
\r
32 Date: Mon, 5 Nov 2012 11:02:01 -0800
\r
33 Message-Id: <1352142123-18286-9-git-send-email-blakej@foo.net>
\r
34 X-Mailer: git-send-email 1.7.3.2
\r
35 In-Reply-To: <1352142123-18286-1-git-send-email-blakej@foo.net>
\r
36 References: <1352142123-18286-1-git-send-email-blakej@foo.net>
\r
37 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0.2
\r
38 (foo.net [127.0.0.1]); Mon, 05 Nov 2012 11:02:24 -0800 (PST)
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Mon, 05 Nov 2012 19:02:30 -0000
\r
53 notmuch-config.c has the only use of the function named "index()" in the
\r
54 notmuch source. Several other places use the equivalent function
\r
55 "strchr()"; this patch just fixes notmuch-config.c to use strchr()
\r
56 instead. (Solaris needs to include <strings.h> to get the prototype for
\r
57 index(), and notmuch-config.c was failing to include that header, so it
\r
58 wasn't compiling as-is.)
\r
60 notmuch-config.c | 2 +-
\r
61 1 files changed, 1 insertions(+), 1 deletions(-)
\r
63 diff --git a/notmuch-config.c b/notmuch-config.c
\r
64 index 3e37a2d..47eb743 100644
\r
65 --- a/notmuch-config.c
\r
66 +++ b/notmuch-config.c
\r
67 @@ -688,7 +688,7 @@ _item_split (char *item, char **group, char **key)
\r
71 - period = index (item, '.');
\r
72 + period = strchr (item, '.');
\r
73 if (period == NULL || *(period+1) == '\0') {
\r
75 "Invalid configuration name: %s\n"
\r