From: Bruno Haible <bruno@clisp.org>
Date: Fri, 19 Aug 2005 11:00:51 +0000 (+0000)
Subject: Fix return value.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa24a9d966dc16477f9e961024ecf7b17c82d5db;p=pspp

Fix return value.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 60a56d6042..3f6d105c9e 100644
--- 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 de4cf45fa5..5a0fc426ec 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 5bd7cb4658..3faae01407 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;