* [PATCH] Add compat version of strcasestr
@ 2010-04-13 3:45 Tomas Carnecky
2010-04-13 4:13 ` Dirk Hohndel
0 siblings, 1 reply; 2+ messages in thread
From: Tomas Carnecky @ 2010-04-13 3:45 UTC (permalink / raw)
To: notmuch
strcasestr is not part of any standard (unlike for example strcasecmp) and thus
not available on all platforms (in my case Solaris).
---
compat/Makefile.local | 4 ++++
compat/compat.h | 4 ++++
compat/have_strcasestr.c | 8 ++++++++
compat/strcasestr.c | 15 +++++++++++++++
configure | 19 +++++++++++++++++--
5 files changed, 48 insertions(+), 2 deletions(-)
create mode 100644 compat/have_strcasestr.c
create mode 100644 compat/strcasestr.c
diff --git a/compat/Makefile.local b/compat/Makefile.local
index 81e6c70..328eca2 100644
--- a/compat/Makefile.local
+++ b/compat/Makefile.local
@@ -8,3 +8,7 @@ notmuch_compat_srcs =
ifneq ($(HAVE_GETLINE),1)
notmuch_compat_srcs += $(dir)/getline.c $(dir)/getdelim.c
endif
+
+ifneq ($(HAVE_STRCASESTR),1)
+notmuch_compat_srcs += $(dir)/strcasestr.c
+endif
diff --git a/compat/compat.h b/compat/compat.h
index d639e0f..be70bd8 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -38,4 +38,8 @@ getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp);
#endif /* !HAVE_GETLINE */
+#if !HAVE_STRCASESTR
+char *strcasestr(char *a, char *b);
+#endif /* !HAVE_STRCASESTR */
+
#endif /* NOTMUCH_COMPAT_H */
diff --git a/compat/have_strcasestr.c b/compat/have_strcasestr.c
new file mode 100644
index 0000000..36e760d
--- /dev/null
+++ b/compat/have_strcasestr.c
@@ -0,0 +1,8 @@
+
+#include <string.h>
+#include <strings.h>
+
+int main()
+{
+ return strcasestr("","");
+}
diff --git a/compat/strcasestr.c b/compat/strcasestr.c
new file mode 100644
index 0000000..a4188b9
--- /dev/null
+++ b/compat/strcasestr.c
@@ -0,0 +1,15 @@
+
+#include <string.h>
+#include <strings.h>
+
+char *strcasestr(char *a, char *b)
+{
+ size_t l;
+ char f[3];
+
+ snprintf(f, sizeof(f), "%c%c", tolower(*b), toupper(*b));
+ for (l = strcspn(a, f); l != strlen(a); l += strcspn(a + l + 1, f) + 1)
+ if (strncasecmp(a + l, b, strlen(b)) == 0)
+ return a + l;
+ return NULL;
+}
diff --git a/configure b/configure
index 5af7852..add2da6 100755
--- a/configure
+++ b/configure
@@ -310,6 +310,17 @@ else
fi
rm -f compat/have_getline
+printf "Checking for strcasestr... "
+if ${CC} -o compat/have_strcasestr compat/have_strcasestr.c > /dev/null 2>&1
+then
+ printf "Yes.\n"
+ have_strcasestr=1
+else
+ printf "No (will use our own instead).\n"
+ have_strcasestr=0
+fi
+rm -f compat/have_strcasestr
+
cat <<EOF
All required packages were found. You may now run the following
@@ -384,6 +395,10 @@ zsh_completion_dir = \$(prefix)/share/zsh/functions/Completion/Unix
# build its own version)
HAVE_GETLINE = ${have_getline}
+# Whether the strcasestr function is available (if not, then notmuch will
+# build its own version)
+HAVE_STRCASESTR = ${have_strcasestr}
+
# Flags needed to compile and link against Xapian
XAPIAN_CXXFLAGS = ${xapian_cxxflags}
XAPIAN_LDFLAGS = ${xapian_ldflags}
@@ -405,9 +420,9 @@ VALGRIND_CFLAGS = ${valgrind_cflags}
# 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)
+ \$(VALGRIND_CFLAGS) -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)
CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
\$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\
- \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS)
+ \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)
CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS)
EOF
--
1.7.0.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Add compat version of strcasestr
2010-04-13 3:45 [PATCH] Add compat version of strcasestr Tomas Carnecky
@ 2010-04-13 4:13 ` Dirk Hohndel
0 siblings, 0 replies; 2+ messages in thread
From: Dirk Hohndel @ 2010-04-13 4:13 UTC (permalink / raw)
To: Tomas Carnecky, notmuch
Funny that we both submitted patches...
cworth can decide which one he likes better :-)
/D
On Tue, 13 Apr 2010 05:45:51 +0200, Tomas Carnecky <tom@dbservice.com> wrote:
> strcasestr is not part of any standard (unlike for example strcasecmp) and thus
> not available on all platforms (in my case Solaris).
>
> ---
> compat/Makefile.local | 4 ++++
> compat/compat.h | 4 ++++
> compat/have_strcasestr.c | 8 ++++++++
> compat/strcasestr.c | 15 +++++++++++++++
> configure | 19 +++++++++++++++++--
> 5 files changed, 48 insertions(+), 2 deletions(-)
> create mode 100644 compat/have_strcasestr.c
> create mode 100644 compat/strcasestr.c
>
> diff --git a/compat/Makefile.local b/compat/Makefile.local
> index 81e6c70..328eca2 100644
> --- a/compat/Makefile.local
> +++ b/compat/Makefile.local
> @@ -8,3 +8,7 @@ notmuch_compat_srcs =
> ifneq ($(HAVE_GETLINE),1)
> notmuch_compat_srcs += $(dir)/getline.c $(dir)/getdelim.c
> endif
> +
> +ifneq ($(HAVE_STRCASESTR),1)
> +notmuch_compat_srcs += $(dir)/strcasestr.c
> +endif
> diff --git a/compat/compat.h b/compat/compat.h
> index d639e0f..be70bd8 100644
> --- a/compat/compat.h
> +++ b/compat/compat.h
> @@ -38,4 +38,8 @@ getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp);
>
> #endif /* !HAVE_GETLINE */
>
> +#if !HAVE_STRCASESTR
> +char *strcasestr(char *a, char *b);
> +#endif /* !HAVE_STRCASESTR */
> +
> #endif /* NOTMUCH_COMPAT_H */
> diff --git a/compat/have_strcasestr.c b/compat/have_strcasestr.c
> new file mode 100644
> index 0000000..36e760d
> --- /dev/null
> +++ b/compat/have_strcasestr.c
> @@ -0,0 +1,8 @@
> +
> +#include <string.h>
> +#include <strings.h>
> +
> +int main()
> +{
> + return strcasestr("","");
> +}
> diff --git a/compat/strcasestr.c b/compat/strcasestr.c
> new file mode 100644
> index 0000000..a4188b9
> --- /dev/null
> +++ b/compat/strcasestr.c
> @@ -0,0 +1,15 @@
> +
> +#include <string.h>
> +#include <strings.h>
> +
> +char *strcasestr(char *a, char *b)
> +{
> + size_t l;
> + char f[3];
> +
> + snprintf(f, sizeof(f), "%c%c", tolower(*b), toupper(*b));
> + for (l = strcspn(a, f); l != strlen(a); l += strcspn(a + l + 1, f) + 1)
> + if (strncasecmp(a + l, b, strlen(b)) == 0)
> + return a + l;
> + return NULL;
> +}
> diff --git a/configure b/configure
> index 5af7852..add2da6 100755
> --- a/configure
> +++ b/configure
> @@ -310,6 +310,17 @@ else
> fi
> rm -f compat/have_getline
>
> +printf "Checking for strcasestr... "
> +if ${CC} -o compat/have_strcasestr compat/have_strcasestr.c > /dev/null 2>&1
> +then
> + printf "Yes.\n"
> + have_strcasestr=1
> +else
> + printf "No (will use our own instead).\n"
> + have_strcasestr=0
> +fi
> +rm -f compat/have_strcasestr
> +
> cat <<EOF
>
> All required packages were found. You may now run the following
> @@ -384,6 +395,10 @@ zsh_completion_dir = \$(prefix)/share/zsh/functions/Completion/Unix
> # build its own version)
> HAVE_GETLINE = ${have_getline}
>
> +# Whether the strcasestr function is available (if not, then notmuch will
> +# build its own version)
> +HAVE_STRCASESTR = ${have_strcasestr}
> +
> # Flags needed to compile and link against Xapian
> XAPIAN_CXXFLAGS = ${xapian_cxxflags}
> XAPIAN_LDFLAGS = ${xapian_ldflags}
> @@ -405,9 +420,9 @@ VALGRIND_CFLAGS = ${valgrind_cflags}
> # 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)
> + \$(VALGRIND_CFLAGS) -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)
> CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
> \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\
> - \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS)
> + \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)
> CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS)
> EOF
> --
> 1.7.0.2
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
--
Dirk Hohndel
Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-13 4:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-13 3:45 [PATCH] Add compat version of strcasestr Tomas Carnecky
2010-04-13 4:13 ` Dirk Hohndel
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).