X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=original%2Fman3%2Fstrlen.3;h=5329da1bda36d18a207e9e2ea4261a0a797bd24a;hb=4ea6bb24817f6f049d6bbc90ecd77a869876f9b0;hp=e7e51837a040fb82349d472aa51cdd94c194c870;hpb=633a2252e0be3c867dce264a180a89ce8181d36f;p=linuxjm%2FLDP_man-pages.git

diff --git a/original/man3/strlen.3 b/original/man3/strlen.3
index e7e51837..5329da1b 100644
--- a/original/man3/strlen.3
+++ b/original/man3/strlen.3
@@ -1,5 +1,6 @@
 .\" Copyright 1993 David Metcalfe (david@prism.demon.co.uk)
 .\"
+.\" %%%LICENSE_START(VERBATIM)
 .\" Permission is granted to make and distribute verbatim copies of this
 .\" manual provided the copyright notice and this permission notice are
 .\" preserved on all copies.
@@ -19,13 +20,14 @@
 .\"
 .\" Formatted or processed versions of this manual, if unaccompanied by
 .\" the source, must acknowledge the copyright and authors of this work.
+.\" %%%LICENSE_END
 .\"
 .\" References consulted:
 .\"     Linux libc source code
 .\"     Lewine's _POSIX Programmer's Guide_ (O'Reilly & Associates, 1991)
 .\"     386BSD man pages
 .\" Modified Sat Jul 24 18:02:26 1993 by Rik Faith (faith@cs.unc.edu)
-.TH STRLEN 3  1993-04-12 "" "Linux Programmer's Manual"
+.TH STRLEN 3  2014-02-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
 strlen \- calculate the length of a string
 .SH SYNOPSIS
@@ -38,14 +40,31 @@ strlen \- calculate the length of a string
 The
 .BR strlen ()
 function calculates the length of the string
-\fIs\fP, not including the terminating \(aq\\0\(aq character.
-.SH "RETURN VALUE"
+.IR s ,
+excluding the terminating null byte (\(aq\\0\(aq).
+.SH RETURN VALUE
 The
 .BR strlen ()
-function returns the number of characters in \fIs\fP.
-.SH "CONFORMING TO"
+function returns the number of bytes in the string
+.IR s .
+.SH ATTRIBUTES
+.SS Multithreading (see pthreads(7))
+The
+.BR strlen ()
+function is thread-safe.
+.SH CONFORMING TO
 SVr4, 4.3BSD, C89, C99.
-.SH "SEE ALSO"
+.SH SEE ALSO
 .BR string (3),
+.BR strnlen (3),
 .BR wcslen (3),
 .BR wcsnlen (3)
+.SH COLOPHON
+This page is part of release 3.79 of the Linux
+.I man-pages
+project.
+A description of the project,
+information about reporting bugs,
+and the latest version of this page,
+can be found at
+\%http://www.kernel.org/doc/man\-pages/.