X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Futimes.m4;h=593e43d88c8aadbff8fe46c4cca67d7abf6fe05e;hb=5bf73fbe89c75118e5e9a53e4b88a57729d26964;hp=dc93cf863c8e9125b5760b2d8e5421a1cf80356d;hpb=1f8c872f267bc608644d6de67aa5fab6285a8533;p=gnulib.git

diff --git a/m4/utimes.m4 b/m4/utimes.m4
index dc93cf863..593e43d88 100644
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -1,7 +1,7 @@
 # Detect some bugs in glibc's implementation of utimes.
 # serial 3
 
-dnl Copyright (C) 2003-2005, 2009-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -34,15 +34,21 @@ AC_DEFUN([gl_FUNC_UTIMES],
 #include <stdio.h>
 #include <utime.h>
 
+static int
+inorder (time_t a, time_t b, time_t c)
+{
+  return a <= b && b <= c;
+}
+
 int
 main ()
 {
   int result = 0;
   char const *file = "conftest.utimes";
+  static struct timeval timeval[2] = {{9, 10}, {999999, 999999}};
 
   /* Test whether utimes() essentially works.  */
   {
-    static struct timeval timeval[2] = {{9, 10}, {999999, 999999}};
     struct stat sbuf;
     FILE *f = fopen (file, "w");
     if (f == NULL)
@@ -56,37 +62,52 @@ main ()
     else if (!(sbuf.st_atime == timeval[0].tv_sec
                && sbuf.st_mtime == timeval[1].tv_sec))
       result |= 4;
-    unlink (file);
+    if (unlink (file) != 0)
+      result |= 1;
   }
 
   /* Test whether utimes() with a NULL argument sets the file's timestamp
-     to the current time.  Note that this test fails on NFS file systems
+     to the current time.  Use 'fstat' as well as 'time' to
+     determine the "current" time, to accommodate NFS file systems
      if there is a time skew between the host and the NFS server.  */
   {
-    struct stat sbuf;
-    FILE *f = fopen (file, "w");
-    if (f == NULL)
-      result |= 1;
-    else if (fclose (f) != 0)
+    int fd = open (file, O_WRONLY|O_CREAT, 0644);
+    if (fd < 0)
       result |= 1;
     else
       {
-        time_t now;
-        if (time (&now) == (time_t)-1)
+        time_t t0, t2;
+        struct stat st0, st1, st2;
+        if (time (&t0) == (time_t) -1)
+          result |= 1;
+        else if (fstat (fd, &st0) != 0)
           result |= 1;
+        else if (utimes (file, timeval) != 0)
+          result |= 2;
         else if (utimes (file, NULL) != 0)
           result |= 8;
-        else if (lstat (file, &sbuf) != 0)
+        else if (fstat (fd, &st1) != 0)
+          result |= 1;
+        else if (write (fd, "\n", 1) != 1)
+          result |= 1;
+        else if (fstat (fd, &st2) != 0)
+          result |= 1;
+        else if (time (&t2) == (time_t) -1)
           result |= 1;
         else
           {
-            if (!(now - sbuf.st_atime <= 2))
+            int m_ok_POSIX = inorder (t0, st1.st_mtime, t2);
+            int m_ok_NFS = inorder (st0.st_mtime, st1.st_mtime, st2.st_mtime);
+            if (! (st1.st_atime == st1.st_mtime))
               result |= 16;
-            if (!(now - sbuf.st_mtime <= 2))
+            if (! (m_ok_POSIX || m_ok_NFS))
               result |= 32;
           }
+        if (close (fd) != 0)
+          result |= 1;
       }
-    unlink (file);
+    if (unlink (file) != 0)
+      result |= 1;
   }
 
   /* Test whether utimes() with a NULL argument works on read-only files.  */
@@ -98,7 +119,8 @@ main ()
       result |= 1;
     else if (utimes (file, NULL) != 0)
       result |= 64;
-    unlink (file);
+    if (unlink (file) != 0)
+      result |= 1;
   }
 
   return result;