projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trunc: Move AC_LIBOBJ invocations to module description.
[gnulib.git]
/
lib
/
mbstok_r.c
diff --git
a/lib/mbstok_r.c
b/lib/mbstok_r.c
index
06fdc8d
..
89a92e5
100644
(file)
--- a/
lib/mbstok_r.c
+++ b/
lib/mbstok_r.c
@@
-1,5
+1,5
@@
/* Tokenizing a string.
/* Tokenizing a string.
- 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.
This program is free software: you can redistribute it and/or modify
Written by Bruno Haible <bruno@clisp.org>, 2007.
This program is free software: you can redistribute it and/or modify
@@
-20,51
+20,47
@@
/* Specification. */
#include <string.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);
}