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

diff --git a/ae/49376ba6c5296edcdf73281bb592120070f521 b/ae/49376ba6c5296edcdf73281bb592120070f521
new file mode 100644 (file)
index 0000000..2834929
--- /dev/null
+++ b/ae/49376ba6c5296edcdf73281bb592120070f521
@@ -0,0 +1,94 @@
+Return-Path: <jani@nikula.org>\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 BA340431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  4 Nov 2012 13:16:55 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 AbDbX6Z+GbcL for <notmuch@notmuchmail.org>;\r
+       Sun,  4 Nov 2012 13:16:55 -0800 (PST)\r
+Received: from mail-la0-f53.google.com (mail-la0-f53.google.com\r
+       [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id CA109431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  4 Nov 2012 13:16:54 -0800 (PST)\r
+Received: by mail-la0-f53.google.com with SMTP id l5so4027501lah.26\r
+       for <notmuch@notmuchmail.org>; Sun, 04 Nov 2012 13:16:53 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:in-reply-to:references:user-agent:date\r
+       :message-id:mime-version:content-type:x-gm-message-state;\r
+       bh=v2DTGHFm5csZYzmWCO/VeAASRx9LKq2vxTAVKwYo68c=;\r
+       b=aDUJuEVDj+mbUZLOu3eCdugQwBLcIOxEZk+0p4ZMjKHaFghfz66+IPS0sxtH83Gkrb\r
+       Sovm3Dk7ncSfGjiV/FusZ6Nh1MKMJaBb/bpMuFepIDgepbfZTpQHgElFsI0jVoWTDKUi\r
+       DGezsiu52Boysw8pv2NYOFiyQP3m/1Z1oerPfy+THO+KNLlC/N86rS7VemHhjUq/2C48\r
+       OaYfEiLDsOscsKY9hKCXtOmlGeEaYKut8X6lL52q15j1C30Xpfu+nwVkUSKHpQWo80iZ\r
+       3M4dTiNPXqOyDRo2K+QU+143UrMR8qIRlc144Gwp4qMo0QWrv/7+R6qxjzaVGAZxIxKV\r
+       +R5g==\r
+Received: by 10.152.47.148 with SMTP id d20mr7302454lan.42.1352063813386;\r
+       Sun, 04 Nov 2012 13:16:53 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id j9sm5081522lbk.17.2012.11.04.13.16.51\r
+       (version=SSLv3 cipher=OTHER); Sun, 04 Nov 2012 13:16:52 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Blake Jones <blakej@foo.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 08/10] notmuch-config: header for index() prototype\r
+       (Solaris support)\r
+In-Reply-To: <1351998962-25135-9-git-send-email-blakej@foo.net>\r
+References: <1351998962-25135-1-git-send-email-blakej@foo.net>\r
+       <1351998962-25135-9-git-send-email-blakej@foo.net>\r
+User-Agent: Notmuch/0.14+81~g1924356 (http://notmuchmail.org) Emacs/23.4.1\r
+       (i686-pc-linux-gnu)\r
+Date: Sun, 04 Nov 2012 23:16:50 +0200\r
+Message-ID: <87fw4pf4ql.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQl+RobYqqpblwfnudZVLtpElb5oI7Vf09D4qh8sxTyFKa8U3fvulE1Psik0kFfvphLiJOih\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:16:56 -0000\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
+Jani.\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