svn commit: r239151 - head/lib/libc/gen

Jilles Tjoelker jilles at FreeBSD.org
Thu Aug 9 15:11:39 UTC 2012


Author: jilles
Date: Thu Aug  9 15:11:38 2012
New Revision: 239151
URL: http://svn.freebsd.org/changeset/base/239151

Log:
  ftw(): Do not check the maxfds argument against OPEN_MAX.
  
  Apart from the fact that nothing should have OPEN_MAX as a limit (as opposed
  to RLIMIT_NOFILE from getrlimit() or _SC_OPEN_MAX from sysconf()), POSIX
  does not require us to check this. POSIX does have a requirement on the
  application that maxfds not exceed {OPEN_MAX}, but does not require the
  implementation to check it ("may fail").
  
  PR:		95239

Modified:
  head/lib/libc/gen/ftw.c

Modified: head/lib/libc/gen/ftw.c
==============================================================================
--- head/lib/libc/gen/ftw.c	Thu Aug  9 15:04:06 2012	(r239150)
+++ head/lib/libc/gen/ftw.c	Thu Aug  9 15:11:38 2012	(r239151)
@@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$");
 #include <errno.h>
 #include <fts.h>
 #include <ftw.h>
-#include <limits.h>
 
 int
 ftw(const char *path, int (*fn)(const char *, const struct stat *, int),
@@ -40,7 +39,7 @@ ftw(const char *path, int (*fn)(const ch
 	int error = 0, fnflag, sverrno;
 
 	/* XXX - nfds is currently unused */
-	if (nfds < 1 || nfds > OPEN_MAX) {
+	if (nfds < 1) {
 		errno = EINVAL;
 		return (-1);
 	}


More information about the svn-src-all mailing list