From owner-p4-projects@FreeBSD.ORG  Tue Dec 11 10:17:32 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 53F4E16A41B; Tue, 11 Dec 2007 10:17:32 +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 B1F9316A418;
	Tue, 11 Dec 2007 10:17:31 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 9464B13C457;
	Tue, 11 Dec 2007 10:17:31 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from fledge.watson.org (fledge.watson.org [209.31.154.41])
	by cyrus.watson.org (Postfix) with ESMTP id 10C3049E4A;
	Tue, 11 Dec 2007 05:17:31 -0500 (EST)
Date: Tue, 11 Dec 2007 10:17:30 +0000 (GMT)
From: Robert Watson <rwatson@FreeBSD.org>
X-X-Sender: robert@fledge.watson.org
To: Warner Losh <imp@FreeBSD.org>
In-Reply-To: <200712110715.lBB7FCT9046928@repoman.freebsd.org>
Message-ID: <20071211101708.U71658@fledge.watson.org>
References: <200712110715.lBB7FCT9046928@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: 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 10:17:32 -0000


On Tue, 11 Dec 2007, Warner Losh wrote:

> 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

FYI, you can always take a look at the Darwin source for most UNIXesque tools,
including their variations on GNU and BSD makes.

Robert N M Watson
Computer Laboratory
University of Cambridge

>
> 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
>
>