fold strn{casecmp,cat,cmp,cpy}.3 into str{casecmp,cat,cmp,cpy}.3

SCCS-vsn: lib/libc/string/Makefile.inc 5.2
SCCS-vsn: lib/libc/string/bcmp.3 5.2
SCCS-vsn: lib/libc/string/memccpy.3 5.2
SCCS-vsn: lib/libc/string/memcmp.3 5.2
SCCS-vsn: lib/libc/string/memcpy.3 5.2
SCCS-vsn: lib/libc/string/memmove.3 5.2
SCCS-vsn: lib/libc/string/strcasecmp.3 5.2
SCCS-vsn: lib/libc/string/strcat.3 5.3

diff --git a/usr/src/lib/libc/string/Makefile.inc b/usr/src/lib/libc/string/Makefile.inc
index 0d02152..ec43e35 100644 (file)
--- a/usr/src/lib/libc/string/Makefile.inc
+++ b/usr/src/lib/libc/string/Makefile.inc
@@ -1,4 +1,4 @@
-#      @(#)Makefile.inc        5.1 (Berkeley) %G%
+#      @(#)Makefile.inc        5.2 (Berkeley) %G%

 
 # string sources
 .PATH: ${.CURDIR}/${MACHINE}/string ${.CURDIR}/string
 
 # string sources
 .PATH: ${.CURDIR}/${MACHINE}/string ${.CURDIR}/string


@@ -89,6 +89,5 @@ strrchr.po: rindex.c
 MAN3+= bcmp.0 bcopy.0 bstring.0 bzero.0 ffs.0 index.0 memccpy.0 memchr.0 \
        memcmp.0 memcpy.0 memmove.0 memset.0 rindex.0 strcasecmp.0 strcat.0 \
        strchr.0 strcmp.0 strcoll.0 strcpy.0 strcspn.0 strftime.0 string.0 \
 MAN3+= bcmp.0 bcopy.0 bstring.0 bzero.0 ffs.0 index.0 memccpy.0 memchr.0 \
        memcmp.0 memcpy.0 memmove.0 memset.0 rindex.0 strcasecmp.0 strcat.0 \
        strchr.0 strcmp.0 strcoll.0 strcpy.0 strcspn.0 strftime.0 string.0 \

-       strlen.0 strmode.0 strdup.0 strncasecmp.0 strncat.0 strncmp.0 \
-       strncpy.0 strpbrk.0 strrchr.0 strsep.0 strspn.0 strstr.0 strtok.0 \
-       strxfrm.0 swab.0
+       strlen.0 strmode.0 strdup.0 strpbrk.0 strrchr.0 strsep.0 strspn.0 \
+       strstr.0 strtok.0 strxfrm.0 swab.0

diff --git a/usr/src/lib/libc/string/bcmp.3 b/usr/src/lib/libc/string/bcmp.3
index 6afa817..d1df37b 100644 (file)
--- a/usr/src/lib/libc/string/bcmp.3
+++ b/usr/src/lib/libc/string/bcmp.3
@@ -6,7 +6,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"    @(#)bcmp.3      5.1 (Berkeley) %G%
+.\"    @(#)bcmp.3      5.2 (Berkeley) %G%

 .\"
 .TH BCMP 3 ""
 .UC 7
 .\"
 .TH BCMP 3 ""
 .UC 7


@@ -35,5 +35,4 @@ Zero-length strings are always identical.
 .PP
 The strings may overlap.
 .SH SEE ALSO
 .PP
 The strings may overlap.
 .SH SEE ALSO

-bcmp(3), memcmp(3), strcasecmp(3), strcmp(3), strcoll(3), strncasecmp(3),
-strncmp(3), strxfrm(3)
+bcmp(3), memcmp(3), strcasecmp(3), strcmp(3), strcoll(3), strxfrm(3)

diff --git a/usr/src/lib/libc/string/memccpy.3 b/usr/src/lib/libc/string/memccpy.3
index 6195155..e4d10ac 100644 (file)
--- a/usr/src/lib/libc/string/memccpy.3
+++ b/usr/src/lib/libc/string/memccpy.3
@@ -3,7 +3,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"    @(#)memccpy.3   5.1 (Berkeley) %G%
+.\"    @(#)memccpy.3   5.2 (Berkeley) %G%

 .\"
 .TH MEMCCPY 3 ""
 .UC 7
 .\"
 .TH MEMCCPY 3 ""
 .UC 7


