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

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

diff --git a/draft/man3/strcat.3 b/draft/man3/strcat.3
index 3110cdd..68a1228 100644 (file)
--- a/draft/man3/strcat.3
+++ b/draft/man3/strcat.3
@@ -36,7 +36,7 @@
 .\"       by Yuichi SATO <ysato444@yahoo.co.jp>
 .\" Updated 2007-07-04, Akihiro MOTOKI <amotoki@dd.iij4u.or.jp>, LDP v2.58
 .\"
-.TH STRCAT 3  2010-09-20 "GNU" "Linux Programmer's Manual"
+.TH STRCAT 3  2011-09-28 "GNU" "Linux Programmer's Manual"
 .\"O .SH NAME
 .SH ̾Á°
 .\"O strcat, strncat \- concatenate two strings
@@ -55,14 +55,16 @@ strcat, strncat \- 
 .\"O The
 .\"O .BR strcat ()
 .\"O function appends the \fIsrc\fP string to the
-.\"O \fIdest\fP string, overwriting the null byte (\(aq\\0\(aq) at the end of
+.\"O- \fIdest\fP string, overwriting the null byte (\(aq\\0\(aq) at the end of
+.\"O+ \fIdest\fP string,
+.\"O+ overwriting the terminating null byte (\(aq\\0\(aq) at the end of
 .\"O \fIdest\fP, and then adds a terminating null byte.
 .\"O The strings may not overlap, and the \fIdest\fP string must have
 .\"O enough space for the result.
 .BR strcat ()
 ´Ø¿ô¤Ï¡¢\fIdest\fP ʸ»úÎó¤Î¸å¤Ë \fIsrc\fP ʸ»úÎó¤òÉÕ¤±²Ã¤¨¤ë¡£
-¤½¤ÎºÝ¤Ë¡¢\fIdest\fP ¤ÎºÇ¸å¤Ë¤¢¤ë¥Ì¥ë¥Ð¥¤¥È (\(aq\\0\(aq) ¤Ï¾å½ñ¤­¤µ¤ì¡¢
-¿·¤¿¤ËÀ¸À®¤µ¤ì¤¿Ê¸»úÎó¤ÎËöÈø¤Ë½ªÃ¼¤Î¥Ì¥ë¥Ð¥¤¥È¤¬ÉÕÍ¿¤µ¤ì¤ë¡£
+¤½¤ÎºÝ¤Ë¡¢\fIdest\fP ¤ÎºÇ¸å¤Ë¤¢¤ë½ªÃ¼¤Î NULL ¥Ð¥¤¥È (\(aq\\0\(aq)
+¤Ï¾å½ñ¤­¤µ¤ì¡¢¿·¤¿¤ËÀ¸À®¤µ¤ì¤¿Ê¸»úÎó¤ÎËöÈø¤Ë½ªÃ¼¤Î NULL ¥Ð¥¤¥È¤¬ÉÕÍ¿¤µ¤ì¤ë¡£
 Æó¤Ä¤Îʸ»úÎó \fIsrc\fP ¤È \fIdest\fP ¤Ï½Å¤Ê¤Ã¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
 ¤Þ¤¿¡¢Ê¸»úÎó \fIdest\fP ¤Ï¡¢Ï¢·ë¸å¤Î·ë²Ì¤ò³ÊǼ¤¹¤ë¤Î¤Ë
 ½½Ê¬¤ÊÂ礭¤µ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£
@@ -81,13 +83,13 @@ strcat, strncat \- 
 \fIsrc\fP ¤Î¤¦¤ÁºÇÂç \fIn\fP ʸ»ú¤¬»ÈÍѤµ¤ì¤ë¡£
 .IP *
 \fIsrc\fP ¤¬ \fIn\fP ʸ»ú°Ê¾å¤Î¾ì¹ç¡¢
-\fIsrc\fP ¤Ï¥Ì¥ë½ªÃ¼¤µ¤ì¤Æ¤¤¤ëɬÍפϤʤ¤¡£
+\fIsrc\fP ¤Ï NULL ½ªÃ¼¤µ¤ì¤Æ¤¤¤ëɬÍפϤʤ¤¡£
 .PP
 .\"O As with
 .\"O .BR strcat (),
 .\"O the resulting string in \fIdest\fP is always null-terminated.
 .BR strcat ()
-¤ÈƱ¤¸¤¯¡¢\fIdest\fP ¤Ë³ÊǼ¤µ¤ì¤ë·ë²Ì¤Îʸ»úÎó¤Ï¾ï¤Ë¥Ì¥ë½ªÃ¼¤µ¤ì¤ë¡£
+¤ÈƱ¤¸¤¯¡¢\fIdest\fP ¤Ë³ÊǼ¤µ¤ì¤ë·ë²Ì¤Îʸ»úÎó¤Ï¾ï¤Ë NULL ½ªÃ¼¤µ¤ì¤ë¡£
 .PP
 .\"O If \fIsrc\fP contains \fIn\fP or more characters,
 .\"O .BR strncat ()
@@ -98,7 +100,7 @@ strcat, strncat \- 
 \fIsrc\fP ¤¬ \fIn\fP ʸ»ú°Ê¾å¤Î¾ì¹ç¡¢
 .BR strncat ()
 ¤Ï \fIdest\fP ¤Ë \fIn+1\fP ʸ»ú¤ò½ñ¤­¹þ¤à
-(\fIsrc\fP ¤«¤é¤Î \fIn\fP ʸ»ú¤È½ªÃ¼¤Î¥Ì¥ë¥Ð¥¤¥È¤Ç¤¢¤ë)¡£
+(\fIsrc\fP ¤«¤é¤Î \fIn\fP ʸ»ú¤È½ªÃ¼¤Î NULL ¥Ð¥¤¥È¤Ç¤¢¤ë)¡£
 ¤·¤¿¤¬¤Ã¤Æ¡¢\fIdest\fP ¤ÎÂ礭¤µ¤ÏºÇÄã¤Ç¤â
 \fIstrlen(dest)+n+1\fP ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£