1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
2008-01-15  Ulrich Drepper  <drepper@redhat.com>
	[BZ #5614]
	* string/bits/string2.h (__strtok_r_1c): Always update *__NEXTP.
	(__strtok_r): Simplify.
	* string/tester.c (test_strtok_r): Add test case for futile search
	with single-character seach string.
This commit is contained in:
Ulrich Drepper
2008-01-15 19:11:51 +00:00
parent 7c33ca8bb3
commit ebca8f730e
3 changed files with 19 additions and 8 deletions

View File

@ -1,5 +1,5 @@
/* Tester for string functions.
Copyright (C) 1995-2001, 2003, 2005 Free Software Foundation, Inc.
Copyright (C) 1995-2001, 2003, 2005, 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -840,9 +840,13 @@ test_strtok_r (void)
equal(strtok_r((char *)NULL, ",", &cp), "c", 29);
check(strtok_r((char *)NULL, ",", &cp) == NULL, 30);
equal(one+6, "gh", 31); /* Stomped past end? */
equal(one, "a", 32); /* Stomped old tokens? */
equal(one, "a", 32); /* Stomped old tokens? */
equal(one+2, "b", 33);
equal(one+4, "c", 34);
strcpy (one, ":::");
cp = NULL;
check (strtok_r (one, ":", &cp) == NULL, 35); /* Must store pointer in cp. */
check (strtok_r (NULL, ":", &cp) == NULL, 36);
}
static void