77a46300fa
svn path=/nixpkgs/trunk/; revision=9441
55 lines
2.1 KiB
Diff
55 lines
2.1 KiB
Diff
now hat glibc-2.6 declares futimens.
|
|
http://lists.gnu.org/archive/html/bug-gnulib/2007-05/msg00089.html
|
|
|
|
diff -ru cpio-2.7.orig/lib/utimens.c cpio-2.7/lib/utimens.c
|
|
--- cpio-2.7.orig/lib/utimens.c 2007-05-20 21:23:57.000000000 +0900
|
|
+++ cpio-2.7/lib/utimens.c 2007-05-21 08:40:22.000000000 +0900
|
|
@@ -73,7 +73,7 @@
|
|
Return 0 on success, -1 (setting errno) on failure. */
|
|
|
|
int
|
|
-futimens (int fd ATTRIBUTE_UNUSED,
|
|
+gl_futimens (int fd ATTRIBUTE_UNUSED,
|
|
char const *file, struct timespec const timespec[2])
|
|
{
|
|
/* There's currently no interface to set file timestamps with
|
|
@@ -166,5 +166,5 @@
|
|
int
|
|
utimens (char const *file, struct timespec const timespec[2])
|
|
{
|
|
- return futimens (-1, file, timespec);
|
|
+ return gl_futimens (-1, file, timespec);
|
|
}
|
|
diff -ru cpio-2.7.orig/lib/utimens.h cpio-2.7/lib/utimens.h
|
|
--- cpio-2.7.orig/lib/utimens.h 2007-05-20 21:23:57.000000000 +0900
|
|
+++ cpio-2.7/lib/utimens.h 2007-05-21 08:39:57.000000000 +0900
|
|
@@ -1,3 +1,3 @@
|
|
#include "timespec.h"
|
|
-int futimens (int, char const *, struct timespec const [2]);
|
|
+int gl_futimens (int, char const *, struct timespec const [2]);
|
|
int utimens (char const *, struct timespec const [2]);
|
|
diff -ru coreutils-6.9.orig/src/copy.c coreutils-6.9/src/copy.c
|
|
--- coreutils-6.9.orig/src/copy.c 2007-05-21 09:27:22.000000000 +0900
|
|
+++ coreutils-6.9/src/copy.c 2007-05-21 09:27:47.000000000 +0900
|
|
@@ -623,7 +623,7 @@
|
|
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 -ru coreutils-6.9.orig/src/touch.c coreutils-6.9/src/touch.c
|
|
--- coreutils-6.9.orig/src/touch.c 2007-05-21 09:27:22.000000000 +0900
|
|
+++ coreutils-6.9/src/touch.c 2007-05-21 09:27:57.000000000 +0900
|
|
@@ -182,7 +182,7 @@
|
|
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)
|
|
{
|