Attachment 156020 Details for Bug 242321 – proposed patch

[patch] proposed patch

coreutils-6.9-futimens.patch (text/plain), 2.43 KB, created by Marek Mahut on 2007-06-03 11:29:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Mahut

Created: 2007-06-03 11:29:57 UTC

Size: 2.43 KB

patch

obsolete

>diff -puNr coreutils-6.9/lib/utimens.c coreutils-6.9-patched/lib/utimens.c
>--- coreutils-6.9/lib/utimens.c2007-01-18 09:33:34.000000000 +0100
>+++ coreutils-6.9-patched/lib/utimens.c2007-06-03 10:30:51.000000000 +0200
>@@ -75,7 +75,7 @@ struct utimbuf
>    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])
> {
>   /* Some Linux-based NFS clients are buggy, and mishandle time stamps
>@@ -185,5 +185,5 @@ futimens (int fd ATTRIBUTE_UNUSED,
> int
> utimens (char const *file, struct timespec const timespec[2])
> {
>-  return futimens (-1, file, timespec);
>+  return gl_futimens (-1, file, timespec);
> }
>diff -puNr coreutils-6.9/lib/utimens.h coreutils-6.9-patched/lib/utimens.h
>--- coreutils-6.9/lib/utimens.h2007-02-23 19:25:21.000000000 +0100
>+++ coreutils-6.9-patched/lib/utimens.h2007-06-03 10:30:55.000000000 +0200
>@@ -1,3 +1,3 @@
> #include <time.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 -puNr coreutils-6.9/src/copy.c coreutils-6.9-patched/src/copy.c
>--- coreutils-6.9/src/copy.c2007-03-18 22:36:43.000000000 +0100
>+++ coreutils-6.9-patched/src/copy.c2007-06-03 10:30:44.000000000 +0200
>@@ -518,7 +518,7 @@ copy_reg (char const *src_name, char con
>       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 -puNr coreutils-6.9/src/touch.c coreutils-6.9-patched/src/touch.c
>--- coreutils-6.9/src/touch.c2007-03-18 22:36:43.000000000 +0100
>+++ coreutils-6.9-patched/src/touch.c2007-06-03 10:30:48.000000000 +0200
>@@ -167,7 +167,7 @@ touch (const char *file)
> 
>   if (amtime_now)
>     {
>-      /* Pass NULL to futimens so it will not fail if we have
>+      /* Pass NULL to gl_futimens so it will not fail if we have
>  write access to the file, but don't own it.  */
>       t = NULL;
>     }
>@@ -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)
>     {

Actions: View | Diff

Attachments on bug 242321: 156019 | 156020