From ebbad4cc83011dc736b53cce7d05b3056e2424b5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 26 May 1997 23:01:17 +0000 Subject: Update. 1997-05-26 22:51 Ulrich Drepper * configure.in: Use AC_PROG_CC_LOCAL instead of AC_PROC_CC. * aclocal.m4: Add AC_PROG_CC_LOCAL which does not fail for environments in which linking is not possible at configure time (since te libc is just build). Based on patches by Marcus G. Daniels . * time/scheck.c (scheck): Make 2nd parameter const. * time/private.h: Likewise. 1997-05-26 18:58 Ulrich Drepper * stdlib/random_r.c (__initstate_r): Initialize randomizer type in state array only at right place. Reported by Sven Verdoolaege . * stdlib/erand48_r.c (__erand48_r): Don't generate numbers in [0.5,1.0) but really in [0.0, 1.0). Patch by Oliver Gathmann . 1997-05-22 12:50 Eric Delaunay * shlib-versions: Provide Linux/SPARC defaults. 1997-05-26 15:00 Matthias Urlichs * stdlib/strtod_l.c: Add missing #include . * stdlib/strtof_l.c: Likewise. * stdlib/strtol_l.c: Likewise. * stdlib/strtold_l.c: Likewise. * stdlib/strtoll_l.c: Likewise. * stdlib/strtoul_l.c: Likewise. * stdlib/strtoull_l.c: Likewise. 1997-05-26 02:42 Zack Weinberg * hurd/dtable.c: De-ansidecl-fy. * math/test-math.c: Likewise. * signal/tst-signal.c: Likewise. * stdio/getc.c: Likewise. * stdio/obstream.c: Likewise. * stdio/putc.c: Likewise. * stdio-common/bug1.c: Likewise. * stdio-common/bug2.c: Likewise. * stdio-common/bug6.c: Likewise. * stdio-common/fscanf.c: Likewise. * stdlib/testsort.c: Likewise. * string/tester.c: Likewise. * sysdeps/am29k/ffs.c: Likewise. * sysdeps/generic/bb_init_func.c: Likewise. * sysdeps/generic/bcopy.c: Likewise. * sysdeps/generic/bzero.c: Likewise. * sysdeps/generic/div.c: Likewise. * sysdeps/generic/ffs.c: Likewise. * sysdeps/generic/memccpy.c: Likewise. * sysdeps/generic/memcpy.c: Likewise. * sysdeps/generic/memmove.c: Likewise. * sysdeps/generic/memset.c: Likewise. * sysdeps/generic/vfork.c: Likewise. * sysdeps/generic/vtimes.c: Likewise. * sysdeps/i386/bzero.c: Likewise. * sysdeps/i386/ffs.c: Likewise. * sysdeps/i960/ffs.c: Likewise. * sysdeps/m68k/ffs.c: Likewise. * sysdeps/m88k/ffs.c: Likewise. * sysdeps/mach/hurd/_exit.c: Likewise. * sysdeps/mach/hurd/accept.c: Likewise. * sysdeps/mach/hurd/access.c: Likewise. * sysdeps/mach/hurd/adjtime.c: Likewise. * sysdeps/mach/hurd/bind.c: Likewise. * sysdeps/mach/hurd/brk.c: Likewise. * sysdeps/mach/hurd/chdir.c: Likewise. * sysdeps/mach/hurd/chflags.c: Likewise. * sysdeps/mach/hurd/chmod.c: Likewise. * sysdeps/mach/hurd/chown.c: Likewise. * sysdeps/mach/hurd/chroot.c: Likewise. * sysdeps/mach/hurd/close.c: Likewise. * sysdeps/mach/hurd/connect.c: Likewise. * sysdeps/mach/hurd/defs.c: Likewise. * sysdeps/mach/hurd/dup2.c: Likewise. * sysdeps/mach/hurd/execve.c: Likewise. * sysdeps/mach/hurd/fchdir.c: Likewise. * sysdeps/mach/hurd/fchflags.c: Likewise. * sysdeps/mach/hurd/fchmod.c: Likewise. * sysdeps/mach/hurd/fchown.c: Likewise. * sysdeps/mach/hurd/fcntl.c: Likewise. * sysdeps/mach/hurd/fdopen.c: Likewise. * sysdeps/mach/hurd/flock.c: Likewise. * sysdeps/mach/hurd/fsync.c: Likewise. * sysdeps/mach/hurd/ftruncate.c: Likewise. * sysdeps/mach/hurd/getdtsz.c: Likewise. * sysdeps/mach/hurd/getegid.c: Likewise. * sysdeps/mach/hurd/geteuid.c: Likewise. * sysdeps/mach/hurd/getgid.c: Likewise. * sysdeps/mach/hurd/getgroups.c: Likewise. * sysdeps/mach/hurd/gethostid.c: Likewise. * sysdeps/mach/hurd/gethostname.c: Likewise. * sysdeps/mach/hurd/getitimer.c: Likewise. * sysdeps/mach/hurd/getlogin.c: Likewise. * sysdeps/mach/hurd/getpeername.c: Likewise. * sysdeps/mach/hurd/getpgid.c: Likewise. * sysdeps/mach/hurd/getpid.c: Likewise. * sysdeps/mach/hurd/getppid.c: Likewise. * sysdeps/mach/hurd/getsockname.c: Likewise. * sysdeps/mach/hurd/getsockopt.c: Likewise. * sysdeps/mach/hurd/getuid.c: Likewise. * sysdeps/mach/hurd/ioctl.c: Likewise. * sysdeps/mach/hurd/isatty.c: Likewise. * sysdeps/mach/hurd/link.c: Likewise. * sysdeps/mach/hurd/listen.c: Likewise. * sysdeps/mach/hurd/lseek.c: Likewise. * sysdeps/mach/hurd/mkdir.c: Likewise. * sysdeps/mach/hurd/open.c: Likewise. * sysdeps/mach/hurd/pipe.c: Likewise. * sysdeps/mach/hurd/read.c: Likewise. * sysdeps/mach/hurd/readlink.c: Likewise. * sysdeps/mach/hurd/reboot.c: Likewise. * sysdeps/mach/hurd/recv.c: Likewise. * sysdeps/mach/hurd/recvfrom.c: Likewise. * sysdeps/mach/hurd/rename.c: Likewise. * sysdeps/mach/hurd/rewinddir.c: Likewise. * sysdeps/mach/hurd/rmdir.c: Likewise. * sysdeps/mach/hurd/sbrk.c: Likewise. * sysdeps/mach/hurd/seekdir.c: Likewise. * sysdeps/mach/hurd/select.c: Likewise. * sysdeps/mach/hurd/setegid.c: Likewise. * sysdeps/mach/hurd/seteuid.c: Likewise. * sysdeps/mach/hurd/setgid.c: Likewise. * sysdeps/mach/hurd/setgroups.c: Likewise. * sysdeps/mach/hurd/sethostid.c: Likewise. * sysdeps/mach/hurd/sethostname.c: Likewise. * sysdeps/mach/hurd/setlogin.c: Likewise. * sysdeps/mach/hurd/setpgid.c: Likewise. * sysdeps/mach/hurd/setregid.c: Likewise. * sysdeps/mach/hurd/setreuid.c: Likewise. * sysdeps/mach/hurd/setrlimit.c: Likewise. * sysdeps/mach/hurd/setsid.c: Likewise. * sysdeps/mach/hurd/setsockopt.c: Likewise. * sysdeps/mach/hurd/settimeofday.c: Likewise. * sysdeps/mach/hurd/setuid.c: Likewise. * sysdeps/mach/hurd/shutdown.c: Likewise. * sysdeps/mach/hurd/sigaction.c: Likewise. * sysdeps/mach/hurd/sigaltstack.c: Likewise. * sysdeps/mach/hurd/sigpending.c: Likewise. * sysdeps/mach/hurd/sigprocmask.c: Likewise. * sysdeps/mach/hurd/sigstack.c: Likewise. * sysdeps/mach/hurd/sigsuspend.c: Likewise. * sysdeps/mach/hurd/socket.c: Likewise. * sysdeps/mach/hurd/socketpair.c: Likewise. * sysdeps/mach/hurd/stdio_init.c: Likewise. * sysdeps/mach/hurd/symlink.c: Likewise. * sysdeps/mach/hurd/sync.c: Likewise. * sysdeps/mach/hurd/sysd-stdio.c: Likewise. * sysdeps/mach/hurd/telldir.c: Likewise. * sysdeps/mach/hurd/truncate.c: Likewise. * sysdeps/mach/hurd/umask.c: Likewise. * sysdeps/mach/hurd/unlink.c: Likewise. * sysdeps/mach/hurd/wait4.c: Likewise. * sysdeps/mach/hurd/utimes.c: Likewise. * sysdeps/mach/hurd/write.c: Likewise. * sysdeps/mach/adjtime.c: Likewise. * sysdeps/mach/gettimeofday.c: Likewise. * sysdeps/mach/usleep.c: Likewise. * sysdeps/mips/__longjmp.c: Likewise. * sysdeps/posix/clock.c: Likewise. * sysdeps/posix/ctermid.c: Likewise. * sysdeps/posix/defs.c: Likewise. * sysdeps/posix/dup.c: Likewise. * sysdeps/posix/libc_fatal.c: Likewise. * sysdeps/posix/stdio_init.c: Likewise. * sysdeps/rs6000/ffs.c: Likewise. * sysdeps/sparc/e_sqrt.c: Likewise. * sysdeps/standalone/i386/force_cpu386/_exit.c: Likewise. * sysdeps/standalone/i386/force_cpu386/brdinit.c: Likewise. * sysdeps/standalone/i386/force_cpu386/console.c: Likewise. * sysdeps/standalone/i960/nindy960/_exit.c: Likewise. * sysdeps/standalone/i960/nindy960/brdinit.c: Likewise. * sysdeps/standalone/i960/nindy960/console.c: Likewise. * sysdeps/standalone/m68k/m68020/mvme136/_exit.c: Likewise. * sysdeps/standalone/m68k/m68020/mvme136/brdinit.c: Likewise. * sysdeps/standalone/brk.c: Likewise. * sysdeps/stub/_exit.c: Likewise. * sysdeps/stub/brdinit.c: Likewise. * sysdeps/stub/console.c: Likewise. * sysdeps/stub/defs.c: Likewise. * sysdeps/stub/errlist.c: Likewise. * sysdeps/stub/libc_fatal.c: Likewise. * sysdeps/stub/siglist.c: Likewise. * sysdeps/stub/stdio_init.c: Likewise. * sysdeps/stub/strtsupp.c: Likewise. * sysdeps/unix/bsd/bsd4.4/tcgetattr.c: Likewise. * sysdeps/unix/bsd/bsd4.4/tcsetattr.c: Likewise. * sysdeps/unix/bsd/bsd4.4/wait3.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/tcflow.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/tcflush.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/tcgetattr.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/tcsendbrk.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/wait4.c: Likewise. * sysdeps/unix/bsd/ultrix4/mips/sigvec.c: Likewise. * sysdeps/unix/bsd/bsdstat.h: Likewise. * sysdeps/unix/bsd/clock.c: Likewise. * sysdeps/unix/bsd/gtty.c: Likewise. * sysdeps/unix/bsd/init-posix.c: Likewise. * sysdeps/unix/bsd/setgid.c: Likewise. * sysdeps/unix/bsd/setrgid.c: Likewise. * sysdeps/unix/bsd/setruid.c: Likewise. * sysdeps/unix/bsd/setuid.c: Likewise. * sysdeps/unix/bsd/stty.c: Likewise. * sysdeps/unix/bsd/telldir.c: Likewise. * sysdeps/unix/bsd/ualarm.c: Likewise. * sysdeps/unix/common/glue-ctype.c: Likewise. * sysdeps/unix/sparc/start.c: Likewise. * sysdeps/unix/sysv/irix4/fpathconf.c: Likewise. * sysdeps/unix/sysv/irix4/getgroups.c: Likewise. * sysdeps/unix/sysv/irix4/getrusage.c: Likewise. * sysdeps/unix/sysv/irix4/pathconf.c: Likewise. * sysdeps/unix/sysv/irix4/setgroups.c: Likewise. * sysdeps/unix/sysv/irix4/sigtramp.c: Likewise. * sysdeps/unix/sysv/irix4/start.c: Likewise. * sysdeps/unix/sysv/irix4/sysconf.c: Likewise. * sysdeps/unix/sysv/sco3.2.4/__setpgid.c: Likewise. * sysdeps/unix/sysv/sco3.2.4/getgroups.c: Likewise. * sysdeps/unix/sysv/sysv4/__getpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/__setpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/ftruncate.c: Likewise. * sysdeps/unix/sysv/sysv4/gethostname.c: Likewise. * sysdeps/unix/sysv/sysv4/getpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/sethostname.c: Likewise. * sysdeps/unix/sysv/sysv4/setpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/setsid.c: Likewise. * sysdeps/unix/sysv/gethostname.c: Likewise. * sysdeps/unix/sysv/tcgetpgrp.c: Likewise. * sysdeps/unix/sysv/tcsetpgrp.c: Likewise. * sysdeps/unix/alarm.c: Likewise. * sysdeps/unix/make_errlist.c: Likewise. * sysdeps/unix/rewinddir.c: Likewise. * sysdeps/unix/seekdir.c: Likewise. * sysdeps/unix/time.c: Likewise. * sysdeps/unix/utime.c: Likewise. * sysdeps/vax/__longjmp.c: Likewise. * sysdeps/vax/memccpy.c: Likewise. * time/strftime.c: Likewise. 1997-05-25 21:57 Miles Bader * argp-parse.c (parser_init): For the special case where no parsing function is supplied for an argp, propagate its input to its first child, if any. * argp.h (struct argp_state): `argp' field renamed to `root_argp'. * argp-help.c (__argp_state_help, argp_args_usage, hol_help): Replace references to STATE->argp with STATE->root_argp. * argp-parse.c (parser_init): Likewise. 1997-05-26 14:17 Ulrich Drepper * manual/main.texi: Clarify situation for other not supported ports. Proposed by Andreas Jaeger . We recommend binutils 2.8. 1997-05-26 12:17 Ulrich Drepper * netinet/in.h: New file. Wrapper around inet/netinet/in.h. 1997-05-25 09:51 H.J. Lu * sysdeps/i386/elf/start.S: Change local label "nofini" to ".Lnofini". * sysdeps/i386/i386-mcount.S: Use GOT, instead of GOTOFF. 1997-05-24 17:45 H.J. Lu * gmon/gmon.c (_mcleanup): Free tostruct array allocated in monstartup. (dl_main): Define _dl_verbose based on DL_WARN environment variable. --- string/tester.c | 454 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 227 insertions(+), 227 deletions(-) (limited to 'string') diff --git a/string/tester.c b/string/tester.c index dcd7342ba3..0a13a8c82e 100644 --- a/string/tester.c +++ b/string/tester.c @@ -1,7 +1,6 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif -#include #include #include #include @@ -16,12 +15,13 @@ #define STREQ(a, b) (strcmp((a), (b)) == 0) -CONST char *it = ""; /* Routine name for message routines. */ +const char *it = ""; /* 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) +check (thing, number) + int thing, number; { if (!thing) { @@ -31,318 +31,318 @@ DEFUN(check, (thing, number), int thing AND int number) } /* Complain if first two args don't strcmp as equal. */ -void equal(CONST char *a, CONST char *b, int number); -void -DEFUN(equal, (a, b, number), CONST char *a AND CONST char *b AND int number) +void equal (const char *a, const char *b, int number) { - check(a != NULL && b != NULL && STREQ(a, b), 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) +main (argc, argv) + int argc; + char **argv; { char *cp; /* 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); + 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); { char buf1[0x40], buf2[0x40]; int i, j; for (i=0; i < 0x10; i++) for (j = 0; j < 0x10; j++) - { - int k; - for (k = 0; k < 0x3f; k++) - { - buf1[j] = '0' ^ (k & 4); - buf2[j] = '4' ^ (k & 4); - } - buf1[i] = buf1[0x3f] = 0; - buf2[j] = buf2[0x3f] = 0; - for (k = 0; k < 0xf; k++) - { - int cnum = 0x10+0x10*k+0x100*j+0x1000*i; - check(strcmp(buf1+i,buf2+j) == 0, cnum); - buf1[i+k] = 'A' + i + k; - buf1[i+k+1] = 0; - check(strcmp(buf1+i,buf2+j) > 0, cnum+1); - check(strcmp(buf2+j,buf1+i) < 0, cnum+2); - buf2[j+k] = 'B' + i + k; - buf2[j+k+1] = 0; - check(strcmp(buf1+i,buf2+j) < 0, cnum+3); - check(strcmp(buf2+j,buf1+i) > 0, cnum+4); - buf2[j+k] = 'A' + i + k; - buf1[i] = 'A' + i + 0x80; - check(strcmp(buf1+i,buf2+j) > 0, cnum+5); - check(strcmp(buf2+j,buf1+i) < 0, cnum+6); - buf1[i] = 'A' + i; - } - } - } + { + int k; + for (k = 0; k < 0x3f; k++) + { + buf1[j] = '0' ^ (k & 4); + buf2[j] = '4' ^ (k & 4); + } + buf1[i] = buf1[0x3f] = 0; + buf2[j] = buf2[0x3f] = 0; + for (k = 0; k < 0xf; k++) + { + int cnum = 0x10+0x10*k+0x100*j+0x1000*i; + check (strcmp (buf1+i,buf2+j) == 0, cnum); + buf1[i+k] = 'A' + i + k; + buf1[i+k+1] = 0; + check (strcmp (buf1+i,buf2+j) > 0, cnum+1); + check (strcmp (buf2+j,buf1+i) < 0, cnum+2); + buf2[j+k] = 'B' + i + k; + buf2[j+k+1] = 0; + check (strcmp (buf1+i,buf2+j) < 0, cnum+3); + check (strcmp (buf2+j,buf1+i) > 0, cnum+4); + buf2[j+k] = 'A' + i + k; + buf1[i] = 'A' + i + 0x80; + check (strcmp (buf1+i,buf2+j) > 0, cnum+5); + check (strcmp (buf2+j,buf1+i) < 0, cnum+6); + buf1[i] = 'A' + i; + } + } + } /* 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. */ + 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 (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 (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. */ + (void) strcpy (one, ""); + equal (one, "", 7); /* Boundary condition. */ /* stpncpy. */ it = "stpncpy"; - memset(one, 'x', sizeof(one)); - check(stpncpy(one, "abc", 2) == one + 2, 1); - check(stpncpy(one, "abc", 3) == one + 3, 2); - check(stpncpy(one, "abc", 4) == one + 3, 3); - check(one[3] == '\0' && one[4] == 'x', 4); - check(stpncpy(one, "abcd", 5) == one + 4, 5); - check(one[4] == '\0' && one[5] == 'x', 6); - check(stpncpy(one, "abcd", 6) == one + 4, 7); - check(one[4] == '\0' && one[5] == '\0' && one[6] == 'x', 8); + memset (one, 'x', sizeof (one)); + check (stpncpy (one, "abc", 2) == one + 2, 1); + check (stpncpy (one, "abc", 3) == one + 3, 2); + check (stpncpy (one, "abc", 4) == one + 3, 3); + check (one[3] == '\0' && one[4] == 'x', 4); + check (stpncpy (one, "abcd", 5) == one + 4, 5); + check (one[4] == '\0' && one[5] == 'x', 6); + check (stpncpy (one, "abcd", 6) == one + 4, 7); + check (one[4] == '\0' && one[5] == '\0' && one[6] == 'x', 8); /* 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); + (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. */ + (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. */ + 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. */ - equal(one, "abc", 10); - - (void) strncpy(one, "", 2); /* Zero-length source. */ - equal(one, "", 11); - equal(one+1, "", 12); - 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? */ + 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. */ + equal (one, "abc", 10); + + (void) strncpy (one, "", 2); /* Zero-length source. */ + equal (one, "", 11); + equal (one+1, "", 12); + 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. */ + check (strlen ("") == 0, 1); /* Empty. */ + check (strlen ("a") == 1, 2); /* Single char. */ + check (strlen ("abcd") == 4, 3); /* Multiple chars. */ { char buf[4096]; int i; char *p; for (i=0; i < 0x100; i++) { - p = (char *)((unsigned long int)(buf + 0xff) & ~0xff) + i; + p = (char *) ((unsigned long int)(buf + 0xff) & ~0xff) + i; strcpy (p, "OK"); strcpy (p+3, "BAD/WRONG"); - check(strlen(p) == 2, 4+i); + check (strlen (p) == 2, 4+i); } } /* 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. */ + 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. */ { char buf[4096]; int i; char *p; for (i=0; i < 0x100; i++) { - p = (char *)((unsigned long int)(buf + 0xff) & ~0xff) + i; + p = (char *) ((unsigned long int) (buf + 0xff) & ~0xff) + i; strcpy (p, "OK"); strcpy (p+3, "BAD/WRONG"); - check(strchr(p, '/') == NULL, 9+i); + check (strchr (p, '/') == NULL, 9+i); } } #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. */ + 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. */ + 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. */ { char buf[4096]; int i; char *p; for (i=0; i < 0x100; i++) { - p = (char *)((unsigned long int)(buf + 0xff) & ~0xff) + i; + p = (char *) ((unsigned long int) (buf + 0xff) & ~0xff) + i; strcpy (p, "OK"); strcpy (p+3, "BAD/WRONG"); - check(strrchr(p, '/') == NULL, 9+i); + check (strrchr (p, '/') == NULL, 9+i); } } #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. */ + 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. */ @@ -720,7 +720,7 @@ DEFUN(main, (argc, argv), int argc AND char **argv) int j; int k; int c; - + for (i = 0; i < 512; i++) data[i] = 'x'; for (c = 0; c <= 'y'; c += 'y') /* check for memset(,0,) and @@ -744,7 +744,7 @@ DEFUN(main, (argc, argv), int argc AND char **argv) continue; fail: - check(0,7+i+j*256+(c != 0)*256*256); + check(0,7+i+j*256+(c != 0)*256*256); } } -- cgit v1.2.3