svn commit: r234968 - stable/7/lib/libc/sys

[Eitan Adler]

Author: eadler
Date: Thu May  3 16:32:09 2012
New Revision: 234968
URL: http://svn.freebsd.org/changeset/base/234968

Log:
  MFC r234131:
  	Return EBADF instead of EMFILE from dup2 when the second argument is
  	outside the range of valid file descriptors
  
  PR:		kern/164970
  Approved by:	cperciva (implicit)

Modified:
  stable/7/lib/libc/sys/dup.2
  stable/7/lib/libc/sys/fcntl.2
Directory Properties:
  stable/7/lib/libc/   (props changed)

Modified: stable/7/lib/libc/sys/dup.2
==============================================================================
--- stable/7/lib/libc/sys/dup.2	Thu May  3 16:31:44 2012	(r234967)
+++ stable/7/lib/libc/sys/dup.2	Thu May  3 16:32:09 2012	(r234968)
@@ -123,20 +123,27 @@ indicates the cause of the error.
 .Sh ERRORS
 The
 .Fn dup
-and
-.Fn dup2
-system calls fail if:
+system call fails if:
 .Bl -tag -width Er
 .It Bq Er EBADF
 The
 .Fa oldd
-or
-.Fa newd
 argument
 is not a valid active descriptor
 .It Bq Er EMFILE
 Too many descriptors are active.
 .El
+The
+.Fn dup2
+system call fails if:
+.Bl -tag -width Er
+.It Bq Er EBADF
+The
+.Fa oldd
+argument is not a valid active descriptor or the
+.Fa newd
+argument is negative or exceeds the maximum allowable descriptor number
+.El
 .Sh SEE ALSO
 .Xr accept 2 ,
 .Xr close 2 ,

Modified: stable/7/lib/libc/sys/fcntl.2
==============================================================================
--- stable/7/lib/libc/sys/fcntl.2	Thu May  3 16:31:44 2012	(r234967)
+++ stable/7/lib/libc/sys/fcntl.2	Thu May  3 16:32:09 2012	(r234968)
@@ -523,8 +523,6 @@ The argument
 .Fa cmd
 is
 .Dv F_DUPFD
-or
-.Dv F_DUP2FD
 and the maximum number of file descriptors permitted for the
 process are already in use,
 or no file descriptors greater than or equal to