ae/49376ba6c5296edcdf73281bb592120070f521

   1 Return-Path: <jani@nikula.org>\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 BA340431FAF\r
   6         for <notmuch@notmuchmail.org>; Sun,  4 Nov 2012 13:16:55 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 AbDbX6Z+GbcL for <notmuch@notmuchmail.org>;\r
  16         Sun,  4 Nov 2012 13:16:55 -0800 (PST)\r
  17 Received: from mail-la0-f53.google.com (mail-la0-f53.google.com\r
  18         [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  19         (No client certificate requested)\r
  20         by olra.theworths.org (Postfix) with ESMTPS id CA109431FAE\r
  21         for <notmuch@notmuchmail.org>; Sun,  4 Nov 2012 13:16:54 -0800 (PST)\r
  22 Received: by mail-la0-f53.google.com with SMTP id l5so4027501lah.26\r
  23         for <notmuch@notmuchmail.org>; Sun, 04 Nov 2012 13:16:53 -0800 (PST)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=google.com; s=20120113;\r
  26         h=from:to:cc:subject:in-reply-to:references:user-agent:date\r
  27         :message-id:mime-version:content-type:x-gm-message-state;\r
  28         bh=v2DTGHFm5csZYzmWCO/VeAASRx9LKq2vxTAVKwYo68c=;\r
  29         b=aDUJuEVDj+mbUZLOu3eCdugQwBLcIOxEZk+0p4ZMjKHaFghfz66+IPS0sxtH83Gkrb\r
  30         Sovm3Dk7ncSfGjiV/FusZ6Nh1MKMJaBb/bpMuFepIDgepbfZTpQHgElFsI0jVoWTDKUi\r
  31         DGezsiu52Boysw8pv2NYOFiyQP3m/1Z1oerPfy+THO+KNLlC/N86rS7VemHhjUq/2C48\r
  32         OaYfEiLDsOscsKY9hKCXtOmlGeEaYKut8X6lL52q15j1C30Xpfu+nwVkUSKHpQWo80iZ\r
  33         3M4dTiNPXqOyDRo2K+QU+143UrMR8qIRlc144Gwp4qMo0QWrv/7+R6qxjzaVGAZxIxKV\r
  34         +R5g==\r
  35 Received: by 10.152.47.148 with SMTP id d20mr7302454lan.42.1352063813386;\r
  36         Sun, 04 Nov 2012 13:16:53 -0800 (PST)\r
  37 Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi.\r
  38         [80.223.81.27])\r
  39         by mx.google.com with ESMTPS id j9sm5081522lbk.17.2012.11.04.13.16.51\r
  40         (version=SSLv3 cipher=OTHER); Sun, 04 Nov 2012 13:16:52 -0800 (PST)\r
  41 From: Jani Nikula <jani@nikula.org>\r
  42 To: Blake Jones <blakej@foo.net>, notmuch@notmuchmail.org\r
  43 Subject: Re: [PATCH 08/10] notmuch-config: header for index() prototype\r
  44         (Solaris support)\r
  45 In-Reply-To: <1351998962-25135-9-git-send-email-blakej@foo.net>\r
  46 References: <1351998962-25135-1-git-send-email-blakej@foo.net>\r
  47         <1351998962-25135-9-git-send-email-blakej@foo.net>\r
  48 User-Agent: Notmuch/0.14+81~g1924356 (http://notmuchmail.org) Emacs/23.4.1\r
  49         (i686-pc-linux-gnu)\r
  50 Date: Sun, 04 Nov 2012 23:16:50 +0200\r
  51 Message-ID: <87fw4pf4ql.fsf@nikula.org>\r
  52 MIME-Version: 1.0\r
  53 Content-Type: text/plain; charset=us-ascii\r
  54 X-Gm-Message-State:\r
  55  ALoCoQl+RobYqqpblwfnudZVLtpElb5oI7Vf09D4qh8sxTyFKa8U3fvulE1Psik0kFfvphLiJOih\r
  56 X-BeenThere: notmuch@notmuchmail.org\r
  57 X-Mailman-Version: 2.1.13\r
  58 Precedence: list\r
  59 List-Id: "Use and development of the notmuch mail system."\r
  60         <notmuch.notmuchmail.org>\r
  61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  64 List-Post: <mailto:notmuch@notmuchmail.org>\r
  65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  68 X-List-Received-Date: Sun, 04 Nov 2012 21:16:56 -0000\r
  69 \r
  70 On Sun, 04 Nov 2012, Blake Jones <blakej@foo.net> wrote:\r
  71 > Linux, FreeBSD, and Solaris all expect to find the prototype for\r
  72 > "index()" in <strings.h>.  On some operating systems, including\r
  73 > <string.h> is sufficient to get the prototype, but that's not the case\r
  74 > on Solaris.  This patch just modifies notmuch-config.c to include\r
  75 > <strings.h> to get the prototype.\r
  76 \r
  77 We should probably just nuke index() and use strchr() instead.\r
  78 \r
  79 Jani.\r
  80 \r
  81 \r
  82 diff --git a/notmuch-config.c b/notmuch-config.c\r
  83 index 3e37a2d..47eb743 100644\r
  84 --- a/notmuch-config.c\r
  85 +++ b/notmuch-config.c\r
  86 @@ -688,7 +688,7 @@ _item_split (char *item, char **group, char **key)\r
  87  \r
  88      *group = item;\r
  89  \r
  90 -    period = index (item, '.');\r
  91 +    period = strchr (item, '.');\r
  92      if (period == NULL || *(period+1) == '\0') {\r
  93         fprintf (stderr,\r
  94                  "Invalid configuration name: %s\n"\r