From 59dd864187ee61b6f0bfd7abc85e2fea4b479cb7 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 26 May 1996 19:19:51 +0000 Subject: Sun May 26 15:15:08 1996 Roland McGrath * stdlib/ldiv.c: Deansideclized. Sun May 26 19:39:53 1996 Ulrich Drepper * intl/loadmsgcat.c (_nl_load_domain): Test correct variable after malloc. * string/Makefile (tester-ENV): New variable to suppress message translation in test. * string/tester.c: Add tests for strtok_r and strsep. * sysdeps/i386/i486/strcat.S: Correct some more 8bit operation <-> 32 bit operand conflicts. * sysdeps/i386/strsep.S: Wrapper around to produce strsep function. * sysdeps/i386/strtok.S: Optimized implementation of strtok function. * sysdeps/i386/strtok_r.S: Wrapper around to produce strtok_r function. * sysdeps/generic/strtok.c: Moved here from string/strtok.c. Corrected example in comment. * string/Makefile (routines): Add strtok_r. * sysdeps/generic/strtok_r.c: New file. Implement reentrant version of strtok_r. * string/string.h: Add prototype for strtok_r. * wcsmbs/wcstok.c: Handle illegal SAVE_PTR argument the same as in strtok_r. Sun May 26 13:28:23 1996 Roland McGrath * time/tzset.c (__tzset): Ignore leading : in $TZ; always try tzfile first and fall back to 1003.1 syntax only if it fails. * time/Makefile (install-others): Also install posix/ZONE and right/ZONE for each ZONE in $(zonenames). (z.% rule): Generate rules for right/ZONE and posix/ZONE targets too, the difference begin leapseconds vs /dev/null as 3rd dep. For original ZONE targets use $(leapseconds), to be set in Makeconfig. (target-zone-flavor): New variable. (tzcompile): Use it to get the right -d for posix/ and right/ flavors. * Makeconfig (leapseconds): New variable. * mach/Machrules (%.udeps rule): Depend on Machrules. Emit deps for .uh and .__h files. (%.uh, %.__h rules): Don't depend on %.defs; use #include <$*.defs> instead. Sun May 26 01:06:47 1996 Ulrich Drepper * stdlib/Makefile (routines): Add llabs, lldiv. * stdlib/llabs.c: New file. Implementation of return absolute value of long long argument. * stdlib/lldiv.c: New file. Implementation of division with remainder of long long argument. * stdlib/stdlib.h [__USE_GNU] (lldiv_t): New type for lldiv function. Define prototypes for lldiv and llabs functions. * locale/C-collate.c: Initialize _NL_COLLATE_NRULES element. * stdlib/strtod.c: Replace wchar_t with wint_t. The later is really the type for a single wide character. * string/strxfrm.c (print_val): Define separate version for use as wcsxfrm. Here we don't need UTF8 encoding. * wcsmbs/wchar.h: gcc-2.7.2-960517 finally introduces wint_t in . Use this value and only for older gcc version define in place. (uwchar_t): Remove definition. * wcsmbs/wcscmp.c, wcsmbs/wcscoll.c, wcsmbs/wcsncmp.c, wcsmbs/wcsxfrm.c, wcsmbs/wmemcmp.c: : Don't use uwchar_t as unsigned type. wint_t is intended for this. Sat May 25 14:10:19 1996 Roland McGrath * sysdeps/unix/bsd/direntry.h: Use [1] instead of [0] for d_name to quiet -ansi -pedantic. * sysdeps/unix/common/direntry.h: Likewise. * login/Makefile (headers): Add lastlog.h. * login/lastlog.h: New file. * login/Makefile (CFLAGS): Don't append -D_THREAD_SAFE. * login/utmp.h [_REENTRANT || _THREAD_SAFE]: Replace this conditional with #ifdef __USE_REENTRANT. * features.h (__GNU_LIBRARY__): Set to 6. [_GNU_SOURCE] (_POSIX_SOURCE, _POSIX_C_SOURCE, _BSD_SOURCE, _SVID_SOURCE): Make sure they are all defined. * sysdeps/unix/sysv/linux/gnu/types.h: Instead of including , define _LINUX_TYPES_DONT_EXPORT and then include . * resource/sys/resource.h: Remove trailing commas from enums. * sysdeps/generic/netinet/in.h: Remove trailing commas from enums. * sysdeps/unix/sysv/linux/netinet/in.h: Likewise. --- string/tester.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) (limited to 'string/tester.c') diff --git a/string/tester.c b/string/tester.c index d826ff7beb..1b87c9f544 100644 --- a/string/tester.c +++ b/string/tester.c @@ -40,6 +40,8 @@ char two[50]; int DEFUN(main, (argc, argv), int argc AND char **argv) { + char *cp; + /* Test strcmp first because we use it to test other things. */ it = "strcmp"; check(strcmp("", "") == 0, 1); /* Trivial case. */ @@ -359,6 +361,100 @@ DEFUN(main, (argc, argv), int argc AND char **argv) equal(one+2, "b", 32); equal(one+4, "c", 33); + /* strtok_r. */ + it = "strtok_r"; + (void) strcpy(one, "first, second, third"); + equal(strtok_r(one, ", ", &cp), "first", 1); /* Basic test. */ + equal(one, "first", 2); + equal(strtok_r((char *)NULL, ", ", &cp), "second", 3); + equal(strtok_r((char *)NULL, ", ", &cp), "third", 4); + check(strtok_r((char *)NULL, ", ", &cp) == NULL, 5); + (void) strcpy(one, ", first, "); + equal(strtok_r(one, ", ", &cp), "first", 6); /* Extra delims, 1 tok. */ + check(strtok_r((char *)NULL, ", ", &cp) == NULL, 7); + (void) strcpy(one, "1a, 1b; 2a, 2b"); + equal(strtok_r(one, ", ", &cp), "1a", 8); /* Changing delim lists. */ + equal(strtok_r((char *)NULL, "; ", &cp), "1b", 9); + equal(strtok_r((char *)NULL, ", ", &cp), "2a", 10); + (void) strcpy(two, "x-y"); + equal(strtok_r(two, "-", &cp), "x", 11); /* New string before done. */ + equal(strtok_r((char *)NULL, "-", &cp), "y", 12); + check(strtok_r((char *)NULL, "-", &cp) == NULL, 13); + (void) strcpy(one, "a,b, c,, ,d"); + equal(strtok_r(one, ", ", &cp), "a", 14); /* Different separators. */ + equal(strtok_r((char *)NULL, ", ", &cp), "b", 15); + equal(strtok_r((char *)NULL, " ,", &cp), "c", 16); /* Permute list too. */ + equal(strtok_r((char *)NULL, " ,", &cp), "d", 17); + check(strtok_r((char *)NULL, ", ", &cp) == NULL, 18); + check(strtok_r((char *)NULL, ", ", &cp) == NULL, 19); /* Persistence. */ + (void) strcpy(one, ", "); + check(strtok_r(one, ", ", &cp) == NULL, 20); /* No tokens. */ + (void) strcpy(one, ""); + check(strtok_r(one, ", ", &cp) == NULL, 21); /* Empty string. */ + (void) strcpy(one, "abc"); + equal(strtok_r(one, ", ", &cp), "abc", 22); /* No delimiters. */ + check(strtok_r((char *)NULL, ", ", &cp) == NULL, 23); + (void) strcpy(one, "abc"); + equal(strtok_r(one, "", &cp), "abc", 24); /* Empty delimiter list. */ + check(strtok_r((char *)NULL, "", &cp) == NULL, 25); + (void) strcpy(one, "abcdefgh"); + (void) strcpy(one, "a,b,c"); + equal(strtok_r(one, ",", &cp), "a", 26); /* Basics again... */ + equal(strtok_r((char *)NULL, ",", &cp), "b", 27); + equal(strtok_r((char *)NULL, ",", &cp), "c", 28); + check(strtok_r((char *)NULL, ",", &cp) == NULL, 29); + equal(one+6, "gh", 30); /* Stomped past end? */ + equal(one, "a", 31); /* Stomped old tokens? */ + equal(one+2, "b", 32); + equal(one+4, "c", 33); + + /* strsep. */ + it = "strsep"; + cp = strcpy(one, "first, second, third"); + equal(strsep(&cp, ", "), "first", 1); /* Basic test. */ + equal(one, "first", 2); + equal(strsep(&cp, ", "), "second", 3); + 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); + cp = strcpy(one, "1a, 1b; 2a, 2b"); + equal(strsep(&cp, ", "), "1a", 8); /* Changing delim lists. */ + equal(strsep(&cp, "; "), "1b", 9); + equal(strsep(&cp, ", "), "2a", 10); + cp = strcpy(two, "x-y"); + equal(strsep(&cp, "-"), "x", 11); /* New string before done. */ + equal(strsep(&cp, "-"), "y", 12); + check(strsep(&cp, "-") == NULL, 13); + cp = strcpy(one, "a,b, c,, ,d"); + equal(strsep(&cp, ", "), "a", 14); /* Different separators. */ + equal(strsep(&cp, ", "), "b", 15); + equal(strsep(&cp, " ,"), "c", 16); /* Permute list too. */ + equal(strsep(&cp, " ,"), "d", 17); + check(strsep(&cp, ", ") == NULL, 18); + check(strsep(&cp, ", ") == NULL, 19); /* Persistence. */ + cp = strcpy(one, ", "); + check(strsep(&cp, ", ") == NULL, 20); /* No tokens. */ + cp = strcpy(one, ""); + check(strsep(&cp, ", ") == NULL, 21); /* Empty string. */ + cp = strcpy(one, "abc"); + equal(strsep(&cp, ", "), "abc", 22); /* No delimiters. */ + check(strsep(&cp, ", ") == NULL, 23); + cp = strcpy(one, "abc"); + equal(strsep(&cp, ""), "abc", 24); /* Empty delimiter list. */ + check(strsep(&cp, "") == NULL, 25); + (void) strcpy(one, "abcdefgh"); + cp = strcpy(one, "a,b,c"); + equal(strsep(&cp, ","), "a", 26); /* Basics again... */ + equal(strsep(&cp, ","), "b", 27); + equal(strsep(&cp, ","), "c", 28); + check(strsep(&cp, ",") == NULL, 29); + equal(one+6, "gh", 30); /* Stomped past end? */ + equal(one, "a", 31); /* Stomped old tokens? */ + equal(one+2, "b", 32); + equal(one+4, "c", 33); + /* memcmp. */ it = "memcmp"; check(memcmp("a", "a", 1) == 0, 1); /* Identity. */ -- cgit 1.4.1