NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / lib / mbscspn.c

diff --git a/lib/mbscspn.c b/lib/mbscspn.c
index e0818e1..46c93c2 100644 (file)
--- a/lib/mbscspn.c
+++ b/lib/mbscspn.c
@@ -1,5 +1,5 @@
 /* Searching a string for a character among a given set of characters.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,9 +20,7 @@
 /* Specification.  */
 #include <string.h>
 
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
 
 /* Find the first occurrence in the character string STRING of any character
    in the character string ACCEPT.  Return the number of bytes from the
@@ -40,33 +38,31 @@ mbscspn (const char *string, const char *accept)
       return (ptr != NULL ? ptr - string : strlen (string));
     }
   /* General case.  */
-#if HAVE_MBRTOWC
   if (MB_CUR_MAX > 1)
     {
       mbui_iterator_t iter;
 
       for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter))
-       {
-         if (mb_len (mbui_cur (iter)) == 1)
-           {
-             if (mbschr (accept, * mbui_cur_ptr (iter)))
-               goto found;
-           }
-         else
-           {
-             mbui_iterator_t aiter;
+        {
+          if (mb_len (mbui_cur (iter)) == 1)
+            {
+              if (mbschr (accept, * mbui_cur_ptr (iter)))
+                goto found;
+            }
+          else
+            {
+              mbui_iterator_t aiter;
 
-             for (mbui_init (aiter, accept);
-                  mbui_avail (aiter);
-                  mbui_advance (aiter))
-               if (mb_equal (mbui_cur (aiter), mbui_cur (iter)))
-                 goto found;
-           }
-       }
+              for (mbui_init (aiter, accept);
+                   mbui_avail (aiter);
+                   mbui_advance (aiter))
+                if (mb_equal (mbui_cur (aiter), mbui_cur (iter)))
+                  goto found;
+            }
+        }
      found:
       return mbui_cur_ptr (iter) - string;
     }
   else
-#endif
     return strcspn (string, accept);
 }