From 61bded1d8265211f434143aa7984783f2ab2a045 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 13 Jun 2004 08:32:57 +0000 Subject: [PATCH] added Curl_strcasestr() for case insensitive strstr() searching --- lib/strequal.c | 31 +++++++++++++++++++++++++------ lib/strequal.h | 13 ++++++++----- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/lib/strequal.c b/lib/strequal.c index 37a68876e..ec4910281 100644 --- a/lib/strequal.c +++ b/lib/strequal.c @@ -1,8 +1,8 @@ /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. @@ -10,7 +10,7 @@ * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -78,6 +78,25 @@ int curl_strnequal(const char *first, const char *second, size_t max) #endif } +/* + * Curl_strcasestr() finds the first occurrence of the substring needle in the + * string haystack. The terminating `\0' characters are not compared. The + * matching is done CASE INSENSITIVE, which thus is the difference between + * this and strstr(). + */ +char *Curl_strcasestr(const char *haystack, const char *needle) +{ + size_t nlen = strlen(needle); + size_t hlen = strlen(haystack); + + while(hlen-- >= nlen) { + if(curl_strnequal(haystack, needle, nlen)) + return (char *)haystack; + haystack++; + } + return NULL; +} + #ifndef HAVE_STRLCAT /* * The strlcat() function appends the NUL-terminated string src to the end @@ -90,7 +109,7 @@ int curl_strnequal(const char *first, const char *second, size_t max) * src. While this may seem somewhat confusing it was done to make trunca- * tion detection simple. * - * + * */ size_t Curl_strlcat(char *dst, const char *src, size_t siz) { diff --git a/lib/strequal.h b/lib/strequal.h index b80ed8ab9..586521175 100644 --- a/lib/strequal.h +++ b/lib/strequal.h @@ -1,10 +1,10 @@ #ifndef __STREQUAL_H #define __STREQUAL_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. @@ -12,7 +12,7 @@ * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -36,6 +36,9 @@ int curl_strnequal(const char *first, const char *second, size_t max); argument is zero-byte terminated */ #define checkprefix(a,b) strnequal(a,b,strlen(a)) +/* case insensitive strstr() */ +char *Curl_strcasestr(const char *haystack, const char *needle); + #ifndef HAVE_STRLCAT #define strlcat(x,y,z) Curl_strlcat(x,y,z) size_t Curl_strlcat(char *dst, const char *src, size_t siz);