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

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