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

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

diff --git a/draft/man3/stpcpy.3 b/draft/man3/stpcpy.3
index 1d51ce0..7dbb393 100644 (file)
--- a/draft/man3/stpcpy.3
+++ b/draft/man3/stpcpy.3
@@ -27,7 +27,7 @@
 .\" Formatted or processed versions of this manual, if unaccompanied by
 .\" the source, must acknowledge the copyright and authors of this work.
 .\"
-.TH STPCPY 3  2010-09-15 "GNU" "Linux Programmer's Manual"
+.TH STPCPY 3  2011-09-28 "GNU" "Linux Programmer's Manual"
 .\"O .SH NAME
 .SH ̾Á°
 .\"O stpcpy \- copy a string returning a pointer to its end
@@ -68,13 +68,13 @@ _GNU_SOURCE
 .\"O The
 .\"O .BR stpcpy ()
 .\"O function copies the string pointed to by \fIsrc\fP
-.\"O (including the terminating \(aq\\0\(aq character) to the array pointed to by
+.\"O (including the terminating null byte (\(aq\\0\(aq)) to the array pointed to by
 .\"O \fIdest\fP.
 .\"O The strings may not overlap, and the destination string
 .\"O \fIdest\fP must be large enough to receive the copy.
 .BR stpcpy ()
-´Ø¿ô¤Ï¡¢\fIsrc\fP ¤Ç»Ø¤µ¤ì¤¿Ê¸»úÎó¤ò (ʸ»úÎó¤ò½ªÃ¼¤¹¤ë \(aq\\0\(aq
-¤ò´Þ¤á¤Æ) \fIdest\fP ¤Ç»Ø¤µ¤ì¤¿ÇÛÎó¤Ë¥³¥Ô¡¼¤¹¤ë¡£
+´Ø¿ô¤Ï¡¢\fIsrc\fP ¤Ç»Ø¤µ¤ì¤¿Ê¸»úÎó¤ò (ʸ»úÎó¤ò½ªÃ¼¤¹¤ë NULL ¥Ð¥¤¥È
+(\(aq\\0\(aq) ¤ò´Þ¤á¤Æ) \fIdest\fP ¤Ç»Ø¤µ¤ì¤¿ÇÛÎó¤Ë¥³¥Ô¡¼¤¹¤ë¡£
 ʸ»úÎó¤Ï½ÅÊ£¤·¤Æ¤Ï¤Ê¤é¤º¡¢¥³¥Ô¡¼Àè¤Îʸ»úÎó \fIdest\fP ¤Ï¥³¥Ô¡¼¤ò¼õ¤±¼è¤ë
 ¤Î¤Ë½½Ê¬Â礭¤¯¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
 .\"O .SH "RETURN VALUE"
@@ -88,14 +88,16 @@ _GNU_SOURCE
 \fB½ª¤ê\fP¤ò»Ø¤¹¥Ý¥¤¥ó¥¿ (¤¹¤Ê¤ï¤Á¡¢Ê¸»úÎó¤ò½ªÃ¼¤¹¤ë NULL ¥Ð¥¤¥È) ¤òÊÖ¤¹¡£
 .\"O .SH "CONFORMING TO"
 .SH ½àµò
-.\"O This function is not part of the C or POSIX.1 standards, and is
-.\"O not customary on UNIX systems, but is not a GNU invention either.
-.\"O Perhaps it comes from MS-DOS.
-.\"O Nowadays, it is also present on the BSDs.
-¤³¤Î´Ø¿ô¤Ï¡¢C ¤ä POSIX.1 ɸ½à¤Î°ìÉô¤Ç¤Ï¤Ê¤¯¡¢UNIX ¥·¥¹¥Æ¥à¤Î´·½¬Åª¤Ê
-¤â¤Î¤Ç¤â¤Ê¤¤¤¬¡¢GNU ¤ÎȯÌÀ¤È¤¤¤¦¤ï¤±¤Ç¤â¤Ê¤¤¡£
+.\"O This function was added to POSIX.1-2008. Before that, it was not part of
+.\"O the C or POSIX.1 standards, nor customary on UNIX systems, but was not a
+.\"O GNU invention either. Perhaps it came from MS-DOS. It is also present on
+.\"O the BSDs.
+¤³¤Î´Ø¿ô¤Ï POSIX.1-2008 ¤ËÄɲ䵤줿¡£
+¤½¤ì°ÊÁ°¤Ï¡¢¤³¤Î´Ø¿ô¤Ï C ¤ä POSIX.1 ɸ½à¤Î°ìÉô¤Ç¤â
+UNIX ¥·¥¹¥Æ¥à¤Î´·½¬Åª¤Ê¤â¤Î¤Ç¤â¤Ê¤«¤Ã¤¿¤¬¡¢
+GNU ¤ÎȯÌÀ¤È¤¤¤¦¤ï¤±¤Ç¤â¤Ê¤«¤Ã¤¿¡£
 ¤Ò¤ç¤Ã¤È¤·¤¿¤é MS-DOS ͳÍè¤Î¤â¤Î¤«¤â¤·¤ì¤Ê¤¤¡£
-¸½ºß¤Ç¤Ï¡¢BSD ·Ï¤Ë¤â¸ºß¤¹¤ë¡£
+¤³¤Î´Ø¿ô¤Ï BSD ·Ï¤Ë¤â¸ºß¤¹¤ë¡£
 .\"O .SH EXAMPLE
 .SH Îã
 .\"O For example, this program uses
@@ -138,6 +140,7 @@ main(void)
 .BR memccpy (3),
 .BR memcpy (3),
 .BR memmove (3),
+.BR stpncpy (3),
 .BR strcpy (3),
 .BR string (3),
 .BR wcpcpy (3)