Work around tests/touch/empty-file failure on a system

(sparc64, Linux-2.4.28, glibc-2.3.3) that didn't honor utimes'
NULL-means-set-to-current-time semantics.
Remove temporary file immediately, rather than waiting
for configure's at-exit trap code to do it.

diff --git a/m4/utimes.m4 b/m4/utimes.m4
index dae46f00eb5c072de2cfa151ee2a7dd693267d8c..784516cc31e3421af8ffeac262122d327670a60c 100644 (file)
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -3,6 +3,8 @@
 # First, there was a bug that would make utimes set mtime
 # and atime to zero (1970-01-01) unconditionally.
 # 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 +17,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 +30,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],