From e071caf159e4a49bf8cd508bce6f950d7e0fa80e Mon Sep 17 00:00:00 2001 From: Blake Jones Date: Sun, 4 Nov 2012 20:15:58 +1700 Subject: [PATCH] [PATCH 06/10] strsep: check for availability (Solaris support) --- a3/f7f01eaa1851567cc2dd59b587f7f49605ac4b | 234 ++++++++++++++++++++++ 1 file changed, 234 insertions(+) create mode 100644 a3/f7f01eaa1851567cc2dd59b587f7f49605ac4b diff --git a/a3/f7f01eaa1851567cc2dd59b587f7f49605ac4b b/a3/f7f01eaa1851567cc2dd59b587f7f49605ac4b new file mode 100644 index 000000000..a2c07d2b7 --- /dev/null +++ b/a3/f7f01eaa1851567cc2dd59b587f7f49605ac4b @@ -0,0 +1,234 @@ +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 ECF8D431FD4 + for ; Sat, 3 Nov 2012 20:24:25 -0700 (PDT) +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 HCvaLNsSpd7C for ; + Sat, 3 Nov 2012 20:24:24 -0700 (PDT) +Received: from foo.net (70-36-235-136.dsl.static.sonic.net [70.36.235.136]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 268D0431FD0 + for ; Sat, 3 Nov 2012 20:24:21 -0700 (PDT) +Received: from foo.net (localhost [127.0.0.1]) + by foo.net (8.14.5+Sun/8.14.5) with ESMTP id qA43GGPn025686; + Sat, 3 Nov 2012 20:16:16 -0700 (PDT) +Received: (from blakej@localhost) + by foo.net (8.14.5+Sun/8.14.5/Submit) id qA43GG40025685; + Sat, 3 Nov 2012 20:16:16 -0700 (PDT) +From: Blake Jones +To: notmuch@notmuchmail.org +Subject: [PATCH 06/10] strsep: check for availability (Solaris support) +Date: Sat, 3 Nov 2012 20:15:58 -0700 +Message-Id: <1351998962-25135-7-git-send-email-blakej@foo.net> +X-Mailer: git-send-email 1.7.3.2 +In-Reply-To: <1351998962-25135-1-git-send-email-blakej@foo.net> +References: <1351998962-25135-1-git-send-email-blakej@foo.net> +X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0.2 + (foo.net [127.0.0.1]); Sat, 03 Nov 2012 20:16:16 -0700 (PDT) +X-Mailman-Approved-At: Sun, 04 Nov 2012 01:30:19 -0800 +Cc: Blake Jones +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: Sun, 04 Nov 2012 03:24:26 -0000 + +Solaris does not ship a version of the strsep() function. This change +adds a check to "configure" to see whether notmuch needs to provide its +own implementation, and if so, it uses the new version in +"compat/strsep.c" (which was copied from Mutt, and apparently before +that from glibc). +--- + compat/Makefile.local | 4 +++ + compat/compat.h | 4 +++ + compat/have_strsep.c | 10 ++++++++ + compat/strsep.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ + configure | 17 +++++++++++++ + 5 files changed, 100 insertions(+) + 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 b750501..1fd2723 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 dae837e..e519abc 100755 +--- a/configure ++++ b/configure +@@ -512,6 +512,17 @@ else + fi + rm -f compat/have_strcasestr + ++printf "Checking for strsep... " ++if ${CC} -o compat/have_strsep "$srcdir"/compat/have_strsep.c > /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 "Checking for standard version of getpwuid_r... " + if ${CC} -o compat/check_getpwuid "$srcdir"/compat/check_getpwuid.c > /dev/null 2>&1 + then +@@ -723,6 +734,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} ++ + # Whether the getpwuid_r function is standards-compliant + # (if not, then notmuch will compile with -D_POSIX_PTHREAD_SEMANTICS + # to enable the standards-compliant version -- needed for Solaris) +@@ -782,12 +797,14 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ + \$(VALGRIND_CFLAGS) \\ + -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ ++ -DHAVE_STRSEP=\$(HAVE_STRSEP) \\ + -DSTD_GETPWUID=\$(STD_GETPWUID) \\ + -DSTD_ASCTIME=\$(STD_ASCTIME) + CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ + \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\ + -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ ++ -DHAVE_STRSEP=\$(HAVE_STRSEP) \\ + -DSTD_GETPWUID=\$(STD_GETPWUID) \\ + -DSTD_ASCTIME=\$(STD_ASCTIME) + CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) \\ +-- +1.7.9.2 + -- 2.26.2