X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbschr.c;h=ec1ebac053930b7b4b90b90413a4510f90e72a5b;hb=6c9f1e88ada406b65f6b10098b8c9e60c973e614;hp=084694d7a6d2a0b363cac8142bf921943fbedb76;hpb=22a636592e5562bef231b878757c5a6efdadabea;p=gnulib.git

diff --git a/lib/mbschr.c b/lib/mbschr.c
index 084694d7a..ec1ebac05 100644
--- a/lib/mbschr.c
+++ b/lib/mbschr.c
@@ -1,11 +1,11 @@
 /* Searching a string for a character.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,24 +13,20 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
 /* Specification.  */
 #include <string.h>
 
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
 
 /* Locate the first single-byte character C in the character string STRING,
    and return a pointer to it.  Return NULL if C is not found in STRING.  */
 char *
 mbschr (const char *string, int c)
 {
-#if HAVE_MBRTOWC
   if (MB_CUR_MAX > 1
       /* Optimization: We know that ASCII characters < 0x30 don't occur as
 	 part of multibyte characters longer than 1 byte.  Hence, if c < 0x30,
@@ -41,17 +37,16 @@ mbschr (const char *string, int c)
 
       for (mbui_init (iter, string);; mbui_advance (iter))
 	{
+	  if (!mbui_avail (iter))
+	    goto notfound;
 	  if (mb_len (mbui_cur (iter)) == 1
 	      && (unsigned char) * mbui_cur_ptr (iter) == (unsigned char) c)
 	    break;
-	  if (!mbui_avail (iter))
-	    goto notfound;
 	}
       return (char *) mbui_cur_ptr (iter);
      notfound:
       return NULL;
     }
   else
-#endif
     return strchr (string, c);
 }