From: Vladimir.Marek Date: Mon, 9 Apr 2012 10:17:44 +0000 (+0200) Subject: [PATCH 3/4] Private strsep implementation X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a8c49524cfda2caabd8052d93091ed0f95b19d08;p=notmuch-archives.git [PATCH 3/4] Private strsep implementation --- diff --git a/24/12c55eae6fadba7cb85abff8cd524200cf3848 b/24/12c55eae6fadba7cb85abff8cd524200cf3848 new file mode 100644 index 000000000..b964e7332 --- /dev/null +++ b/24/12c55eae6fadba7cb85abff8cd524200cf3848 @@ -0,0 +1,250 @@ +Return-Path: +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 9137741647F + for ; Mon, 9 Apr 2012 03:39:53 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.299 +X-Spam-Level: +X-Spam-Status: No, score=-2.299 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3, UNPARSEABLE_RELAY=0.001] + 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 6EhFg7132Yzs for ; + Mon, 9 Apr 2012 03:39:52 -0700 (PDT) +Received: from acsinet14.oracle.com (acsinet14.oracle.com [141.146.126.236]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C08E841647C + for ; Mon, 9 Apr 2012 03:39:52 -0700 (PDT) +Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) + by acsinet14.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with + ESMTP id q39AIinF002233 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) + for ; Mon, 9 Apr 2012 10:18:44 GMT +Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) + by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with + ESMTP id q39AIh6J031164 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Mon, 9 Apr 2012 10:18:43 GMT +Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) + by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id + q39AIgD6012290 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); + Mon, 9 Apr 2012 10:18:42 GMT +Received: from abhmt120.oracle.com (abhmt120.oracle.com [141.146.116.72]) + by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id + q39AIfMD022174; Mon, 9 Apr 2012 05:18:42 -0500 +Received: from pub.czech.sun.com (/10.163.20.32) + by default (Oracle Beehive Gateway v4.0) + with ESMTP ; Mon, 09 Apr 2012 03:18:41 -0700 +From: Vladimir.Marek@oracle.com +To: notmuch@notmuchmail.org +Subject: [PATCH 3/4] Private strsep implementation +Date: Mon, 9 Apr 2012 12:17:44 +0200 +Message-Id: <1333966665-10469-4-git-send-email-Vladimir.Marek@oracle.com> +X-Mailer: git-send-email 1.7.3.2 +In-Reply-To: <1333966665-10469-1-git-send-email-Vladimir.Marek@oracle.com> +References: <1333966665-10469-1-git-send-email-Vladimir.Marek@oracle.com> +X-Source-IP: acsinet21.oracle.com [141.146.126.237] +X-Auth-Type: Internal IP +X-CT-RefId: str=0001.0A090202.4F82B783.00A1,ss=1,re=0.000,fgs=0 +Cc: Vladimir Marek +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 09 Apr 2012 10:39:53 -0000 + +From: Vladimir Marek + +strsep is not available on Solaris 10, so we stole the one used by mutt. + +Signed-off-by: Vladimir Marek +--- + compat/Makefile.local | 4 +++ + compat/compat.h | 4 +++ + compat/have_strsep.c | 10 +++++++ + compat/strsep.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ + configure | 21 ++++++++++++++- + 5 files changed, 102 insertions(+), 2 deletions(-) + create mode 100644 compat/have_strsep.c + create mode 100644 compat/strsep.c + +diff --git a/compat/Makefile.local b/compat/Makefile.local +index 13f16cd..2c4f65f 100644 +--- a/compat/Makefile.local ++++ b/compat/Makefile.local +@@ -13,4 +13,8 @@ ifneq ($(HAVE_STRCASESTR),1) + notmuch_compat_srcs += $(dir)/strcasestr.c + endif + ++ifneq ($(HAVE_STRSEP),1) ++notmuch_compat_srcs += $(dir)/strsep.c ++endif ++ + SRCS := $(SRCS) $(notmuch_compat_srcs) +diff --git a/compat/compat.h b/compat/compat.h +index b2e2736..cf8d56d 100644 +--- a/compat/compat.h ++++ b/compat/compat.h +@@ -46,6 +46,10 @@ getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp); + char* strcasestr(const char *haystack, const char *needle); + #endif /* !HAVE_STRCASESTR */ + ++#if !HAVE_STRSEP ++char *strsep(char **stringp, const char *delim); ++#endif /* !HAVE_STRSEP */ ++ + /* Silence gcc warnings about unused results. These warnings exist + * for a reason; any use of this needs to be justified. */ + #ifdef __GNUC__ +diff --git a/compat/have_strsep.c b/compat/have_strsep.c +new file mode 100644 +index 0000000..5bd396c +--- /dev/null ++++ b/compat/have_strsep.c +@@ -0,0 +1,10 @@ ++#define _GNU_SOURCE ++#include ++ ++int main() ++{ ++ char *found; ++ char **stringp, const char *delim; ++ ++ found = strsep(stringp, delim); ++} +diff --git a/compat/strsep.c b/compat/strsep.c +new file mode 100644 +index 0000000..78ab9e7 +--- /dev/null ++++ b/compat/strsep.c +@@ -0,0 +1,65 @@ ++/* Copyright (C) 1992, 93, 96, 97, 98, 99, 2004 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include ++ ++/* Taken from glibc 2.6.1 */ ++ ++char *strsep (char **stringp, const char *delim) ++{ ++ char *begin, *end; ++ ++ begin = *stringp; ++ if (begin == NULL) ++ return NULL; ++ ++ /* A frequent case is when the delimiter string contains only one ++ character. Here we don't need to call the expensive `strpbrk' ++ function and instead work using `strchr'. */ ++ if (delim[0] == '\0' || delim[1] == '\0') ++ { ++ char ch = delim[0]; ++ ++ if (ch == '\0') ++ end = NULL; ++ else ++ { ++ if (*begin == ch) ++ end = begin; ++ else if (*begin == '\0') ++ end = NULL; ++ else ++ end = strchr (begin + 1, ch); ++ } ++ } ++ else ++ /* Find the end of the token. */ ++ end = strpbrk (begin, delim); ++ ++ if (end) ++ { ++ /* Terminate the token and set *STRINGP past NUL character. */ ++ *end++ = '\0'; ++ *stringp = end; ++ } ++ else ++ /* No more delimiters; this is the last token. */ ++ *stringp = NULL; ++ ++ return begin; ++} +diff --git a/configure b/configure +index 6870341..a06df7c 100755 +--- a/configure ++++ b/configure +@@ -486,6 +486,17 @@ else + fi + rm -f compat/have_strcasestr + ++printf "Checking for strsep... " ++if ${CC} -o compat/have_strsep "$srcdir"/compat/have_strsep > /dev/null 2>&1 ++then ++ printf "Yes.\n" ++ have_strsep=1 ++else ++ printf "No (will use our own instead).\n" ++ have_strsep=0 ++fi ++rm -f compat/have_strsep ++ + printf "int main(void){return 0;}\n" > minimal.c + + printf "Checking for rpath support... " +@@ -645,6 +656,10 @@ HAVE_GETLINE = ${have_getline} + # build its own version) + HAVE_STRCASESTR = ${have_strcasestr} + ++# Whether the strsep function is available (if not, then notmuch will ++# build its own version) ++HAVE_STRSEP = ${have_strsep} ++ + # Supported platforms (so far) are: LINUX, MACOSX, SOLARIS + PLATFORM = ${platform} + +@@ -689,10 +704,12 @@ WITH_ZSH = ${WITH_ZSH} + # Combined flags for compiling and linking against all of the above + CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ +- \$(VALGRIND_CFLAGS) -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) ++ \$(VALGRIND_CFLAGS) -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ ++ -DHAVE_STRSEP=\$(HAVE_STRSEP) + CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ + \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\ +- -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) ++ -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ ++ -DHAVE_STRSEP=\$(HAVE_STRSEP) + CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) + EOF +-- +1.7.3.2 +