From aa24a9d966dc16477f9e961024ecf7b17c82d5db Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 19 Aug 2005 11:00:51 +0000 Subject: [PATCH] Fix return value. --- lib/ChangeLog | 5 +++++ lib/strcasestr.c | 2 +- lib/strstr.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 60a56d604..3f6d105c9 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2005-08-18 Bruno Haible + + * strstr.c (strstr): Fix return value in multibyte case. + * strcasestr.c (strcasestr): Likewise. + 2005-08-17 Jim Meyering Make the %s format (seconds since the epoch) work for a negative diff --git a/lib/strcasestr.c b/lib/strcasestr.c index de4cf45fa..5a0fc426e 100644 --- a/lib/strcasestr.c +++ b/lib/strcasestr.c @@ -88,7 +88,7 @@ strcasestr (const char *haystack, const char *needle) { if (!mbui_avail (rneedle)) /* Found a match. */ - return (char *) haystack; + return (char *) mbui_cur_ptr (iter_haystack); if (!mbui_avail (rhaystack)) /* No match. */ return NULL; diff --git a/lib/strstr.c b/lib/strstr.c index 5bd7cb465..3faae0140 100644 --- a/lib/strstr.c +++ b/lib/strstr.c @@ -71,7 +71,7 @@ strstr (const char *haystack, const char *needle) { if (!mbui_avail (rneedle)) /* Found a match. */ - return (char *) haystack; + return (char *) mbui_cur_ptr (iter_haystack); if (!mbui_avail (rhaystack)) /* No match. */ return NULL; -- 2.11.0