1995-02-18 01:27:10 +00:00
|
|
|
#include <ansidecl.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <strings.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
|
|
|
#ifndef HAVE_GNU_LD
|
|
|
|
#define _sys_nerr sys_nerr
|
|
|
|
#define _sys_errlist sys_errlist
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define STREQ(a, b) (strcmp((a), (b)) == 0)
|
|
|
|
|
|
|
|
CONST char *it = "<UNSET>"; /* Routine name for message routines. */
|
|
|
|
size_t errors = 0;
|
|
|
|
|
|
|
|
/* Complain if condition is not true. */
|
|
|
|
void
|
|
|
|
DEFUN(check, (thing, number), int thing AND int number)
|
|
|
|
{
|
|
|
|
if (!thing)
|
|
|
|
{
|
|
|
|
printf("%s flunked test %d\n", it, number);
|
|
|
|
++errors;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Complain if first two args don't strcmp as equal. */
|
|
|
|
void
|
|
|
|
DEFUN(equal, (a, b, number), CONST char *a AND CONST char *b AND int number)
|
|
|
|
{
|
|
|
|
check(a != NULL && b != NULL && STREQ(a, b), number);
|
|
|
|
}
|
|
|
|
|
|
|
|
char one[50];
|
|
|
|
char two[50];
|
|
|
|
|
|
|
|
int
|
|
|
|
DEFUN(main, (argc, argv), int argc AND char **argv)
|
|
|
|
{
|
Sun May 26 15:15:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* stdlib/ldiv.c: Deansideclized.
Sun May 26 19:39:53 1996 Ulrich Drepper <drepper@cygnus.com>
* 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 <sysdeps/i386/strtok.S>
to produce strsep function.
* sysdeps/i386/strtok.S: Optimized implementation of strtok
function.
* sysdeps/i386/strtok_r.S: Wrapper around <sysdeps/i386/strtok.S>
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 <roland@delasyd.gnu.ai.mit.edu>
* 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 <drepper@cygnus.com>
* 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 <stddef.h>. 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 <roland@delasyd.gnu.ai.mit.edu>
* 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
<linux/posix_types.h>, define _LINUX_TYPES_DONT_EXPORT and then
include <linux/types.h>.
* 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.
1996-05-26 19:19:51 +00:00
|
|
|
char *cp;
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
/* Test strcmp first because we use it to test other things. */
|
|
|
|
it = "strcmp";
|
|
|
|
check(strcmp("", "") == 0, 1); /* Trivial case. */
|
|
|
|
check(strcmp("a", "a") == 0, 2); /* Identity. */
|
|
|
|
check(strcmp("abc", "abc") == 0, 3); /* Multicharacter. */
|
|
|
|
check(strcmp("abc", "abcd") < 0, 4); /* Length mismatches. */
|
|
|
|
check(strcmp("abcd", "abc") > 0, 5);
|
|
|
|
check(strcmp("abcd", "abce") < 0, 6); /* Honest miscompares. */
|
|
|
|
check(strcmp("abce", "abcd") > 0, 7);
|
|
|
|
check(strcmp("a\203", "a") > 0, 8); /* Tricky if char signed. */
|
|
|
|
check(strcmp("a\203", "a\003") > 0, 9);
|
|
|
|
|
|
|
|
/* Test strcpy next because we need it to set up other tests. */
|
|
|
|
it = "strcpy";
|
|
|
|
check(strcpy(one, "abcd") == one, 1); /* Returned value. */
|
|
|
|
equal(one, "abcd", 2); /* Basic test. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "x");
|
|
|
|
equal(one, "x", 3); /* Writeover. */
|
|
|
|
equal(one+2, "cd", 4); /* Wrote too much? */
|
|
|
|
|
|
|
|
(void) strcpy(two, "hi there");
|
|
|
|
(void) strcpy(one, two);
|
|
|
|
equal(one, "hi there", 5); /* Basic test encore. */
|
|
|
|
equal(two, "hi there", 6); /* Stomped on source? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "");
|
|
|
|
equal(one, "", 7); /* Boundary condition. */
|
|
|
|
|
|
|
|
/* strcat. */
|
|
|
|
it = "strcat";
|
|
|
|
(void) strcpy(one, "ijk");
|
|
|
|
check(strcat(one, "lmn") == one, 1); /* Returned value. */
|
|
|
|
equal(one, "ijklmn", 2); /* Basic test. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "x");
|
|
|
|
(void) strcat(one, "yz");
|
|
|
|
equal(one, "xyz", 3); /* Writeover. */
|
|
|
|
equal(one+4, "mn", 4); /* Wrote too much? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "gh");
|
|
|
|
(void) strcpy(two, "ef");
|
|
|
|
(void) strcat(one, two);
|
|
|
|
equal(one, "ghef", 5); /* Basic test encore. */
|
|
|
|
equal(two, "ef", 6); /* Stomped on source? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "");
|
|
|
|
(void) strcat(one, "");
|
|
|
|
equal(one, "", 7); /* Boundary conditions. */
|
|
|
|
(void) strcpy(one, "ab");
|
|
|
|
(void) strcat(one, "");
|
|
|
|
equal(one, "ab", 8);
|
|
|
|
(void) strcpy(one, "");
|
|
|
|
(void) strcat(one, "cd");
|
|
|
|
equal(one, "cd", 9);
|
|
|
|
|
|
|
|
/* strncat - first test it as strcat, with big counts,
|
|
|
|
then test the count mechanism. */
|
|
|
|
it = "strncat";
|
|
|
|
(void) strcpy(one, "ijk");
|
|
|
|
check(strncat(one, "lmn", 99) == one, 1); /* Returned value. */
|
|
|
|
equal(one, "ijklmn", 2); /* Basic test. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "x");
|
|
|
|
(void) strncat(one, "yz", 99);
|
|
|
|
equal(one, "xyz", 3); /* Writeover. */
|
|
|
|
equal(one+4, "mn", 4); /* Wrote too much? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "gh");
|
|
|
|
(void) strcpy(two, "ef");
|
|
|
|
(void) strncat(one, two, 99);
|
|
|
|
equal(one, "ghef", 5); /* Basic test encore. */
|
|
|
|
equal(two, "ef", 6); /* Stomped on source? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "");
|
|
|
|
(void) strncat(one, "", 99);
|
|
|
|
equal(one, "", 7); /* Boundary conditions. */
|
|
|
|
(void) strcpy(one, "ab");
|
|
|
|
(void) strncat(one, "", 99);
|
|
|
|
equal(one, "ab", 8);
|
|
|
|
(void) strcpy(one, "");
|
|
|
|
(void) strncat(one, "cd", 99);
|
|
|
|
equal(one, "cd", 9);
|
|
|
|
|
|
|
|
(void) strcpy(one, "ab");
|
|
|
|
(void) strncat(one, "cdef", 2);
|
|
|
|
equal(one, "abcd", 10); /* Count-limited. */
|
|
|
|
|
|
|
|
(void) strncat(one, "gh", 0);
|
|
|
|
equal(one, "abcd", 11); /* Zero count. */
|
|
|
|
|
|
|
|
(void) strncat(one, "gh", 2);
|
|
|
|
equal(one, "abcdgh", 12); /* Count and length equal. */
|
|
|
|
|
|
|
|
/* strncmp - first test as strcmp with big counts,
|
|
|
|
then test count code. */
|
|
|
|
it = "strncmp";
|
|
|
|
check(strncmp("", "", 99) == 0, 1); /* Trivial case. */
|
|
|
|
check(strncmp("a", "a", 99) == 0, 2); /* Identity. */
|
|
|
|
check(strncmp("abc", "abc", 99) == 0, 3); /* Multicharacter. */
|
|
|
|
check(strncmp("abc", "abcd", 99) < 0, 4); /* Length unequal. */
|
|
|
|
check(strncmp("abcd", "abc", 99) > 0, 5);
|
|
|
|
check(strncmp("abcd", "abce", 99) < 0, 6); /* Honestly unequal. */
|
|
|
|
check(strncmp("abce", "abcd", 99) > 0, 7);
|
|
|
|
check(strncmp("a\203", "a", 2) > 0, 8); /* Tricky if '\203' < 0 */
|
|
|
|
check(strncmp("a\203", "a\003", 2) > 0, 9);
|
|
|
|
check(strncmp("abce", "abcd", 3) == 0, 10); /* Count limited. */
|
|
|
|
check(strncmp("abce", "abc", 3) == 0, 11); /* Count == length. */
|
|
|
|
check(strncmp("abcd", "abce", 4) < 0, 12); /* Nudging limit. */
|
|
|
|
check(strncmp("abc", "def", 0) == 0, 13); /* Zero count. */
|
|
|
|
|
|
|
|
/* strncpy - testing is a bit different because of odd semantics. */
|
|
|
|
it = "strncpy";
|
|
|
|
check(strncpy(one, "abc", 4) == one, 1); /* Returned value. */
|
|
|
|
equal(one, "abc", 2); /* Did the copy go right? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) strncpy(one, "xyz", 2);
|
|
|
|
equal(one, "xycdefgh", 3); /* Copy cut by count. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) strncpy(one, "xyz", 3); /* Copy cut just before NUL. */
|
|
|
|
equal(one, "xyzdefgh", 4);
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) strncpy(one, "xyz", 4); /* Copy just includes NUL. */
|
|
|
|
equal(one, "xyz", 5);
|
|
|
|
equal(one+4, "efgh", 6); /* Wrote too much? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) strncpy(one, "xyz", 5); /* Copy includes padding. */
|
|
|
|
equal(one, "xyz", 7);
|
|
|
|
equal(one+4, "", 8);
|
|
|
|
equal(one+5, "fgh", 9);
|
|
|
|
|
|
|
|
(void) strcpy(one, "abc");
|
|
|
|
(void) strncpy(one, "xyz", 0); /* Zero-length copy. */
|
1995-10-30 16:40:52 +00:00
|
|
|
equal(one, "abc", 10);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
(void) strncpy(one, "", 2); /* Zero-length source. */
|
|
|
|
equal(one, "", 11);
|
1995-10-30 16:40:52 +00:00
|
|
|
equal(one+1, "", 12);
|
1995-02-18 01:27:10 +00:00
|
|
|
equal(one+2, "c", 13);
|
|
|
|
|
|
|
|
(void) strcpy(one, "hi there");
|
|
|
|
(void) strncpy(two, one, 9);
|
|
|
|
equal(two, "hi there", 14); /* Just paranoia. */
|
|
|
|
equal(one, "hi there", 15); /* Stomped on source? */
|
|
|
|
|
|
|
|
/* strlen. */
|
|
|
|
it = "strlen";
|
|
|
|
check(strlen("") == 0, 1); /* Empty. */
|
|
|
|
check(strlen("a") == 1, 2); /* Single char. */
|
|
|
|
check(strlen("abcd") == 4, 3); /* Multiple chars. */
|
|
|
|
|
|
|
|
/* strchr. */
|
|
|
|
it = "strchr";
|
|
|
|
check(strchr("abcd", 'z') == NULL, 1); /* Not found. */
|
|
|
|
(void) strcpy(one, "abcd");
|
|
|
|
check(strchr(one, 'c') == one+2, 2); /* Basic test. */
|
|
|
|
check(strchr(one, 'd') == one+3, 3); /* End of string. */
|
|
|
|
check(strchr(one, 'a') == one, 4); /* Beginning. */
|
|
|
|
check(strchr(one, '\0') == one+4, 5); /* Finding NUL. */
|
|
|
|
(void) strcpy(one, "ababa");
|
|
|
|
check(strchr(one, 'b') == one+1, 6); /* Finding first. */
|
|
|
|
(void) strcpy(one, "");
|
|
|
|
check(strchr(one, 'b') == NULL, 7); /* Empty string. */
|
|
|
|
check(strchr(one, '\0') == one, 8); /* NUL in empty string. */
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* index - just like strchr. */
|
|
|
|
it = "index";
|
|
|
|
check(index("abcd", 'z') == NULL, 1); /* Not found. */
|
|
|
|
(void) strcpy(one, "abcd");
|
|
|
|
check(index(one, 'c') == one+2, 2); /* Basic test. */
|
|
|
|
check(index(one, 'd') == one+3, 3); /* End of string. */
|
|
|
|
check(index(one, 'a') == one, 4); /* Beginning. */
|
|
|
|
check(index(one, '\0') == one+4, 5); /* Finding NUL. */
|
|
|
|
(void) strcpy(one, "ababa");
|
|
|
|
check(index(one, 'b') == one+1, 6); /* Finding first. */
|
|
|
|
(void) strcpy(one, "");
|
|
|
|
check(index(one, 'b') == NULL, 7); /* Empty string. */
|
|
|
|
check(index(one, '\0') == one, 8); /* NUL in empty string. */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* strrchr. */
|
|
|
|
it = "strrchr";
|
|
|
|
check(strrchr("abcd", 'z') == NULL, 1); /* Not found. */
|
|
|
|
(void) strcpy(one, "abcd");
|
|
|
|
check(strrchr(one, 'c') == one+2, 2); /* Basic test. */
|
|
|
|
check(strrchr(one, 'd') == one+3, 3); /* End of string. */
|
|
|
|
check(strrchr(one, 'a') == one, 4); /* Beginning. */
|
|
|
|
check(strrchr(one, '\0') == one+4, 5); /* Finding NUL. */
|
|
|
|
(void) strcpy(one, "ababa");
|
|
|
|
check(strrchr(one, 'b') == one+3, 6); /* Finding last. */
|
|
|
|
(void) strcpy(one, "");
|
|
|
|
check(strrchr(one, 'b') == NULL, 7); /* Empty string. */
|
|
|
|
check(strrchr(one, '\0') == one, 8); /* NUL in empty string. */
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* rindex - just like strrchr. */
|
|
|
|
it = "rindex";
|
|
|
|
check(rindex("abcd", 'z') == NULL, 1); /* Not found. */
|
|
|
|
(void) strcpy(one, "abcd");
|
|
|
|
check(rindex(one, 'c') == one+2, 2); /* Basic test. */
|
|
|
|
check(rindex(one, 'd') == one+3, 3); /* End of string. */
|
|
|
|
check(rindex(one, 'a') == one, 4); /* Beginning. */
|
|
|
|
check(rindex(one, '\0') == one+4, 5); /* Finding NUL. */
|
|
|
|
(void) strcpy(one, "ababa");
|
|
|
|
check(rindex(one, 'b') == one+3, 6); /* Finding last. */
|
|
|
|
(void) strcpy(one, "");
|
|
|
|
check(rindex(one, 'b') == NULL, 7); /* Empty string. */
|
|
|
|
check(rindex(one, '\0') == one, 8); /* NUL in empty string. */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* strpbrk - somewhat like strchr. */
|
|
|
|
it = "strpbrk";
|
|
|
|
check(strpbrk("abcd", "z") == NULL, 1); /* Not found. */
|
|
|
|
(void) strcpy(one, "abcd");
|
|
|
|
check(strpbrk(one, "c") == one+2, 2); /* Basic test. */
|
|
|
|
check(strpbrk(one, "d") == one+3, 3); /* End of string. */
|
|
|
|
check(strpbrk(one, "a") == one, 4); /* Beginning. */
|
|
|
|
check(strpbrk(one, "") == NULL, 5); /* Empty search list. */
|
|
|
|
check(strpbrk(one, "cb") == one+1, 6); /* Multiple search. */
|
|
|
|
(void) strcpy(one, "abcabdea");
|
|
|
|
check(strpbrk(one, "b") == one+1, 7); /* Finding first. */
|
|
|
|
check(strpbrk(one, "cb") == one+1, 8); /* With multiple search. */
|
|
|
|
check(strpbrk(one, "db") == one+1, 9); /* Another variant. */
|
|
|
|
(void) strcpy(one, "");
|
|
|
|
check(strpbrk(one, "bc") == NULL, 10); /* Empty string. */
|
|
|
|
check(strpbrk(one, "") == NULL, 11); /* Both strings empty. */
|
|
|
|
|
|
|
|
/* strstr - somewhat like strchr. */
|
|
|
|
it = "strstr";
|
|
|
|
check(strstr("abcd", "z") == NULL, 1); /* Not found. */
|
|
|
|
check(strstr("abcd", "abx") == NULL, 2); /* Dead end. */
|
|
|
|
(void) strcpy(one, "abcd");
|
|
|
|
check(strstr(one, "c") == one+2, 3); /* Basic test. */
|
|
|
|
check(strstr(one, "bc") == one+1, 4); /* Multichar. */
|
|
|
|
check(strstr(one, "d") == one+3, 5); /* End of string. */
|
|
|
|
check(strstr(one, "cd") == one+2, 6); /* Tail of string. */
|
|
|
|
check(strstr(one, "abc") == one, 7); /* Beginning. */
|
|
|
|
check(strstr(one, "abcd") == one, 8); /* Exact match. */
|
|
|
|
check(strstr(one, "abcde") == NULL, 9); /* Too long. */
|
|
|
|
check(strstr(one, "de") == NULL, 10); /* Past end. */
|
|
|
|
check(strstr(one, "") == one, 11); /* Finding empty. */
|
|
|
|
(void) strcpy(one, "ababa");
|
|
|
|
check(strstr(one, "ba") == one+1, 12); /* Finding first. */
|
|
|
|
(void) strcpy(one, "");
|
|
|
|
check(strstr(one, "b") == NULL, 13); /* Empty string. */
|
|
|
|
check(strstr(one, "") == one, 14); /* Empty in empty string. */
|
|
|
|
(void) strcpy(one, "bcbca");
|
|
|
|
check(strstr(one, "bca") == one+2, 15); /* False start. */
|
|
|
|
(void) strcpy(one, "bbbcabbca");
|
|
|
|
check(strstr(one, "bbca") == one+1, 16); /* With overlap. */
|
|
|
|
|
|
|
|
/* strspn. */
|
|
|
|
it = "strspn";
|
|
|
|
check(strspn("abcba", "abc") == 5, 1); /* Whole string. */
|
|
|
|
check(strspn("abcba", "ab") == 2, 2); /* Partial. */
|
|
|
|
check(strspn("abc", "qx") == 0, 3); /* None. */
|
|
|
|
check(strspn("", "ab") == 0, 4); /* Null string. */
|
|
|
|
check(strspn("abc", "") == 0, 5); /* Null search list. */
|
|
|
|
|
|
|
|
/* strcspn. */
|
|
|
|
it = "strcspn";
|
|
|
|
check(strcspn("abcba", "qx") == 5, 1); /* Whole string. */
|
|
|
|
check(strcspn("abcba", "cx") == 2, 2); /* Partial. */
|
|
|
|
check(strcspn("abc", "abc") == 0, 3); /* None. */
|
|
|
|
check(strcspn("", "ab") == 0, 4); /* Null string. */
|
|
|
|
check(strcspn("abc", "") == 3, 5); /* Null search list. */
|
|
|
|
|
|
|
|
/* strtok - the hard one. */
|
|
|
|
it = "strtok";
|
|
|
|
(void) strcpy(one, "first, second, third");
|
|
|
|
equal(strtok(one, ", "), "first", 1); /* Basic test. */
|
|
|
|
equal(one, "first", 2);
|
|
|
|
equal(strtok((char *)NULL, ", "), "second", 3);
|
|
|
|
equal(strtok((char *)NULL, ", "), "third", 4);
|
|
|
|
check(strtok((char *)NULL, ", ") == NULL, 5);
|
|
|
|
(void) strcpy(one, ", first, ");
|
|
|
|
equal(strtok(one, ", "), "first", 6); /* Extra delims, 1 tok. */
|
|
|
|
check(strtok((char *)NULL, ", ") == NULL, 7);
|
|
|
|
(void) strcpy(one, "1a, 1b; 2a, 2b");
|
|
|
|
equal(strtok(one, ", "), "1a", 8); /* Changing delim lists. */
|
|
|
|
equal(strtok((char *)NULL, "; "), "1b", 9);
|
|
|
|
equal(strtok((char *)NULL, ", "), "2a", 10);
|
|
|
|
(void) strcpy(two, "x-y");
|
|
|
|
equal(strtok(two, "-"), "x", 11); /* New string before done. */
|
|
|
|
equal(strtok((char *)NULL, "-"), "y", 12);
|
|
|
|
check(strtok((char *)NULL, "-") == NULL, 13);
|
|
|
|
(void) strcpy(one, "a,b, c,, ,d");
|
|
|
|
equal(strtok(one, ", "), "a", 14); /* Different separators. */
|
|
|
|
equal(strtok((char *)NULL, ", "), "b", 15);
|
|
|
|
equal(strtok((char *)NULL, " ,"), "c", 16); /* Permute list too. */
|
|
|
|
equal(strtok((char *)NULL, " ,"), "d", 17);
|
|
|
|
check(strtok((char *)NULL, ", ") == NULL, 18);
|
|
|
|
check(strtok((char *)NULL, ", ") == NULL, 19); /* Persistence. */
|
|
|
|
(void) strcpy(one, ", ");
|
|
|
|
check(strtok(one, ", ") == NULL, 20); /* No tokens. */
|
|
|
|
(void) strcpy(one, "");
|
|
|
|
check(strtok(one, ", ") == NULL, 21); /* Empty string. */
|
|
|
|
(void) strcpy(one, "abc");
|
|
|
|
equal(strtok(one, ", "), "abc", 22); /* No delimiters. */
|
|
|
|
check(strtok((char *)NULL, ", ") == NULL, 23);
|
|
|
|
(void) strcpy(one, "abc");
|
|
|
|
equal(strtok(one, ""), "abc", 24); /* Empty delimiter list. */
|
|
|
|
check(strtok((char *)NULL, "") == NULL, 25);
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) strcpy(one, "a,b,c");
|
|
|
|
equal(strtok(one, ","), "a", 26); /* Basics again... */
|
|
|
|
equal(strtok((char *)NULL, ","), "b", 27);
|
|
|
|
equal(strtok((char *)NULL, ","), "c", 28);
|
|
|
|
check(strtok((char *)NULL, ",") == 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);
|
|
|
|
|
Sun May 26 15:15:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* stdlib/ldiv.c: Deansideclized.
Sun May 26 19:39:53 1996 Ulrich Drepper <drepper@cygnus.com>
* 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 <sysdeps/i386/strtok.S>
to produce strsep function.
* sysdeps/i386/strtok.S: Optimized implementation of strtok
function.
* sysdeps/i386/strtok_r.S: Wrapper around <sysdeps/i386/strtok.S>
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 <roland@delasyd.gnu.ai.mit.edu>
* 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 <drepper@cygnus.com>
* 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 <stddef.h>. 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 <roland@delasyd.gnu.ai.mit.edu>
* 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
<linux/posix_types.h>, define _LINUX_TYPES_DONT_EXPORT and then
include <linux/types.h>.
* 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.
1996-05-26 19:19:51 +00:00
|
|
|
/* 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, ");
|
1996-05-29 17:50:37 +00:00
|
|
|
equal(strsep(&cp, ", "), "", 6); /* null token. */
|
|
|
|
equal(strsep(&cp, ", "), "", 7);
|
Sun May 26 15:15:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* stdlib/ldiv.c: Deansideclized.
Sun May 26 19:39:53 1996 Ulrich Drepper <drepper@cygnus.com>
* 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 <sysdeps/i386/strtok.S>
to produce strsep function.
* sysdeps/i386/strtok.S: Optimized implementation of strtok
function.
* sysdeps/i386/strtok_r.S: Wrapper around <sysdeps/i386/strtok.S>
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 <roland@delasyd.gnu.ai.mit.edu>
* 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 <drepper@cygnus.com>
* 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 <stddef.h>. 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 <roland@delasyd.gnu.ai.mit.edu>
* 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
<linux/posix_types.h>, define _LINUX_TYPES_DONT_EXPORT and then
include <linux/types.h>.
* 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.
1996-05-26 19:19:51 +00:00
|
|
|
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, ", ");
|
1996-05-29 17:50:37 +00:00
|
|
|
check(strsep(&cp, ", ") == one, 20); /* Null token. */
|
Sun May 26 15:15:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* stdlib/ldiv.c: Deansideclized.
Sun May 26 19:39:53 1996 Ulrich Drepper <drepper@cygnus.com>
* 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 <sysdeps/i386/strtok.S>
to produce strsep function.
* sysdeps/i386/strtok.S: Optimized implementation of strtok
function.
* sysdeps/i386/strtok_r.S: Wrapper around <sysdeps/i386/strtok.S>
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 <roland@delasyd.gnu.ai.mit.edu>
* 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 <drepper@cygnus.com>
* 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 <stddef.h>. 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 <roland@delasyd.gnu.ai.mit.edu>
* 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
<linux/posix_types.h>, define _LINUX_TYPES_DONT_EXPORT and then
include <linux/types.h>.
* 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.
1996-05-26 19:19:51 +00:00
|
|
|
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);
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
/* memcmp. */
|
|
|
|
it = "memcmp";
|
|
|
|
check(memcmp("a", "a", 1) == 0, 1); /* Identity. */
|
|
|
|
check(memcmp("abc", "abc", 3) == 0, 2); /* Multicharacter. */
|
|
|
|
check(memcmp("abcd", "abce", 4) < 0, 3); /* Honestly unequal. */
|
|
|
|
check(memcmp("abce", "abcd", 4) > 0, 4);
|
|
|
|
check(memcmp("alph", "beta", 4) < 0, 5);
|
|
|
|
check(memcmp("a\203", "a\003", 2) > 0, 6);
|
|
|
|
check(memcmp("abce", "abcd", 3) == 0, 7); /* Count limited. */
|
|
|
|
check(memcmp("abc", "def", 0) == 0, 8); /* Zero count. */
|
|
|
|
|
|
|
|
/* memchr. */
|
|
|
|
it = "memchr";
|
|
|
|
check(memchr("abcd", 'z', 4) == NULL, 1); /* Not found. */
|
|
|
|
(void) strcpy(one, "abcd");
|
|
|
|
check(memchr(one, 'c', 4) == one+2, 2); /* Basic test. */
|
1996-03-17 12:36:52 +00:00
|
|
|
check(memchr(one, ~0xff|'c', 4) == one+2, 2); /* ignore highorder bits. */
|
1995-02-18 01:27:10 +00:00
|
|
|
check(memchr(one, 'd', 4) == one+3, 3); /* End of string. */
|
|
|
|
check(memchr(one, 'a', 4) == one, 4); /* Beginning. */
|
|
|
|
check(memchr(one, '\0', 5) == one+4, 5); /* Finding NUL. */
|
|
|
|
(void) strcpy(one, "ababa");
|
|
|
|
check(memchr(one, 'b', 5) == one+1, 6); /* Finding first. */
|
|
|
|
check(memchr(one, 'b', 0) == NULL, 7); /* Zero count. */
|
|
|
|
check(memchr(one, 'a', 1) == one, 8); /* Singleton case. */
|
|
|
|
(void) strcpy(one, "a\203b");
|
|
|
|
check(memchr(one, 0203, 3) == one+1, 9); /* Unsignedness. */
|
|
|
|
|
1996-03-17 12:36:52 +00:00
|
|
|
/* now test all possible alignment and length combinations to catch
|
|
|
|
bugs due to unrolled loops (assuming unrolling is limited to no
|
|
|
|
more than 128 byte chunks: */
|
|
|
|
{
|
|
|
|
char buf[128 + sizeof(long)];
|
|
|
|
long align, len, i, pos;
|
|
|
|
|
|
|
|
for (align = 0; align < sizeof(long); ++align) {
|
|
|
|
for (len = 0; len < sizeof(buf) - align; ++len) {
|
|
|
|
for (i = 0; i < len; ++i) {
|
|
|
|
buf[align + i] = 'x'; /* don't depend on memset... */
|
|
|
|
}
|
|
|
|
for (pos = 0; pos < len; ++pos) {
|
|
|
|
#if 0
|
|
|
|
printf("align %d, len %d, pos %d\n", align, len, pos);
|
|
|
|
#endif
|
|
|
|
check(memchr(buf + align, 'x', len) == buf + align + pos, 10);
|
|
|
|
check(memchr(buf + align, 'x', pos) == NULL, 11);
|
|
|
|
buf[align + pos] = '-';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
/* memcpy - need not work for overlap. */
|
|
|
|
it = "memcpy";
|
|
|
|
check(memcpy(one, "abc", 4) == one, 1); /* Returned value. */
|
|
|
|
equal(one, "abc", 2); /* Did the copy go right? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) memcpy(one+1, "xyz", 2);
|
|
|
|
equal(one, "axydefgh", 3); /* Basic test. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abc");
|
|
|
|
(void) memcpy(one, "xyz", 0);
|
|
|
|
equal(one, "abc", 4); /* Zero-length copy. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "hi there");
|
|
|
|
(void) strcpy(two, "foo");
|
|
|
|
(void) memcpy(two, one, 9);
|
|
|
|
equal(two, "hi there", 5); /* Just paranoia. */
|
|
|
|
equal(one, "hi there", 6); /* Stomped on source? */
|
|
|
|
|
|
|
|
/* memmove - must work on overlap. */
|
|
|
|
it = "memmove";
|
|
|
|
check(memmove(one, "abc", 4) == one, 1); /* Returned value. */
|
|
|
|
equal(one, "abc", 2); /* Did the copy go right? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) memmove(one+1, "xyz", 2);
|
|
|
|
equal(one, "axydefgh", 3); /* Basic test. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abc");
|
|
|
|
(void) memmove(one, "xyz", 0);
|
|
|
|
equal(one, "abc", 4); /* Zero-length copy. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "hi there");
|
|
|
|
(void) strcpy(two, "foo");
|
|
|
|
(void) memmove(two, one, 9);
|
|
|
|
equal(two, "hi there", 5); /* Just paranoia. */
|
|
|
|
equal(one, "hi there", 6); /* Stomped on source? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) memmove(one+1, one, 9);
|
|
|
|
equal(one, "aabcdefgh", 7); /* Overlap, right-to-left. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) memmove(one+1, one+2, 7);
|
|
|
|
equal(one, "acdefgh", 8); /* Overlap, left-to-right. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) memmove(one, one, 9);
|
|
|
|
equal(one, "abcdefgh", 9); /* 100% overlap. */
|
|
|
|
|
|
|
|
/* memccpy - first test like memcpy, then the search part
|
|
|
|
The SVID, the only place where memccpy is mentioned, says
|
|
|
|
overlap might fail, so we don't try it. Besides, it's hard
|
|
|
|
to see the rationale for a non-left-to-right memccpy. */
|
|
|
|
it = "memccpy";
|
|
|
|
check(memccpy(one, "abc", 'q', 4) == NULL, 1); /* Returned value. */
|
|
|
|
equal(one, "abc", 2); /* Did the copy go right? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) memccpy(one+1, "xyz", 'q', 2);
|
|
|
|
equal(one, "axydefgh", 3); /* Basic test. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abc");
|
|
|
|
(void) memccpy(one, "xyz", 'q', 0);
|
|
|
|
equal(one, "abc", 4); /* Zero-length copy. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "hi there");
|
|
|
|
(void) strcpy(two, "foo");
|
|
|
|
(void) memccpy(two, one, 'q', 9);
|
|
|
|
equal(two, "hi there", 5); /* Just paranoia. */
|
|
|
|
equal(one, "hi there", 6); /* Stomped on source? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) strcpy(two, "horsefeathers");
|
|
|
|
check(memccpy(two, one, 'f', 9) == two+6, 7); /* Returned value. */
|
|
|
|
equal(one, "abcdefgh", 8); /* Source intact? */
|
|
|
|
equal(two, "abcdefeathers", 9); /* Copy correct? */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcd");
|
|
|
|
(void) strcpy(two, "bumblebee");
|
|
|
|
check(memccpy(two, one, 'a', 4) == two+1, 10); /* First char. */
|
|
|
|
equal(two, "aumblebee", 11);
|
|
|
|
check(memccpy(two, one, 'd', 4) == two+4, 12); /* Last char. */
|
|
|
|
equal(two, "abcdlebee", 13);
|
|
|
|
(void) strcpy(one, "xyz");
|
|
|
|
check(memccpy(two, one, 'x', 1) == two+1, 14); /* Singleton. */
|
|
|
|
equal(two, "xbcdlebee", 15);
|
|
|
|
|
|
|
|
/* memset. */
|
|
|
|
it = "memset";
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
check(memset(one+1, 'x', 3) == one+1, 1); /* Return value. */
|
|
|
|
equal(one, "axxxefgh", 2); /* Basic test. */
|
|
|
|
|
|
|
|
(void) memset(one+2, 'y', 0);
|
|
|
|
equal(one, "axxxefgh", 3); /* Zero-length set. */
|
|
|
|
|
|
|
|
(void) memset(one+5, 0, 1);
|
|
|
|
equal(one, "axxxe", 4); /* Zero fill. */
|
|
|
|
equal(one+6, "gh", 5); /* And the leftover. */
|
|
|
|
|
|
|
|
(void) memset(one+2, 010045, 1);
|
|
|
|
equal(one, "ax\045xe", 6); /* Unsigned char convert. */
|
|
|
|
|
|
|
|
/* bcopy - much like memcpy.
|
|
|
|
Berklix manual is silent about overlap, so don't test it. */
|
|
|
|
it = "bcopy";
|
|
|
|
(void) bcopy("abc", one, 4);
|
|
|
|
equal(one, "abc", 1); /* Simple copy. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdefgh");
|
|
|
|
(void) bcopy("xyz", one+1, 2);
|
|
|
|
equal(one, "axydefgh", 2); /* Basic test. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "abc");
|
|
|
|
(void) bcopy("xyz", one, 0);
|
|
|
|
equal(one, "abc", 3); /* Zero-length copy. */
|
|
|
|
|
|
|
|
(void) strcpy(one, "hi there");
|
|
|
|
(void) strcpy(two, "foo");
|
|
|
|
(void) bcopy(one, two, 9);
|
|
|
|
equal(two, "hi there", 4); /* Just paranoia. */
|
|
|
|
equal(one, "hi there", 5); /* Stomped on source? */
|
|
|
|
|
|
|
|
/* bzero. */
|
|
|
|
it = "bzero";
|
|
|
|
(void) strcpy(one, "abcdef");
|
|
|
|
bzero(one+2, 2);
|
|
|
|
equal(one, "ab", 1); /* Basic test. */
|
|
|
|
equal(one+3, "", 2);
|
|
|
|
equal(one+4, "ef", 3);
|
|
|
|
|
|
|
|
(void) strcpy(one, "abcdef");
|
|
|
|
bzero(one+2, 0);
|
|
|
|
equal(one, "abcdef", 4); /* Zero-length copy. */
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* bcmp - somewhat like memcmp. */
|
|
|
|
it = "bcmp";
|
|
|
|
check(bcmp("a", "a", 1) == 0, 1); /* Identity. */
|
|
|
|
check(bcmp("abc", "abc", 3) == 0, 2); /* Multicharacter. */
|
|
|
|
check(bcmp("abcd", "abce", 4) != 0, 3); /* Honestly unequal. */
|
|
|
|
check(bcmp("abce", "abcd", 4) != 0, 4);
|
|
|
|
check(bcmp("alph", "beta", 4) != 0, 5);
|
|
|
|
check(bcmp("abce", "abcd", 3) == 0, 6); /* Count limited. */
|
|
|
|
check(bcmp("abc", "def", 0) == 0, 8); /* Zero count. */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
{
|
|
|
|
char text[] = "This,is,a,test";
|
|
|
|
char *list = text;
|
|
|
|
it = "strsep";
|
|
|
|
check (!strcmp ("This", strsep (&list, ",")), 1);
|
|
|
|
check (!strcmp ("is", strsep (&list, ",")), 2);
|
|
|
|
check (!strcmp ("a", strsep (&list, ",")), 3);
|
|
|
|
check (!strcmp ("test", strsep (&list, ",")), 4);
|
|
|
|
check (strsep (&list, ",") == NULL, 5);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* strerror - VERY system-dependent. */
|
|
|
|
{
|
|
|
|
int f;
|
|
|
|
it = "strerror";
|
|
|
|
f = __open("/", O_WRONLY); /* Should always fail. */
|
|
|
|
check(f < 0 && errno > 0 && errno < _sys_nerr, 1);
|
|
|
|
equal(strerror(errno), _sys_errlist[errno], 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
int status;
|
|
|
|
if (errors == 0)
|
|
|
|
{
|
|
|
|
status = EXIT_SUCCESS;
|
|
|
|
puts("No errors.");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
status = EXIT_FAILURE;
|
1995-10-30 16:40:52 +00:00
|
|
|
printf("%Zd errors.\n", errors);
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
|
|
|
exit(status);
|
|
|
|
}
|
|
|
|
}
|