diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2006-07-02 10:26:51 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2006-07-02 10:26:51 +0000 |
commit | 2cb285209e16f56c0f6bc8ad991a35ea1e791deb (patch) | |
tree | ca9d6fe1c9a1ca9cee3ed8c4b4b531d5ea112c34 | |
parent | 467d9679f87b3d8f24bc882283ceb67873438843 (diff) | |
download | netsurf-2cb285209e16f56c0f6bc8ad991a35ea1e791deb.tar.gz netsurf-2cb285209e16f56c0f6bc8ad991a35ea1e791deb.tar.bz2 |
Use case-insensitive strstr to match "stylesheet"
svn path=/trunk/netsurf/; revision=2689
-rw-r--r-- | render/html.c | 4 | ||||
-rw-r--r-- | utils/utils.c | 21 | ||||
-rw-r--r-- | utils/utils.h | 1 |
3 files changed, 24 insertions, 2 deletions
diff --git a/render/html.c b/render/html.c index f04b23c37..f4d6f4fca 100644 --- a/render/html.c +++ b/render/html.c @@ -593,10 +593,10 @@ bool html_find_stylesheets(struct content *c, xmlNode *head) /* rel=<space separated list, including 'stylesheet'> */ if ((rel = (char *) xmlGetProp(node, (const xmlChar *) "rel")) == NULL) continue; - if (strstr(rel, "stylesheet") == 0) { + if (strcasestr(rel, "stylesheet") == 0) { xmlFree(rel); continue; - } else if (strstr(rel, "alternate")) { + } else if (strcasestr(rel, "alternate")) { /* Ignore alternate stylesheets */ xmlFree(rel); continue; diff --git a/utils/utils.c b/utils/utils.c index 1db7f18b9..fca35ab21 100644 --- a/utils/utils.c +++ b/utils/utils.c @@ -214,3 +214,24 @@ const char *rfc1123_date(time_t t) return ret; } + +/** + * Case insensitive strstr implementation + * + * \param haystack String to search in + * \param needle String to look for + * \return Pointer to start of found substring, or NULL if not found + */ +char *strcasestr(const char *haystack, const char *needle) +{ + size_t needle_len = strlen(needle); + const char * last_start = haystack + (strlen(haystack) - needle_len); + + while (haystack <= last_start) { + if (strncasecmp(haystack, needle, needle_len) == 0) + return (char *)haystack; + haystack++; + } + + return NULL; +} diff --git a/utils/utils.h b/utils/utils.h index b7b9e629f..559cc6db0 100644 --- a/utils/utils.h +++ b/utils/utils.h @@ -56,6 +56,7 @@ void regcomp_wrapper(regex_t *preg, const char *regex, int cflags); void unicode_transliterate(unsigned int c, char **r); char *human_friendly_bytesize(unsigned long bytesize); const char *rfc1123_date(time_t t); +char *strcasestr(const char *haystack, const char *needle); /* Platform specific functions */ void die(const char * const error); |