From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Sun, 4 Nov 2012 21:47:15 +0000 (+0200)
Subject: Re: [PATCH 08/10] notmuch-config: header for index() prototype (Solaris support)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6a0ddb8d56e9ef803247cfb039e43075ddf3ea93;p=notmuch-archives.git

Re: [PATCH 08/10] notmuch-config: header for index() prototype (Solaris support)
---

diff --git a/81/67613f5363035e4aa37ce1c3cb4ec71c682301 b/81/67613f5363035e4aa37ce1c3cb4ec71c682301
new file mode 100644
index 000000000..5c5e4d7a5
--- /dev/null
+++ b/81/67613f5363035e4aa37ce1c3cb4ec71c682301
@@ -0,0 +1,92 @@
+Return-Path: <tomi.ollila@iki.fi>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id D060D431FAF
+	for <notmuch@notmuchmail.org>; Sun,  4 Nov 2012 13:47:16 -0800 (PST)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id f0hTJjNmfOxH for <notmuch@notmuchmail.org>;
+	Sun,  4 Nov 2012 13:47:16 -0800 (PST)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id DA548431FAE
+	for <notmuch@notmuchmail.org>; Sun,  4 Nov 2012 13:47:15 -0800 (PST)
+Received: from guru.guru-group.fi (localhost [IPv6:::1])
+	by guru.guru-group.fi (Postfix) with ESMTP id 50290100094;
+	Sun,  4 Nov 2012 23:47:15 +0200 (EET)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: Jani Nikula <jani@nikula.org>, Blake Jones <blakej@foo.net>,
+	notmuch@notmuchmail.org
+Subject: Re: [PATCH 08/10] notmuch-config: header for index() prototype
+	(Solaris support)
+In-Reply-To: <87fw4pf4ql.fsf@nikula.org>
+References: <1351998962-25135-1-git-send-email-blakej@foo.net>
+	<1351998962-25135-9-git-send-email-blakej@foo.net>
+	<87fw4pf4ql.fsf@nikula.org>
+User-Agent: Notmuch/0.14+81~gb8371cd (http://notmuchmail.org) Emacs/24.2.1
+	(x86_64-unknown-linux-gnu)
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
+	$[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
+	!)g;OY^,BjTbr)Np:%c_o'jj,Z
+Date: Sun, 04 Nov 2012 23:47:15 +0200
+Message-ID: <m2pq3tniqk.fsf@guru.guru-group.fi>
+MIME-Version: 1.0
+Content-Type: text/plain
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Sun, 04 Nov 2012 21:47:16 -0000
+
+On Sun, Nov 04 2012, Jani Nikula wrote:
+
+> On Sun, 04 Nov 2012, Blake Jones <blakej@foo.net> wrote:
+>> Linux, FreeBSD, and Solaris all expect to find the prototype for
+>> "index()" in <strings.h>.  On some operating systems, including
+>> <string.h> is sufficient to get the prototype, but that's not the case
+>> on Solaris.  This patch just modifies notmuch-config.c to include
+>> <strings.h> to get the prototype.
+>
+> We should probably just nuke index() and use strchr() instead.
+
+indeed!
+
+>
+> Jani.
+>
+
+Tomi
+
+
+>
+> diff --git a/notmuch-config.c b/notmuch-config.c
+> index 3e37a2d..47eb743 100644
+> --- a/notmuch-config.c
+> +++ b/notmuch-config.c
+> @@ -688,7 +688,7 @@ _item_split (char *item, char **group, char **key)
+>  
+>      *group = item;
+>  
+> -    period = index (item, '.');
+> +    period = strchr (item, '.');
+>      if (period == NULL || *(period+1) == '\0') {
+>  	fprintf (stderr,
+>  		 "Invalid configuration name: %s\n"
+> _______________________________________________
+> notmuch mailing list
+> notmuch@notmuchmail.org
+> http://notmuchmail.org/mailman/listinfo/notmuch