diff options
| author | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-26 16:48:39 +0100 |
|---|---|---|
| committer | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-26 16:48:39 +0100 |
| commit | 8dfc46115527afe3706e9e4225e9ad019c97d695 (patch) | |
| tree | 372d5192b218455834781a0037c57e919a06b488 /lib/unistr/u-strtok.h | |
| parent | 2291cf138eb72ad38d8c59b8b6f762875c8c4ff2 (diff) | |
| parent | 5f2b09982312c98863eb9a8dfe2c608b81f58259 (diff) | |
Merge tag 'upstream/0.9.6'
Upstream version 0.9.6
Diffstat (limited to 'lib/unistr/u-strtok.h')
| -rw-r--r-- | lib/unistr/u-strtok.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/unistr/u-strtok.h b/lib/unistr/u-strtok.h index 7fdef57..edafa1b 100644 --- a/lib/unistr/u-strtok.h +++ b/lib/unistr/u-strtok.h @@ -1,5 +1,5 @@ /* Tokenize UTF-8/UTF-16/UTF-32 string. - Copyright (C) 1999, 2002, 2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it @@ -40,9 +40,9 @@ FUNC (UNIT *str, const UNIT *delim, UNIT **ptr) UNIT *token_end = U_STRPBRK (str, delim); if (token_end) { + *ptr = token_end + U_STRMBLEN (token_end); /* NUL-terminate the token. */ *token_end = 0; - *ptr = token_end + 1; } else *ptr = NULL; |