# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1171215910 0
# Node ID 2c4153302289699c2faf20be494af6498de687d0
# Parent  7929fe70db080b6b49a401d6ed95e27b20b95047
Fix bug.
Add tests.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-11  Bruno Haible  <bruno@clisp.org>
+
+	* lib/mbsrchr.c (mbsrchr): Fix bug.
+
+	* modules/mbsrchr-tests: New file.
+	* tests/test-mbsrchr.sh: New file.
+	* tests/test-mbsrchr.c: New file.
+
 2007-02-11  Bruno Haible  <bruno@clisp.org>
 
 	* lib/mbschr.c (mbschr): Fix bug.
diff --git a/lib/mbsrchr.c b/lib/mbsrchr.c
--- a/lib/mbsrchr.c
+++ b/lib/mbsrchr.c
@@ -40,13 +40,11 @@
       const char *result = NULL;
       mbui_iterator_t iter;
 
-      for (mbui_init (iter, string);; mbui_advance (iter))
+      for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter))
 	{
 	  if (mb_len (mbui_cur (iter)) == 1
 	      && (unsigned char) * mbui_cur_ptr (iter) == (unsigned char) c)
 	    result = mbui_cur_ptr (iter);
-	  if (!mbui_avail (iter))
-	    break;
 	}
       return (char *) result;
     }