From owner-svn-src-projects@FreeBSD.ORG  Wed Feb  6 04:37:53 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BAA8EEE6;
 Wed,  6 Feb 2013 04:37:53 +0000 (UTC)
 (envelope-from alfred@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id ACD03BD5;
 Wed,  6 Feb 2013 04:37:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r164brXX073267;
 Wed, 6 Feb 2013 04:37:53 GMT (envelope-from alfred@svn.freebsd.org)
Received: (from alfred@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r164brr2073266;
 Wed, 6 Feb 2013 04:37:53 GMT (envelope-from alfred@svn.freebsd.org)
Message-Id: <201302060437.r164brr2073266@svn.freebsd.org>
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Wed, 6 Feb 2013 04:37:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246381 - projects/cider/usr.bin/make
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Feb 2013 04:37:53 -0000

Author: alfred
Date: Wed Feb  6 04:37:53 2013
New Revision: 246381
URL: http://svnweb.freebsd.org/changeset/base/246381

Log:
  Fix RLIMIT_NOFILE for OS X.

Modified:
  projects/cider/usr.bin/make/main.c

Modified: projects/cider/usr.bin/make/main.c
==============================================================================
--- projects/cider/usr.bin/make/main.c	Wed Feb  6 04:36:57 2013	(r246380)
+++ projects/cider/usr.bin/make/main.c	Wed Feb  6 04:37:53 2013	(r246381)
@@ -933,7 +933,11 @@ main(int argc, char **argv)
 		if (getrlimit(RLIMIT_NOFILE, &rl) == -1) {
 			err(2, "getrlimit");
 		}
+#ifdef __APPLE__
+		rl.rlim_cur = OPEN_MAX < rl.rlim_max ? OPEN_MAX : rl.rlim_max;
+#else
 		rl.rlim_cur = rl.rlim_max;
+#endif
 		if (setrlimit(RLIMIT_NOFILE, &rl) == -1) {
 			err(2, "setrlimit");
 		}