projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
euidaccess: Update a comment.
[gnulib.git]
/
lib
/
mbscspn.c
diff --git
a/lib/mbscspn.c
b/lib/mbscspn.c
index
30153a1
..
68ac1c7
100644
(file)
--- a/
lib/mbscspn.c
+++ b/
lib/mbscspn.c
@@
-1,11
+1,11
@@
/* Searching a string for a character among a given set of characters.
/* Searching a string for a character among a given set of characters.
- Copyright (C) 1999, 2002, 2006-20
07
Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2006-20
11
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2007.
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
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
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
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>
#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
in the character string ACCEPT. Return the number of bytes from the
/* Find the first occurrence in the character string STRING of any character
in the character string ACCEPT. Return the number of bytes from the
@@
-41,32
+38,31
@@
mbscspn (const char *string, const char *accept)
return (ptr != NULL ? ptr - string : strlen (string));
}
/* General case. */
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_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, (unsigned char)
* mbui_cur_ptr (iter)))
-
return mbui_cur_ptr (iter) - string
;
- }
- 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)))
- return mbui_cur_ptr (iter) - string;
- }
- }
- return strlen (string);
+ 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
}
else
-#endif
return strcspn (string, accept);
}
return strcspn (string, accept);
}