Fix bug.

Add tests.

diff --git a/ChangeLog b/ChangeLog
index c521d8617c8079a398e77589bf08270dd8d66229..633a054441ec4894d40f1fa073efd7728d661950 100644 (file)
--- 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
index f3b280845177888e95c268e119ff3f9e1e26ad98..9cc9ca8f0f21bfcda6def54aee76e753a07835f8 100644 (file)
--- a/lib/mbsrchr.c
+++ b/lib/mbsrchr.c
@@ -40,13 +40,11 @@ mbsrchr (const char *string, int c)
       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;
     }