@@ -37,4 +37,4 @@ Otherwise,
 .I len
 bytes are copied, and a NULL pointer is returned.
 .SH SEE ALSO
 .I len
 bytes are copied, and a NULL pointer is returned.
 .SH SEE ALSO

-bcopy(3), memcpy(3), memmove(3), strcpy(3), strncpy(3)
+bcopy(3), memcpy(3), memmove(3), strcpy(3)

diff --git a/usr/src/lib/libc/string/memcmp.3 b/usr/src/lib/libc/string/memcmp.3
index 6335131..16cb27b 100644 (file)
--- a/usr/src/lib/libc/string/memcmp.3
+++ b/usr/src/lib/libc/string/memcmp.3
@@ -6,7 +6,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"    @(#)memcmp.3    5.1 (Berkeley) %G%
+.\"    @(#)memcmp.3    5.2 (Berkeley) %G%

 .\"
 .TH MEMCMP 3 ""
 .UC 7
 .\"
 .TH MEMCMP 3 ""
 .UC 7


@@ -36,8 +36,7 @@ Both strings are assumed to be
 bytes long.
 Zero-length strings are always identical.
 .SH SEE ALSO
 bytes long.
 Zero-length strings are always identical.
 .SH SEE ALSO

-bcmp(3), strcasecmp(3), strcmp(3), strcoll(3), strncasecmp(3),
-strncmp(3), strxfrm(3)
+bcmp(3), strcasecmp(3), strcmp(3), strcoll(3), strxfrm(3)

 .SH STANDARDS
 .I Memcmp
 conforms to ANSI X3.159-1989 (``ANSI C'').
 .SH STANDARDS
 .I Memcmp
 conforms to ANSI X3.159-1989 (``ANSI C'').

diff --git a/usr/src/lib/libc/string/memcpy.3 b/usr/src/lib/libc/string/memcpy.3
index 336ad2c..33f8a42 100644 (file)
--- a/usr/src/lib/libc/string/memcpy.3
+++ b/usr/src/lib/libc/string/memcpy.3
@@ -6,7 +6,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"    @(#)memcpy.3    5.1 (Berkeley) %G%
+.\"    @(#)memcpy.3    5.2 (Berkeley) %G%

 .\"
 .TH MEMCPY 3 ""
 .UC 7
 .\"
 .TH MEMCPY 3 ""
 .UC 7


@@ -32,7 +32,7 @@ to string
 and returns the original value of
 .IR dst .
 .SH SEE ALSO
 and returns the original value of
 .IR dst .
 .SH SEE ALSO

-bcopy(3), memccpy(3), memmove(3), strcpy(3), strncpy(3)
+bcopy(3), memccpy(3), memmove(3), strcpy(3)

 .SH STANDARDS
 .IR Memcpy
 conforms to ANSI X3.159-1989 (``ANSI C'').
 .SH STANDARDS
 .IR Memcpy
 conforms to ANSI X3.159-1989 (``ANSI C'').

diff --git a/usr/src/lib/libc/string/memmove.3 b/usr/src/lib/libc/string/memmove.3
index df1bd2c..8165c2c 100644 (file)
--- a/usr/src/lib/libc/string/memmove.3
+++ b/usr/src/lib/libc/string/memmove.3
@@ -6,7 +6,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"    @(#)memmove.3   5.1 (Berkeley) %G%
+.\"    @(#)memmove.3   5.2 (Berkeley) %G%

 .\"
 .TH MEMMOVE 3 ""
 .UC 7
 .\"
 .TH MEMMOVE 3 ""
 .UC 7


@@ -34,7 +34,7 @@ and returns the original value of
 The two strings may overlap;
 the copy is always done in a non-destructive manner.
 .SH SEE ALSO
 The two strings may overlap;
 the copy is always done in a non-destructive manner.
 .SH SEE ALSO

-bcopy(3), memccpy(3), memcpy(3), strcpy(3), strncpy(3)
+bcopy(3), memccpy(3), memcpy(3), strcpy(3)

 .SH STANDARDS
 .IR Memmove
 conforms to ANSI X3.159-1989 (``ANSI C'').
 .SH STANDARDS
 .IR Memmove
 conforms to ANSI X3.159-1989 (``ANSI C'').

