From owner-svn-src-head@FreeBSD.ORG Thu Oct 23 06:21:11 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82D55B14; Thu, 23 Oct 2014 06:21:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6F2D1F80; Thu, 23 Oct 2014 06:21:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9N6LBuo038918; Thu, 23 Oct 2014 06:21:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9N6LBcn038913; Thu, 23 Oct 2014 06:21:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201410230621.s9N6LBcn038913@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 23 Oct 2014 06:21:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273521 - head/contrib/netbsd-tests/lib/libc/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2014 06:21:11 -0000 Author: ngie Date: Thu Oct 23 06:21:10 2014 New Revision: 273521 URL: https://svnweb.freebsd.org/changeset/base/273521 Log: Convert "fcntl(n, F_CLOSEM)" to "closefrom(n)" Submitted by: pho Sponsored by: EMC / Isilon Storage Division Modified: head/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c Modified: head/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c ============================================================================== --- head/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c Thu Oct 23 06:18:28 2014 (r273520) +++ head/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c Thu Oct 23 06:21:10 2014 (r273521) @@ -63,7 +63,11 @@ run(int flags) while ((i = open("/", O_RDONLY)) < 3) ATF_REQUIRE(i != -1); +#ifdef __FreeBSD__ + closefrom(3); +#else ATF_REQUIRE(fcntl(3, F_CLOSEM) != -1); +#endif ATF_REQUIRE(socketpair(AF_UNIX, SOCK_DGRAM | flags, 0, fd) == 0);