summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2007-05-19 18:36:03 +0200
committerJim Meyering <jim@meyering.net>2007-05-19 18:36:03 +0200
commit5ab25eb05b27bdd575edabcd7cc537965a4c161d (patch)
tree00c2062065c8fa609973c931ac70f5647422d5a7
parentab4f4bdc18718160963dad71b8d233167631bd94 (diff)
downloadcoreutils-5ab25eb05b27bdd575edabcd7cc537965a4c161d.tar.xz
Rename uses of futimens -> gl_futimens; glibc now declares the former.
* src/copy.c (copy_reg): Reflect renaming: futimens -> gl_futimens. * src/touch.c (touch): Likewise.
-rw-r--r--ChangeLog6
-rw-r--r--src/copy.c2
-rw-r--r--src/touch.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 135f18dcc..04d5d4208 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-19 Jim Meyering <jim@meyering.net>
+
+ Rename uses of futimens -> gl_futimens; glibc now declares the former.
+ * src/copy.c (copy_reg): Reflect renaming: futimens -> gl_futimens.
+ * src/touch.c (touch): Likewise.
+
2007-05-18 Jim Meyering <jim@meyering.net>
* Makefile.maint (my-distcheck): Remove -pedantic from $(CFLAGS)
diff --git a/src/copy.c b/src/copy.c
index 81636ae7b..f4e3b174b 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -551,7 +551,7 @@ copy_reg (char const *src_name, char const *dst_name,
timespec[0] = get_stat_atime (src_sb);
timespec[1] = get_stat_mtime (src_sb);
- if (futimens (dest_desc, dst_name, timespec) != 0)
+ if (gl_futimens (dest_desc, dst_name, timespec) != 0)
{
error (0, errno, _("preserving times for %s"), quote (dst_name));
if (x->require_preserve)
diff --git a/src/touch.c b/src/touch.c
index cb54f4828..f9f2c10d0 100644
--- a/src/touch.c
+++ b/src/touch.c
@@ -1,5 +1,5 @@
/* touch -- change modification and access times of files
- Copyright (C) 87, 1989-1991, 1995-2005 Free Software Foundation, Inc.
+ Copyright (C) 87, 1989-1991, 1995-2005, 2007 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -182,7 +182,7 @@ touch (const char *file)
t = timespec;
}
- ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
+ ok = (gl_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
if (fd == STDIN_FILENO)
{