From a0c838056c854d9502e748c2e33a4cfc2c6c1b1f Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Tue, 21 Dec 2010 13:48:08 -0500
Subject: More tests in s*, and straighten out string.h vs. strings.h
 confusion.

---
 test/bcmp.c      |  2 +-
 test/bcopy.c     |  2 +-
 test/bzero.c     |  2 +-
 test/regress.chk | 19 ++++++++++---------
 4 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'test')

diff --git a/test/bcmp.c b/test/bcmp.c
index 2f1389b..35a1be7 100644
--- a/test/bcmp.c
+++ b/test/bcmp.c
@@ -4,7 +4,7 @@
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
 
-#include <string.h>
+#include <strings.h>
 
 main(int arg, char **argv)
 {
diff --git a/test/bcopy.c b/test/bcopy.c
index c18c229..b8d735b 100644
--- a/test/bcopy.c
+++ b/test/bcopy.c
@@ -4,7 +4,7 @@
  * Detected-by: gcc-4.4.3 + Linux
  */
 
-#include <string.h>
+#include <strings.h>
 
 main(int arg, char **argv)
 {
diff --git a/test/bzero.c b/test/bzero.c
index e1416cc..1fafa46 100644
--- a/test/bzero.c
+++ b/test/bzero.c
@@ -4,7 +4,7 @@
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
 
-#include <string.h>
+#include <strings.h>
 
 main(int arg, char **argv)
 {
diff --git a/test/regress.chk b/test/regress.chk
index 9519cdf..20e91e1 100644
--- a/test/regress.chk
+++ b/test/regress.chk
@@ -1,8 +1,8 @@
 deheader: ./chdir.c has requires <unistd.h> from chdir()
 deheader: ./chdir.c includes <unistd.h>
 deheader: ./string.c includes <string.h>
-deheader: ./bzero.c has requires <string.h> from bzero()
-deheader: ./bzero.c includes <string.h>
+deheader: ./bzero.c has requires <strings.h> from bzero()
+deheader: ./bzero.c includes <strings.h>
 deheader: ./cfsetospeed.c has requires <termios.h> from cfsetospeed()
 deheader: ./cfsetospeed.c includes <termios.h>
 deheader: ./duplicate.c includes <stdio.h>
@@ -25,12 +25,12 @@ deheader: ./cfgetispeed.c has requires <termios.h> from cfgetispeed()
 deheader: ./cfgetispeed.c includes <termios.h>
 deheader: ./a64l.c has requires <stdlib.h> from a64l()
 deheader: ./a64l.c includes <stdlib.h>
-deheader: ./bcmp.c has requires <string.h> from bcmp()
-deheader: ./bcmp.c includes <string.h>
+deheader: ./bcmp.c has requires <strings.h> from bcmp()
+deheader: ./bcmp.c includes <strings.h>
 deheader: ./ceil.c has requires <math.h> from ceil()
 deheader: ./ceil.c includes <math.h>
-deheader: ./bcopy.c has requires <string.h> from bcopy()
-deheader: ./bcopy.c includes <string.h>
+deheader: ./bcopy.c has requires <strings.h> from bcopy()
+deheader: ./bcopy.c includes <strings.h>
 deheader: ./atexit.c has requires <stdlib.h> from atexit()
 deheader: ./atexit.c includes <stdlib.h>
 deheader: ./btowc.c has requires <stdio.h>,<wchar.h> from btowc()
@@ -90,6 +90,7 @@ deheader: ignoring <stdio.h> (conditional inclusion)
 deheader: ./bsort.c includes <string.h>
 deheader: ignoring <string.h> (conditional inclusion)
 deheader: ./bsort.c includes <stdlib.h>
+deheader: ./bsort.c has requires <string.h> from strcoll()
 deheader: ./bsort.c has requires <stdio.h> from scanf()
 deheader: ./chroot.c has requires <unistd.h> from chroot()
 deheader: ./chroot.c includes <unistd.h>
@@ -130,6 +131,7 @@ deheader: in ./atan2.c, retaining required '#include <math.h>\n'
 deheader: ./string.c without <string.h> succeeded.
 deheader: remove <string.h> from ./string.c
 deheader: in ./bsort.c, retaining required '#include <stdlib.h>\n'
+deheader: in ./bsort.c, <string.h> is required for portability but not present.
 deheader: in ./bsort.c, <stdio.h> is required for portability but not present.
 deheader: in ./cfgetospeed.c, retaining required '#include <termios.h>\n'
 deheader: in ./catclose.c, retaining required '#include <nl_types.h>\n'
@@ -152,7 +154,6 @@ deheader: remove <stdio.h> from ./duplicate.c
 deheader: in ./chdir.c, retaining required '#include <unistd.h>\n'
 deheader: in ./atanh.c, retaining required '#include <math.h>\n'
 deheader: in ./close.c, retaining required '#include <unistd.h>\n'
-deheader: in ./bcopy.c, retaining required '#include <string.h>\n'
 deheader: in ./crypt.c, retaining required '#include <unistd.h>\n'
 deheader: in ./cfsetispeed.c, retaining required '#include <termios.h>\n'
 deheader: ./fchmod.c without <sys/types.h> succeeded.
@@ -172,14 +173,14 @@ deheader: in ./umask.c, retaining required '#include <sys/types.h>\n'
 deheader: in ./umask.c, retaining required '#include <sys/stat.h>\n'
 deheader: in ./calloc.c, retaining required '#include <stdlib.h>\n'
 deheader: in ./atexit.c, retaining required '#include <stdlib.h>\n'
-deheader: in ./bzero.c, retaining required '#include <string.h>\n'
+deheader: in ./bzero.c, retaining required '#include <strings.h>\n'
 deheader: in ./access.c, retaining required '#include <unistd.h>\n'
 deheader: in ./btowc.c, retaining required '#include <wchar.h>\n'
 deheader: in ./btowc.c, retaining required '#include <stdio.h>\n'
 deheader: in ./clock.c, retaining required '#include <time.h>\n'
 deheader: in ./acosh.c, retaining required '#include <math.h>\n'
 deheader: in ./catgets.c, retaining required '#include <nl_types.h>\n'
-deheader: in ./bcmp.c, retaining required '#include <string.h>\n'
+deheader: in ./bcmp.c, retaining required '#include <strings.h>\n'
 deheader: in ./a64l.c, retaining required '#include <stdlib.h>\n'
 deheader: in ./chmod.c, retaining required '#include <sys/stat.h>\n'
 deheader: in ./chmod.c, retaining required '#include <sys/types.h>\n'
-- 
cgit v1.2.3-70-g09d2