Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Inappropriate [legacy version] |
| 2 | |
| 3 | # coreutils uses gnulib which conflicts with newer libc header on futimens |
| 4 | # this patch simply renames coreutils futimes to avoid confliction |
| 5 | # |
| 6 | # Signed-off-by Kevin Tian <kevin.tian@intel.com>, 2010-08-18 |
| 7 | # (this patch is licensed under GPLv2) |
| 8 | |
| 9 | diff --git a/lib/utimens.c b/lib/utimens.c |
| 10 | index 71bc510..ae870b8 100644 |
| 11 | --- a/lib/utimens.c |
| 12 | +++ b/lib/utimens.c |
| 13 | @@ -75,7 +75,7 @@ struct utimbuf |
| 14 | Return 0 on success, -1 (setting errno) on failure. */ |
| 15 | |
| 16 | int |
| 17 | -futimens (int fd ATTRIBUTE_UNUSED, |
| 18 | +futimens_coreutils (int fd ATTRIBUTE_UNUSED, |
| 19 | char const *file, struct timespec const timespec[2]) |
| 20 | { |
| 21 | /* Some Linux-based NFS clients are buggy, and mishandle time stamps |
| 22 | @@ -185,5 +185,5 @@ futimens (int fd ATTRIBUTE_UNUSED, |
| 23 | int |
| 24 | utimens (char const *file, struct timespec const timespec[2]) |
| 25 | { |
| 26 | - return futimens (-1, file, timespec); |
| 27 | + return futimens_coreutils (-1, file, timespec); |
| 28 | } |
| 29 | diff --git a/lib/utimens.h b/lib/utimens.h |
| 30 | index 0097aaa..13fc45a 100644 |
| 31 | --- a/lib/utimens.h |
| 32 | +++ b/lib/utimens.h |
| 33 | @@ -1,3 +1,3 @@ |
| 34 | #include <time.h> |
| 35 | -int futimens (int, char const *, struct timespec const [2]); |
| 36 | +int futimens_coreutils (int, char const *, struct timespec const [2]); |
| 37 | int utimens (char const *, struct timespec const [2]); |
| 38 | diff --git a/src/copy.c b/src/copy.c |
| 39 | index 4bdb75c..04634f1 100644 |
| 40 | --- a/src/copy.c |
| 41 | +++ b/src/copy.c |
| 42 | @@ -518,7 +518,7 @@ copy_reg (char const *src_name, char const *dst_name, |
| 43 | timespec[0] = get_stat_atime (src_sb); |
| 44 | timespec[1] = get_stat_mtime (src_sb); |
| 45 | |
| 46 | - if (futimens (dest_desc, dst_name, timespec) != 0) |
| 47 | + if (futimens_coreutils (dest_desc, dst_name, timespec) != 0) |
| 48 | { |
| 49 | error (0, errno, _("preserving times for %s"), quote (dst_name)); |
| 50 | if (x->require_preserve) |
| 51 | diff --git a/src/touch.c b/src/touch.c |
| 52 | index a79c26d..6ef317d 100644 |
| 53 | --- a/src/touch.c |
| 54 | +++ b/src/touch.c |
| 55 | @@ -182,7 +182,7 @@ touch (const char *file) |
| 56 | t = timespec; |
| 57 | } |
| 58 | |
| 59 | - ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); |
| 60 | + ok = (futimens_coreutils (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); |
| 61 | |
| 62 | if (fd == STDIN_FILENO) |
| 63 | { |