(split) Apply minor changes from v3.32 to v3.35 in the upstream.

[linuxjm/LDP_man-pages.git] / draft / man3 / strnlen.3

diff --git a/draft/man3/strnlen.3 b/draft/man3/strnlen.3
index 98f6678..7dffb75 100644 (file)
--- a/draft/man3/strnlen.3
+++ b/draft/man3/strnlen.3
@@ -13,7 +13,7 @@
 .\" Translated Tue Jan 11 00:55:48 JST 2000
 .\"         by HANATAKA Shinya <hanataka@abyss.rim.or.jp>
 .\"
-.TH STRNLEN 3 2010-10-31 "GNU" "Linux Programmer's Manual"
+.TH STRNLEN 3  2011-09-28 "GNU" "Linux Programmer's Manual"
 .\"O .SH NAME
 .SH ̾Á°
 .\"O strnlen \- determine the length of a fixed-size string
@@ -54,7 +54,8 @@ _GNU_SOURCE
 .\"O The
 .\"O .BR strnlen ()
 .\"O function returns the number of characters in the string
-.\"O pointed to by \fIs\fP, not including the terminating \(aq\\0\(aq character,
+.\"O- pointed to by \fIs\fP, not including the terminating \(aq\\0\(aq character,
+.\"O+ pointed to by \fIs\fP, excluding the terminating null bye (\(aq\\0\(aq),
 .\"O but at most \fImaxlen\fP.
 .\"O In doing this,
 .\"O .BR strnlen ()
@@ -62,7 +63,7 @@ _GNU_SOURCE
 .\"O \fImaxlen\fP characters at \fIs\fP and never beyond \fIs+maxlen\fP.
 .BR strnlen ()
 ´Ø¿ô¤Ï \fIs\fP ¤¬»Ø¤¹Ê¸»úÎó¤ÎŤµ¤ò¥Ð¥¤¥È¿ô¤ÇÊÖ¤¹¡£
-Ťµ¤Ë¤Ï½ªÃ¼¤Î \(aq\\0\(aq ʸ»ú¤ò´Þ¤Þ¤Ê¤¤¡£
+Ťµ¤Ë¤Ï½ªÃ¼¤Î NULL ¥Ð¥¤¥È (\(aq\\0\(aq) ¤Ï´Þ¤Þ¤Ê¤¤¡£
 ¤Þ¤¿Ä¹¤µ¤ÏºÇÂç¤Ç \fImaxlen\fP ¤Þ¤Ç¤Ç¤¢¤ê¡¢
 .BR strnlen ()
 ¤Ï \fIs\fP ¤ÎºÇ½é¤Î \fImaxlen\fP ¥Ð¥¤¥È¤Î¤ß¤ò¸¡ºº¤·
@@ -73,16 +74,15 @@ _GNU_SOURCE
 .\"O .BR strnlen ()
 .\"O function returns \fIstrlen(s)\fP, if that is less than
 .\"O \fImaxlen\fP, or \fImaxlen\fP
-.\"O if there is no \(aq\\0\(aq character among the first
+.\"O if there is no null byte (\(aq\\0\(aq) among the first
 .\"O \fImaxlen\fP characters pointed to by \fIs\fP.
 .BR strnlen ()
 ´Ø¿ô¤Ï \fImaxlen\fP °Ê²¼¤Ê¤é¤Ð \fIstrlen(s)\fP ¤ÈƱ¤¸
 ÃͤòÊÖ¤¹¡£\fIs\fP ¤Î»Ø¤¹Ê¸»úÎ󤬺ÇÂç \fImaxlen\fP ¥Ð¥¤¥È¤Þ¤Ç¤Ë
-\(aq\\0\(aq ʸ»ú¤ò´Þ¤Þ¤Ê¤¤¾ì¹ç¤Ë¤Ï \fImaxlen\fP ¤òÊÖ¤¹¡£
+NULL ¥Ð¥¤¥È (\(aq\\0\(aq) ʸ»ú¤ò´Þ¤Þ¤Ê¤¤¾ì¹ç¤Ë¤Ï \fImaxlen\fP ¤òÊÖ¤¹¡£
 .\"O .SH "CONFORMING TO"
 .SH ½àµò
-.\"O This function is a GNU extension.
-¤³¤Î´Ø¿ô¤Ï GNU ¤Î³ÈÄ¥¤Ç¤¢¤ë¡£
+POSIX.1-2008.
 .\"O .SH "SEE ALSO"
 .SH ´ØÏ¢¹àÌÜ
 .BR strlen (3)