Fix problem with _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H on VMS.

[gnulib.git] / lib / mbsspn.c

diff --git a/lib/mbsspn.c b/lib/mbsspn.c
index f25c909..8f399b0 100644 (file)
--- a/lib/mbsspn.c
+++ b/lib/mbsspn.c
@@ -2,10 +2,10 @@
    Copyright (C) 1999, 2002, 2006-2007 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,8 +13,7 @@
    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>
 
@@ -47,8 +46,8 @@ 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
@@ -71,25 +70,24 @@ 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