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

[linuxjm/LDP_man-pages.git] / draft / man2 / recv.2

diff --git a/draft/man2/recv.2 b/draft/man2/recv.2
index e7d613f..1eb40a5 100644 (file)
--- a/draft/man2/recv.2
+++ b/draft/man2/recv.2
@@ -55,7 +55,7 @@
 .\"WORD:       ancillary message       Êä½õ¥á¥Ã¥»¡¼¥¸
 .\"WORD:       invalid                 ÉÔÀµ¤Ê
 .\"
-.TH RECV 2 2010-08-29 "Linux" "Linux Programmer's Manual"
+.TH RECV 2 2011-09-16 "Linux" "Linux Programmer's Manual"
 .\"O .SH NAME
 .\"O recv, recvfrom, recvmsg \- receive a message from a socket
 .SH ̾Á°
@@ -219,14 +219,11 @@ recv, recvfrom, recvmsg \- 
 .\"O .I flags
 .\"O argument to a
 .\"O .BR recv ()
-.\"O call is formed by
-.\"O .IR OR 'ing
-.\"O one or more of the following values:
+.\"O call is formed by ORing one or more of the following values:
 .BR recv ()
 ¥³¡¼¥ë¤Î
 .I flags
-°ú¤­¿ô¤Ë¤Ï¡¢°Ê²¼¤ÎÃͤò 1¤Ä°Ê¾å¡¢¥Ó¥Ã¥Èñ°Ì¤Î
-.I OR (ÏÀÍýÏÂ)
+°ú¤­¿ô¤Ë¤Ï¡¢°Ê²¼¤ÎÃͤò 1¤Ä°Ê¾å¡¢¥Ó¥Ã¥Èñ°Ì¤ÎÏÀÍýÏÂ
 ¤ò¼è¤Ã¤¿¤â¤Î¤ò»ØÄꤹ¤ë:
 .TP
 .\"O .BR MSG_CMSG_CLOEXEC " (" recvmsg "() only; since Linux 2.6.23)"
@@ -538,7 +535,7 @@ struct msghdr {
 .\"O .I msg_namelen
 .\"O specify the source address if the socket is unconnected;
 .\"O .I msg_name
-.\"O may be given as a null pointer if no names are desired or required.
+.\"O may be given as a NULL pointer if no names are desired or required.
 .I msg_name
 ¤È
 .I msg_namelen
@@ -615,10 +612,13 @@ UNIX 
 .PP
 .\"O The
 .\"O .I msg_flags
-.\"O field in the msghdr is set on return of
+.\"O field in the
+.\"O .I msghdr
+.\"O is set on return of
 .\"O .BR recvmsg ().
 .\"O It can contain several flags:
-msghdr ¤Î
+.I msghdr
+¤Î
 .I msg_flags
 ¥Õ¥£¡¼¥ë¥É¤Ï
 .BR recvmsg ()
@@ -821,6 +821,14 @@ POSIX.1-2001 
 .\" The problem is an underlying kernel issue: the size of the
 .\" __kernel_size_t type used to type this field varies
 .\" across architectures, but socklen_t is always 32 bits.
+
+.\"O See
+.\"O .BR recvmmsg(2)
+.\"O for information about a Linux-specific system call
+.\"O that can be used to receive multiple datagrams in a single call.
+.BR recvmmsg (2)
+¤Ë¤Ï¡¢°ìÅ٤θƤӽФ·¤Ç¤ÎÊ£¿ô¤Î¥Ç¡¼¥¿¥°¥é¥à¤Ë»ÈÍѤǤ­¤ë Linux ¸ÇÍ­¤Î
+¥·¥¹¥Æ¥à¥³¡¼¥ë¤Ë´Ø¤¹¤ë¾ðÊ󤬽ñ¤«¤ì¤Æ¤¤¤ë¡£
 .\"O .SH EXAMPLE
 .SH Îã
 .\"O An example of the use of
@@ -836,6 +844,7 @@ POSIX.1-2001 
 .BR fcntl (2),
 .BR getsockopt (2),
 .BR read (2),
+.BR recvmmsg (2),
 .BR select (2),
 .BR shutdown (2),
 .BR socket (2),