X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Futimes.m4;h=ba74b3f6e3a4d6becd406df6eb20cdc6f4b67fd4;hb=5cc13c0f36d18dd428c7cceebd30ff8de6e2ff1e;hp=3b8d945ac25558fc0dd327cf9c4bf1128f5dff93;hpb=078bf4ac2813c5a3a93e5d57b5b42c3419aa63a0;p=gnulib.git

diff --git a/m4/utimes.m4 b/m4/utimes.m4
index 3b8d945ac..ba74b3f6e 100644
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -1,8 +1,17 @@
+# Detect some bugs in glibc's implementation of utimes.
+
+dnl Copyright (C) 2003, 2004, 2005 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.
+
 # See if we need to work around bugs in glibc's implementation of
-# utimes from around July/August 2003.
+# utimes from 2003-07-12 to 2003-09-17.
 # First, there was a bug that would make utimes set mtime
 # and atime to zero (1970-01-01) unconditionally.
-# Then, there is/was code to round rather than truncate.
+# Then, there was code to round rather than truncate.
+# Then, there was an implementation (sparc64, Linux-2.4.28, glibc-2.3.3)
+# that didn't honor the NULL-means-set-to-current-time semantics.
 #
 # From Jim Meyering, with suggestions from Paul Eggert.
 
@@ -15,6 +24,7 @@ AC_DEFUN([gl_FUNC_UTIMES],
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <time.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -27,13 +37,29 @@ main ()
   struct stat sbuf;
   char const *file = "conftest.utimes";
   FILE *f;
+  time_t now;
 
-  exit ( ! ((f = fopen (file, "w"))
+  int ok = ((f = fopen (file, "w"))
 	    && fclose (f) == 0
 	    && utimes (file, timeval) == 0
 	    && lstat (file, &sbuf) == 0
 	    && sbuf.st_atime == timeval[0].tv_sec
-	    && sbuf.st_mtime == timeval[1].tv_sec) );
+	    && sbuf.st_mtime == timeval[1].tv_sec);
+  unlink (file);
+  if (!ok)
+    exit (1);
+
+  ok =
+    ((f = fopen (file, "w"))
+     && fclose (f) == 0
+     && time (&now) != (time_t)-1
+     && utimes (file, NULL) == 0
+     && lstat (file, &sbuf) == 0
+     && now - sbuf.st_atime <= 2
+     && now - sbuf.st_mtime <= 2);
+  unlink (file);
+
+  exit (!ok);
 }
   ]])],
        [gl_cv_func_working_utimes=yes],