Fix return value.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 60a56d6..3f6d105 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-18  Bruno Haible  <bruno@clisp.org>
+
+       * strstr.c (strstr): Fix return value in multibyte case.
+       * strcasestr.c (strcasestr): Likewise.
+
 2005-08-17  Jim Meyering  <jim@meyering.net>
 
        Make the %s format (seconds since the epoch) work for a negative

diff --git a/lib/strcasestr.c b/lib/strcasestr.c
index de4cf45..5a0fc42 100644 (file)
--- 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 5bd7cb4..3faae01 100644 (file)
--- 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;