From owner-p4-projects@FreeBSD.ORG  Tue Dec 11 07:15:14 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 08B3116A50C; Tue, 11 Dec 2007 07:15:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3178716A469
	for <perforce@freebsd.org>; Tue, 11 Dec 2007 07:15:13 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 216F513C4E1
	for <perforce@freebsd.org>; Tue, 11 Dec 2007 07:15:13 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBB7FDgk046932
	for <perforce@freebsd.org>; Tue, 11 Dec 2007 07:15:13 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBB7FCT9046928
	for perforce@freebsd.org; Tue, 11 Dec 2007 07:15:12 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 11 Dec 2007 07:15:12 GMT
Message-Id: <200712110715.lBB7FCT9046928@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 130618 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2007 07:15:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=130618

Change 130618 by imp@imp_mbp on 2007/12/11 07:14:48

	Darwin doesn't like it when you try to setrlimit NOFILE, so
	ignore the error in that case.  This is lame, and I'm not sure
	what the right fix for this is.
	
	# Now we get to the version check in legacy before we barf-o-rama

Affected files ...

.. //depot/projects/arm/src/usr.bin/make/main.c#5 edit

Differences ...

==== //depot/projects/arm/src/usr.bin/make/main.c#5 (text+ko) ====

@@ -901,7 +901,9 @@
 
 #ifdef RLIMIT_NOFILE
 	/*
-	 * get rid of resource limit on file descriptors
+	 * get rid of resource limit on file descriptors, but don't
+	 * fail if we can't because OS X has this define, but we get
+	 * EINVAL when we try to set it.
 	 */
 	{
 		struct rlimit rl;
@@ -909,9 +911,7 @@
 			err(2, "getrlimit");
 		}
 		rl.rlim_cur = rl.rlim_max;
-		if (setrlimit(RLIMIT_NOFILE, &rl) == -1) {
-			err(2, "setrlimit");
-		}
+		setrlimit(RLIMIT_NOFILE, &rl);
 	}
 #endif