diff options
| author | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-09-16 14:55:15 +0000 |
|---|---|---|
| committer | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-09-16 14:55:15 +0000 |
| commit | 31a74c182cf2b5150a704786c53c053fd31b4c6d (patch) | |
| tree | 5eb53f7e1729ae4bf03e842ae3333e511b1a588d /usr/src/man/man3c | |
| parent | a845c808b8c12dd241b837bd48ae775b26d458fe (diff) | |
| parent | 39fd84a866206a99cbb6b6e63e0c38a367aaa88e (diff) | |
| download | illumos-joyent-31a74c182cf2b5150a704786c53c053fd31b4c6d.tar.gz | |
[illumos-gate merge]
commit 39fd84a866206a99cbb6b6e63e0c38a367aaa88e
6119 mptsas doesn't handle timeouts in mptsas_get_sata_guid()
commit 6d532798b6559eb98b586fd17725d8093f3b9ade
6168 strlcpy() does not return s1
commit 3c9168fa8e9c30d55b3aa2fde74bd7da46df53f5
4053 Add NVME Driver Support to Illumos
commit b08923d6c9c63a4f4b647b84d9454d8124fcedd7
6210 ping can misreport ICMP latency
6211 want warnings in the face of long running name lookups for ping
6212 Want sub-second ping interval support
6213 clean up warnings in ping
commit 0d045c0d0cb001d79480ee33be28514e847f8612
6209 libc mutexes break kernel writers hearts
Conflicts:
usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile
usr/src/cmd/cmd-inet/usr.sbin/ping/ping.c
usr/src/lib/libc/port/threads/assfail.c
usr/src/uts/common/Makefile.files
usr/src/uts/common/Makefile.rules
usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h
Diffstat (limited to 'usr/src/man/man3c')
| -rw-r--r-- | usr/src/man/man3c/string.3c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/man/man3c/string.3c b/usr/src/man/man3c/string.3c index cc934221e3..882705284d 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 "Dec 20, 2014" +.TH STRING 3C "Sep 14, 2015" .SH NAME string, strcasecmp, strcasecmp_l, strncasecmp, strncasecmp_l, strcat, strncat, strlcat, strchr, strchrnul, strrchr, strcmp, strncmp, stpcpy, stpncpy, strcpy, @@ -285,9 +285,10 @@ The \fBstrcpy()\fR function copies string \fIs2\fR to \fIs1\fR, including the terminating null character, stopping after the null character has been copied. The \fBstrncpy()\fR function copies exactly \fIn\fR bytes, truncating \fIs2\fR or adding null characters to \fIs1\fR if necessary. The result will not be -null-terminated if the length of \fIs2\fR is \fIn\fR or more. Each function -returns \fIs1\fR. If copying takes place between objects that overlap, the -behavior of \fBstrcpy()\fR, \fBstrncpy()\fR, and \fBstrlcpy()\fR is undefined. +null-terminated if the length of \fIs2\fR is \fIn\fR or more. Both the +\fBstrcpy()\fR and \fBstrncpy()\fR functions return \fIs1\fR. If copying takes +place between objects that overlap, the behavior of \fBstrcpy()\fR, +\fBstrncpy()\fR, and \fBstrlcpy()\fR is undefined. .LP The \fBstrlcpy()\fR function copies at most \fIdstsize\fR\(mi1 characters (\fIdstsize\fR being the size of the string buffer \fIdst\fR) from \fIsrc\fR |