projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mgetgroups: remove dependency on realloc-gnu
[gnulib.git]
/
lib
/
mbstok_r.c
diff --git
a/lib/mbstok_r.c
b/lib/mbstok_r.c
index
fb6bdef
..
e1e0d19
100644
(file)
--- a/
lib/mbstok_r.c
+++ b/
lib/mbstok_r.c
@@
-1,11
+1,11
@@
/* Tokenizing a string.
/* Tokenizing a string.
- Copyright (C) 1999, 2002, 2006-20
07
Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2006-20
13
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,59
+13,54
@@
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"
char *
mbstok_r (char *string, const char *delim, char **save_ptr)
{
char *
mbstok_r (char *string, const char *delim, char **save_ptr)
{
-#if HAVE_MBRTOWC
if (MB_CUR_MAX > 1)
{
if (string == NULL)
if (MB_CUR_MAX > 1)
{
if (string == NULL)
- {
- string = *save_ptr;
- if (string == NULL)
- return NULL; /* reminder that end of token sequence has been
- reached */
- }
+
{
+
string = *save_ptr;
+
if (string == NULL)
+
return NULL; /* reminder that end of token sequence has been
+
reached */
+
}
/* Skip leading delimiters. */
string += mbsspn (string, delim);
/* Found a token? */
if (*string == '\0')
/* Skip leading delimiters. */
string += mbsspn (string, delim);
/* Found a token? */
if (*string == '\0')
- {
- *save_ptr = NULL;
- return NULL;
- }
+
{
+
*save_ptr = NULL;
+
return NULL;
+
}
/* Move past the token. */
{
/* Move past the token. */
{
- char *token_end = mbspbrk (string, delim);
+
char *token_end = mbspbrk (string, delim);
- if (token_end != NULL)
- {
- /* NUL-terminate the token. */
- *token_end = '\0';
- *save_ptr = token_end + 1;
- }
- else
- *save_ptr = NULL;
+
if (token_end != NULL)
+
{
+
/* NUL-terminate the token. */
+
*token_end = '\0';
+
*save_ptr = token_end + 1;
+
}
+
else
+
*save_ptr = NULL;
}
return string;
}
else
}
return string;
}
else
-#endif
return strtok_r (string, delim, save_ptr);
}
return strtok_r (string, delim, save_ptr);
}