[patch] coreutils-6.9-glibc-2.6.patch

coreutils-6.9-glibc-2.6.patch (text/plain), 2.52 KB, created by Ryan Hill (RETIRED) on 2007-06-25 02:18:05 UTC

diff -Naur coreutils-6.9-orig/lib/utimens.c coreutils-6.9/lib/utimens.c
--- coreutils-6.9-orig/lib/utimens.c	2007-06-24 19:49:04.000000000 -0600
+++ coreutils-6.9/lib/utimens.c	2007-06-24 20:10:15.000000000 -0600
@@ -75,8 +75,8 @@
    Return 0 on success, -1 (setting errno) on failure.  */
 
 int
-futimens (int fd ATTRIBUTE_UNUSED,
-	  char const *file, struct timespec const timespec[2])
+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
      of files in NFS file systems in some cases.  We have no
@@ -185,5 +185,5 @@
 int
 utimens (char const *file, struct timespec const timespec[2])
 {
-  return futimens (-1, file, timespec);
+  return gl_futimens (-1, file, timespec);
 }
diff -Naur coreutils-6.9-orig/lib/utimens.h coreutils-6.9/lib/utimens.h
--- coreutils-6.9-orig/lib/utimens.h	2007-02-23 12:25:21.000000000 -0600
+++ coreutils-6.9/lib/utimens.h	2007-06-24 20:10:27.000000000 -0600
@@ -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 -Naur coreutils-6.9-orig/src/copy.c coreutils-6.9/src/copy.c
--- coreutils-6.9-orig/src/copy.c	2007-06-24 19:49:04.000000000 -0600
+++ coreutils-6.9/src/copy.c	2007-06-24 20:09:32.000000000 -0600
@@ -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 -Naur coreutils-6.9-orig/src/touch.c coreutils-6.9/src/touch.c
--- coreutils-6.9-orig/src/touch.c	2007-03-18 15:36:43.000000000 -0600
+++ coreutils-6.9/src/touch.c	2007-06-24 20:09:42.000000000 -0600
@@ -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 @@
       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)
     {