summaryrefslogtreecommitdiff
path: root/string
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-05-29 17:50:37 +0000
committerRoland McGrath <roland@gnu.org>1996-05-29 17:50:37 +0000
commitc3352e623384fe221743a6d2212c17d9619041ef (patch)
tree9234354f588a1d7d29ce5536fd5db0e2385f2f07 /string
parent8d6108c3dbcaf1c1c7549cd3fc9674d2d32c1a2e (diff)
Wed May 29 12:53:10 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>cvs/libc-960530
* version.h (VERSION): Set to 1.90. * Makerules (distinfo-vars): Write extra-libs and *-routines for each of its elts. * MakeTAGS (sources): Add those sources. * MakeTAGS (all-sources): Add $(others:=.c) and $(tests:=.c). Wed May 29 08:53:08 1996 Miles Bader <miles@gnu.ai.mit.edu> * hurd/report-wait.c (_S_msg_report_wait): Return `itimer' for the itimer thread. * hurd/hurdinit.c (_hurd_init): Set _HURDSIG_TRACED before calling _hurd_proc_init. * string/tester.c (main): Fix strsep tests 6, 7, 20 to expect null token instead of it being implicitly skipped.
Diffstat (limited to 'string')
-rw-r--r--string/tester.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/string/tester.c b/string/tester.c
index 1b87c9f544..64ccce1e11 100644
--- a/string/tester.c
+++ b/string/tester.c
@@ -417,8 +417,8 @@ DEFUN(main, (argc, argv), int argc AND char **argv)
equal(strsep(&cp, ", "), "third", 4);
check(strsep(&cp, ", ") == NULL, 5);
cp = strcpy(one, ", first, ");
- equal(strsep(&cp, ", "), "first", 6); /* Extra delims, 1 tok. */
- check(strsep(&cp, ", ") == NULL, 7);
+ equal(strsep(&cp, ", "), "", 6); /* null token. */
+ equal(strsep(&cp, ", "), "", 7);
cp = strcpy(one, "1a, 1b; 2a, 2b");
equal(strsep(&cp, ", "), "1a", 8); /* Changing delim lists. */
equal(strsep(&cp, "; "), "1b", 9);
@@ -435,7 +435,7 @@ DEFUN(main, (argc, argv), int argc AND char **argv)
check(strsep(&cp, ", ") == NULL, 18);
check(strsep(&cp, ", ") == NULL, 19); /* Persistence. */
cp = strcpy(one, ", ");
- check(strsep(&cp, ", ") == NULL, 20); /* No tokens. */
+ check(strsep(&cp, ", ") == one, 20); /* Null token. */
cp = strcpy(one, "");
check(strsep(&cp, ", ") == NULL, 21); /* Empty string. */
cp = strcpy(one, "abc");