]>
Commit | Line | Data |
---|---|---|
d4997645 MT |
1 | --- coreutils-6.0.orig/lib/utimens.c 2006-06-11 09:14:31.000000000 +0200 |
2 | +++ coreutils-6.0/lib/utimens.c 2007-07-17 00:41:08.000000000 +0200 | |
3 | @@ -75,7 +75,7 @@ | |
4 | Return 0 on success, -1 (setting errno) on failure. */ | |
5 | ||
6 | int | |
7 | -futimens (int fd ATTRIBUTE_UNUSED, | |
8 | +cu_futimens (int fd ATTRIBUTE_UNUSED, | |
9 | char const *file, struct timespec const timespec[2]) | |
10 | { | |
11 | /* There's currently no interface to set file timestamps with | |
12 | @@ -168,5 +168,5 @@ | |
13 | int | |
14 | utimens (char const *file, struct timespec const timespec[2]) | |
15 | { | |
16 | - return futimens (-1, file, timespec); | |
17 | + return cu_futimens (-1, file, timespec); | |
18 | } | |
19 | --- coreutils-6.0.orig/lib/utimens.h 2004-11-23 21:41:51.000000000 +0100 | |
20 | +++ coreutils-6.0/lib/utimens.h 2007-07-17 00:41:31.000000000 +0200 | |
21 | @@ -1,3 +1,3 @@ | |
22 | #include "timespec.h" | |
23 | -int futimens (int, char const *, struct timespec const [2]); | |
24 | +int cu_futimens (int, char const *, struct timespec const [2]); | |
25 | int utimens (char const *, struct timespec const [2]); | |
26 | --- coreutils-6.0.orig/src/copy.c 2007-07-16 23:18:42.000000000 +0200 | |
27 | +++ coreutils-6.0/src/copy.c 2007-07-17 00:43:10.000000000 +0200 | |
28 | @@ -648,7 +648,7 @@ | |
29 | timespec[0] = get_stat_atime (src_sb); | |
30 | timespec[1] = get_stat_mtime (src_sb); | |
31 | ||
32 | - if (futimens (dest_desc, dst_name, timespec) != 0) | |
33 | + if (cu_futimens (dest_desc, dst_name, timespec) != 0) | |
34 | { | |
35 | error (0, errno, _("preserving times for %s"), quote (dst_name)); | |
36 | if (x->require_preserve) | |
37 | --- coreutils-6.0.orig/src/touch.c 2005-11-02 11:01:07.000000000 +0100 | |
38 | +++ coreutils-6.0/src/touch.c 2007-07-17 00:43:51.000000000 +0200 | |
39 | @@ -167,7 +167,7 @@ | |
40 | ||
41 | if (amtime_now) | |
42 | { | |
43 | - /* Pass NULL to futimens so it will not fail if we have | |
44 | + /* Pass NULL to cu_futimens so it will not fail if we have | |
45 | write access to the file, but don't own it. */ | |
46 | t = NULL; | |
47 | } | |
48 | @@ -182,7 +182,7 @@ | |
49 | t = timespec; | |
50 | } | |
51 | ||
52 | - ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); | |
53 | + ok = (cu_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); | |
54 | ||
55 | if (fd == STDIN_FILENO) | |
56 | { |