From 365d48fb7c1b2c5670c360b74cf64467227d2ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim Rühsen?= Date: Thu, 11 Dec 2014 12:53:05 +0100 Subject: [PATCH] Use c_strcasestr instead of strcasestr in iri.c This also fixes a problem with strcasestr not being in the boostrap.conf module list. Reported-by: Kiyoshi KANAZAWA --- ChangeLog | 4 ++++ bootstrap.conf | 1 + src/ChangeLog | 6 ++++++ src/iri.c | 3 ++- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8a1d60f..33a434f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-12-11 Tim Ruehsen + * bootstrap.conf: Add module c-strcasestr + +2014-12-11 Tim Ruehsen + * README.checkout: Add description for libpcre, add description for pkg-config, add description of GnuTLS, add 2014 copyright year, use ASCII copyright characters diff --git a/bootstrap.conf b/bootstrap.conf index 6befd74..55a6e3c 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -32,6 +32,7 @@ base32 bind c-ctype c-strcase +c-strcasestr clock-time close connect diff --git a/src/ChangeLog b/src/ChangeLog index 9aaaeb7..af55fc1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2014-12-11 Tim Ruehsen + * iri.c: Use c_strcasestr instead of strcasestr + + Reported-by: Kiyoshi KANAZAWA + +2014-12-11 Tim Ruehsen + * wget.h: Fixed define 'ngettext' to WG_NGETTEXT for Solaris 10 * spider.c, warc.c: Use WG_NGETTEXT instead of ngettext diff --git a/src/iri.c b/src/iri.c index 0686f30..f46ee07 100644 --- a/src/iri.c +++ b/src/iri.c @@ -40,6 +40,7 @@ as that of the covered work. */ #include "utils.h" #include "url.h" #include "c-strcase.h" +#include "c-strcasestr.h" /* RFC3987 section 3.1 mandates STD3 ASCII RULES */ #define IDNA_FLAGS IDNA_USE_STD3_ASCII_RULES @@ -56,7 +57,7 @@ parse_charset (char *str) if (!str || !*str) return NULL; - str = strcasestr (str, "charset="); + str = c_strcasestr (str, "charset="); if (!str) return NULL; -- 2.1.3