From owner-svn-src-all@FreeBSD.ORG  Mon Mar 23 17:35:07 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 7295F2EB;
 Mon, 23 Mar 2015 17:35:07 +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 5D930F71;
 Mon, 23 Mar 2015 17:35:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2NHZ7T6099119;
 Mon, 23 Mar 2015 17:35:07 GMT (envelope-from jilles@FreeBSD.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2NHZ6E0099116;
 Mon, 23 Mar 2015 17:35:06 GMT (envelope-from jilles@FreeBSD.org)
Message-Id: <201503231735.t2NHZ6E0099116@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jilles set sender to
 jilles@FreeBSD.org using -f
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Mon, 23 Mar 2015 17:35:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280386 - in head/bin: cp mv
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Mar 2015 17:35:07 -0000

Author: jilles
Date: Mon Mar 23 17:35:05 2015
New Revision: 280386
URL: https://svnweb.freebsd.org/changeset/base/280386

Log:
  cp,mv: Use futimens() instead of utimensat() if possible.

Modified:
  head/bin/cp/utils.c
  head/bin/mv/mv.c

Modified: head/bin/cp/utils.c
==============================================================================
--- head/bin/cp/utils.c	Mon Mar 23 17:31:22 2015	(r280385)
+++ head/bin/cp/utils.c	Mon Mar 23 17:35:05 2015	(r280386)
@@ -342,7 +342,7 @@ setfile(struct stat *fs, int fd)
 
 	tspec[0] = fs->st_atim;
 	tspec[1] = fs->st_mtim;
-	if (utimensat(AT_FDCWD, to.p_path, tspec,
+	if (fdval ? futimens(fd, tspec) : utimensat(AT_FDCWD, to.p_path, tspec,
 	    islink ? AT_SYMLINK_NOFOLLOW : 0)) {
 		warn("utimensat: %s", to.p_path);
 		rval = 1;

Modified: head/bin/mv/mv.c
==============================================================================
--- head/bin/mv/mv.c	Mon Mar 23 17:31:22 2015	(r280385)
+++ head/bin/mv/mv.c	Mon Mar 23 17:35:05 2015	(r280386)
@@ -352,7 +352,7 @@ err:		if (unlink(to))
 
 	ts[0] = sbp->st_atim;
 	ts[1] = sbp->st_mtim;
-	if (utimensat(AT_FDCWD, to, ts, 0))
+	if (futimens(to_fd, ts))
 		warn("%s: set times", to);
 
 	if (close(to_fd)) {