summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@joyent.com>2016-02-27 04:28:28 +0000
committerRobert Mustacchi <rm@joyent.com>2016-03-25 16:48:25 -0700
commit5335409b2fd9c9c1d570d3e83bd2386dd8f526de (patch)
treee38f352710a6bc88a95a2a4b8f1f69fde143de6f
parentb6dd77d465d357e7777305038b5579625ae268c1 (diff)
downloadillumos-joyent-5335409b2fd9c9c1d570d3e83bd2386dd8f526de.tar.gz
6001 strcat(9f) needs a manpage
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com> Reviewed by: Volker A. Brandt <vab@bb-c.de> Reviewed by: Marcel Telka <marcel@telka.sk> Reviewed by: Albert Lee <trisk@omniti.com> Approved by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
-rw-r--r--usr/src/man/man3c/string.3c13
-rw-r--r--usr/src/man/man9f/Makefile2
-rw-r--r--usr/src/man/man9f/string.9f31
-rw-r--r--usr/src/pkg/manifests/system-kernel.man9f.inc1
4 files changed, 29 insertions, 18 deletions
diff --git a/usr/src/man/man3c/string.3c b/usr/src/man/man3c/string.3c
index 882705284d..25207eb151 100644
--- a/usr/src/man/man3c/string.3c
+++ b/usr/src/man/man3c/string.3c
@@ -13,7 +13,7 @@
.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License.
.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License.
.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH STRING 3C "Sep 14, 2015"
+.TH STRING 3C "Mar 23, 2016"
.SH NAME
string, strcasecmp, strcasecmp_l, strncasecmp, strncasecmp_l, strcat, strncat,
strlcat, strchr, strchrnul, strrchr, strcmp, strncmp, stpcpy, stpncpy, strcpy,
@@ -232,11 +232,12 @@ the current locale, they instead operate in the locale specified by \fIloc\fR.
.LP
The \fBstrcat()\fR function appends a copy of string \fIs2\fR, including the
terminating null character, to the end of string \fIs1\fR. The \fBstrncat()\fR
-function appends at most \fIn\fR characters. Each returns a pointer to the
-null-terminated result. The initial character of \fIs2\fR overrides the null
-character at the end of \fIs1\fR. If copying takes place between objects that
-overlap, the behavior of \fBstrcat()\fR, \fBstrncat()\fR, and \fBstrlcat()\fR
-is undefined.
+function appends at most \fIn\fR characters of \fIs2\fR to \fIs1\fR, not
+including any terminating null character, and then appends a null character.
+Each returns a pointer to the null-terminated result. The initial character of
+\fIs2\fR overrides the null character at the end of \fIs1\fR. If copying takes
+place between objects that overlap, the behavior of \fBstrcat()\fR,
+\fBstrncat()\fR, and \fBstrlcat()\fR is undefined.
.LP
The \fBstrlcat()\fR function appends at most
(\fIdstsize\fR-\fBstrlen\fR(\fIdst\fR)-1) characters of \fIsrc\fR to \fIdst\fR
diff --git a/usr/src/man/man9f/Makefile b/usr/src/man/man9f/Makefile
index 046da8a1ef..d02ddd76c5 100644
--- a/usr/src/man/man9f/Makefile
+++ b/usr/src/man/man9f/Makefile
@@ -1132,6 +1132,7 @@ MANLINKS= SIZEOF_PTR.9f \
sema_tryp.9f \
sema_v.9f \
strcasecmp.9f \
+ strcat.9f \
strchr.9f \
strcmp.9f \
strcpy.9f \
@@ -1952,6 +1953,7 @@ numtos.9f := LINKSRC = stoi.9f
ddi_strdup.9f := LINKSRC = string.9f
strcasecmp.9f := LINKSRC = string.9f
+strcat.9f := LINKSRC = string.9f
strchr.9f := LINKSRC = string.9f
strcmp.9f := LINKSRC = string.9f
strcpy.9f := LINKSRC = string.9f
diff --git a/usr/src/man/man9f/string.9f b/usr/src/man/man9f/string.9f
index fccd40887b..49d6e957c7 100644
--- a/usr/src/man/man9f/string.9f
+++ b/usr/src/man/man9f/string.9f
@@ -3,11 +3,11 @@
.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License.
.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License.
.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH STRING 9F "Sep 14, 2015"
+.TH STRING 9F "Mar 14, 2016"
.SH NAME
-string, strcasecmp, strncasecmp, strncat, strlcat, strchr, strrchr, strcmp,
-strncmp, strcpy, strncpy, strlcpy, strfree, strspn, strdup, ddi_strdup, strlen,
-strnlen \- string operations
+string, strcasecmp, strncasecmp, strcat, strncat, strlcat, strchr,
+strrchr, strcmp, strncmp, strcpy, strncpy, strlcpy, strfree, strspn,
+strdup, ddi_strdup, strlen, strnlen \- string operations
.SH SYNOPSIS
.LP
.nf
@@ -24,6 +24,11 @@ strnlen \- string operations
.LP
.nf
+\fBchar *\fR\fBstrcat\fR(\fBchar *\fR \fIs1\fR, \fBconst char *\fR \fIs2\fR);
+.fi
+
+.LP
+.nf
\fBchar *\fR\fBstrncat\fR(\fBchar *\fR \fIs1\fR, \fBconst char *\fR \fIs2\fR, \fBsize_t\fR \fIn\fR);
.fi
@@ -114,14 +119,16 @@ The \fBstrcasecmp()\fR and \fBstrncasecmp()\fR functions are case-insensitive
versions of \fBstrcmp()\fR and \fBstrncmp()\fR respectively, described below.
They assume the \fBASCII\fR character set and ignore differences in case when
comparing lower and upper case characters.
-.SS "\fBstrncat()\fR, \fBstrlcat()\fR"
-.LP
-The \fBstrncat()\fR function appends at most \fIn\fR characters of string
-\fIs2\fR, including the terminating null character, to the end of string
-\fIs1\fR. It returns a pointer to the null-terminated result. The initial
-character of \fIs2\fR overrides the null character at the end of \fIs1\fR. If
-copying takes place between objects that overlap, the behavior of
-\fBstrncat()\fRand \fBstrlcat()\fR is undefined.
+.SS "\fBstrcat()\fR, \fBstrncat()\fR, and \fBstrlcat()\fR"
+.LP
+The \fBstrcat()\fR function appends a copy of string \fIs2\fR, including the
+terminating null character, to the end of string \fIs1\fR. The \fBstrncat()\fR
+function appends at most \fIn\fR characters of \fIs2\fR to \fIs1\fR, not
+including any terminating null character, and then appends a null character.
+Each returns a pointer to the null-terminated result. The initial character of
+\fIs2\fR overrides the null character at the end of \fIs1\fR. If copying takes
+place between objects that overlap, the behavior of \fBstrcat()\fR,
+\fBstrncat()\fR, and \fBstrlcat()\fR is undefined.
.sp
.LP
The \fBstrlcat()\fR function appends at most
diff --git a/usr/src/pkg/manifests/system-kernel.man9f.inc b/usr/src/pkg/manifests/system-kernel.man9f.inc
index 210f10e5d0..94e46f191c 100644
--- a/usr/src/pkg/manifests/system-kernel.man9f.inc
+++ b/usr/src/pkg/manifests/system-kernel.man9f.inc
@@ -1227,6 +1227,7 @@ link path=usr/share/man/man9f/sema_p_sig.9f target=semaphore.9f
link path=usr/share/man/man9f/sema_tryp.9f target=semaphore.9f
link path=usr/share/man/man9f/sema_v.9f target=semaphore.9f
link path=usr/share/man/man9f/strcasecmp.9f target=string.9f
+link path=usr/share/man/man9f/strcat.9f target=string.9f
link path=usr/share/man/man9f/strchr.9f target=string.9f
link path=usr/share/man/man9f/strcmp.9f target=string.9f
link path=usr/share/man/man9f/strcpy.9f target=string.9f