diff --git a/usr/src/lib/libc/string/strcasecmp.3 b/usr/src/lib/libc/string/strcasecmp.3
index f5b9ed8..1213386 100644 (file)
--- a/usr/src/lib/libc/string/strcasecmp.3
+++ b/usr/src/lib/libc/string/strcasecmp.3
@@ -6,7 +6,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"    @(#)strcasecmp.3        5.1 (Berkeley) %G%
+.\"    @(#)strcasecmp.3        5.2 (Berkeley) %G%

 .\"
 .TH STRCASECMP 3 ""
 .UC 7
 .\"
 .TH STRCASECMP 3 ""
 .UC 7


@@ -19,15 +19,20 @@ strcasecmp \- compare strings, ignoring case
 
 int
 strcasecmp(const char *s1, const char *s2);
 
 int
 strcasecmp(const char *s1, const char *s2);

+
+int
+strncasecmp(const char *s1, const char *s2, size_t len);

 .ft R
 .fi
 .SH DESCRIPTION
 .B Strcasecmp
 .ft R
 .fi
 .SH DESCRIPTION
 .B Strcasecmp

-compares null-terminated strings
+and
+.B strncasecmp
+compare the null-terminated strings

 .I s1
 and
 .I s2
 .I s1
 and
 .I s2

-and returns an integer greater than, equal to, or less than 0,
+and return an integer greater than, equal to, or less than 0,

 according as
 .I s1
 is lexicographically greater than, equal to, or less than
 according as
 .I s1
 is lexicographically greater than, equal to, or less than


@@ -36,6 +41,10 @@ after translation of each corresponding character to lower-case.
 The strings themselves are not modified.
 The comparison is done using unsigned characters, so that '\e200'
 is greater than '\e0'.
 The strings themselves are not modified.
 The comparison is done using unsigned characters, so that '\e200'
 is greater than '\e0'.

+.PP
+.B Strncasecmp
+compares at most
+.I len
+characters.

 .SH SEE ALSO
 .SH SEE ALSO

-bcmp(3), memcmp(3), strcmp(3), strcoll(3), strncasecmp(3),
-strncmp(3), strxfrm(3)
+bcmp(3), memcmp(3), strcmp(3), strcoll(3), strxfrm(3)

diff --git a/usr/src/lib/libc/string/strcat.3 b/usr/src/lib/libc/string/strcat.3
index c60379d..5bcdd3c 100644 (file)
--- a/usr/src/lib/libc/string/strcat.3
+++ b/usr/src/lib/libc/string/strcat.3
@@ -6,7 +6,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"    @(#)strcat.3    5.2 (Berkeley) %G%
+.\"    @(#)strcat.3    5.3 (Berkeley) %G%

 .\"
 .TH STRCAT 3 ""
 .UC 4
 .\"
 .TH STRCAT 3 ""
 .UC 4


@@ -26,23 +26,29 @@ strncat(char *s, const char *append, size_t count);
 .fi
 .SH DESCRIPTION
 .B Strcat
 .fi
 .SH DESCRIPTION
 .B Strcat

-appends a copy of the null-terminated string
+and
+.B strncat
+append a copy of the null-terminated string

 .I append
 to the end of the null-terminated string
 .IR s ,
 .I append
 to the end of the null-terminated string
 .IR s ,

-then adds a terminating '\e0'.
-.I S
+then add a terminating '\e0'.
+The string
+.I s

 must have sufficient space to hold the result.
 must have sufficient space to hold the result.

-.B Strcat
-returns the pointer
-.IR s .

 .PP
 .B Strncat
 appends at most
 .I count
 characters.
 .PP
 .B Strncat
 appends at most
 .I count
 characters.

+.PP
+.B Strcat
+and
+.B strncat
+return the pointer
+.IR s .

 .SH SEE ALSO
 .SH SEE ALSO

-strncat(3)
+bcopy(3), memccpy(3), memcpy(3), memmove(3), strcpy(3)

 .SH STANDARDS
 .B Strcat
 and
 .SH STANDARDS
 .B Strcat
 and