New module 'unicase/u32-is-titlecase'.

[pspp] / lib / mbsspn.c

diff --git a/lib/mbsspn.c b/lib/mbsspn.c
index f25c9096c1412314230a89fb03ad46fe2109b9fa..3ef41ca1b3ede2cd8b8c11cb1caaaca6175b32b9 100644 (file)
--- a/lib/mbsspn.c
+++ b/lib/mbsspn.c
@@ -1,11 +1,11 @@
 /* Searching a string for a character outside a given set of characters.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-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,17 +13,14 @@
    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"
 
 /* Find the first occurrence in the character string STRING of any character
    not in the character string REJECT.  Return the number of bytes from the
@@ -39,7 +36,6 @@ mbsspn (const char *string, const char *reject)
     {
       unsigned char uc = (unsigned char) reject[0];
 
-#if HAVE_MBRTOWC
       if (MB_CUR_MAX > 1)
        {
          mbui_iterator_t iter;
@@ -47,11 +43,10 @@ mbsspn (const char *string, const char *reject)
          for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter))
            if (!(mb_len (mbui_cur (iter)) == 1
                  && (unsigned char) * mbui_cur_ptr (iter) == uc))
-             return mbui_cur_ptr (iter) - string;
-         return strlen (string);
+             break;
+         return mbui_cur_ptr (iter) - string;
        }
       else
-#endif
        {
          const char *ptr;
 
@@ -62,7 +57,6 @@ mbsspn (const char *string, const char *reject)
        }
     }
   /* General case.  */
-#if HAVE_MBRTOWC
   if (MB_CUR_MAX > 1)
     {
       mbui_iterator_t iter;
@@ -71,27 +65,25 @@ mbsspn (const char *string, const char *reject)
        {
          if (mb_len (mbui_cur (iter)) == 1)
            {
-             if (mbschr (reject, (unsigned char) * mbui_cur_ptr (iter)) == NULL)
-               return mbui_cur_ptr (iter) - string;
+             if (mbschr (reject, * mbui_cur_ptr (iter)) == NULL)
+               goto found;
            }
          else
            {
              mbui_iterator_t aiter;
 
-             for (mbui_init (aiter, reject);
-                  mbui_avail (aiter);
-                  mbui_advance (aiter))
+             for (mbui_init (aiter, reject);; mbui_advance (aiter))
                {
                  if (!mbui_avail (aiter))
-                   return mbui_cur_ptr (iter) - string;
+                   goto found;
                  if (mb_equal (mbui_cur (aiter), mbui_cur (iter)))
                    break;
                }
            }
        }
-      return strlen (string);
+     found:
+      return mbui_cur_ptr (iter) - string;
     }
   else
-#endif
     return strspn (string, reject);
 }