From owner-svn-src-all@FreeBSD.ORG  Thu Aug  9 15:11:39 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6B838106566C;
	Thu,  9 Aug 2012 15:11:39 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 56C808FC08;
	Thu,  9 Aug 2012 15:11:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q79FBdaI022559;
	Thu, 9 Aug 2012 15:11:39 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q79FBd63022557;
	Thu, 9 Aug 2012 15:11:39 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201208091511.q79FBd63022557@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Thu, 9 Aug 2012 15:11:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239151 - head/lib/libc/gen
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2012 15:11:39 -0000

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);
 	}