From 3bb942c4261e6c3f362e0d76fcb23f62bdb44c21 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Thu, 16 Sep 2010 17:38:00 -0600
Subject: [PATCH] maint: update to latest gnulib

* gnulib: Update to latest.
* bootstrap.conf (gnulib_modules): Add fdutimensat.
* src/touch.c (touch): Use fdutimensat instead of gl_futimens.
---
 bootstrap.conf | 1 +
 gnulib         | 2 +-
 src/touch.c    | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index a0004ac4ff..77a209bf6f 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -86,6 +86,7 @@ gnulib_modules="
   fcntl
   fcntl-safer
   fdl
+  fdutimensat
   file-type
   fileblocks
   filemode
diff --git a/gnulib b/gnulib
index 583c47de09..18aae5b744 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 583c47de09e3fb912baa00ddd405ab66fdad433c
+Subproject commit 18aae5b74420237d8c827e7c68312c5b71d659dc
diff --git a/src/touch.c b/src/touch.c
index e5224a45a9..290f743005 100644
--- a/src/touch.c
+++ b/src/touch.c
@@ -163,8 +163,9 @@ touch (const char *file)
       t = NULL;
     }
 
-  ok = ((no_dereference && fd == -1) ? lutimens (file, t)
-        : gl_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t)) == 0;
+  ok = (fdutimensat (AT_FDCWD, (fd == STDOUT_FILENO ? NULL : file), fd, t,
+                     (no_dereference && fd == -1) ? AT_SYMLINK_NOFOLLOW : 0)
+        == 0);
 
   if (fd == STDIN_FILENO)
     {
-- 
2.47.2