PERFORCE change 130618 for review

Warner Losh imp at FreeBSD.org
Mon Dec 10 23:15:14 PST 2007


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

Change 130618 by imp at 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
 


More information about the p4-projects mailing list