X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Futimes.m4;h=e6d6f776499329fe76839f655ad97b1378320406;hb=3b905e0ad791b750d0a471c90ecaacf2345a39c3;hp=ba74b3f6e3a4d6becd406df6eb20cdc6f4b67fd4;hpb=48bde603f0ddf53ffad933b5fd4229bae039206e;p=gnulib.git

diff --git a/m4/utimes.m4 b/m4/utimes.m4
index ba74b3f6e..e6d6f7764 100644
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -1,6 +1,7 @@
 # Detect some bugs in glibc's implementation of utimes.
+# serial 2
 
-dnl Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2009-2010 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.
@@ -12,17 +13,20 @@ dnl with or without modifications, as long as this notice is preserved.
 # 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.
+# Finally, there was also a version of utimes that failed on read-only
+# files, while utime worked fine (linux-2.2.20, glibc-2.2.5).
 #
 # From Jim Meyering, with suggestions from Paul Eggert.
 
 AC_DEFUN([gl_FUNC_UTIMES],
 [
-  AC_CACHE_CHECK([determine whether the utimes function works],
-		 gl_cv_func_working_utimes,
+  AC_CACHE_CHECK([whether the utimes function works],
+                 [gl_cv_func_working_utimes],
   [
   AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
@@ -38,13 +42,14 @@ main ()
   char const *file = "conftest.utimes";
   FILE *f;
   time_t now;
+  int fd;
 
   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);
+            && 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);
   unlink (file);
   if (!ok)
     exit (1);
@@ -58,6 +63,13 @@ main ()
      && now - sbuf.st_atime <= 2
      && now - sbuf.st_mtime <= 2);
   unlink (file);
+  if (!ok)
+    exit (1);
+
+  ok = (0 <= (fd = open (file, O_WRONLY|O_CREAT, 0444))
+              && close (fd) == 0
+              && utimes (file, NULL) == 0);
+  unlink (file);
 
   exit (!ok);
 }
@@ -67,6 +79,6 @@ main ()
        [gl_cv_func_working_utimes=no])])
 
   if test $gl_cv_func_working_utimes = yes; then
-    AC_DEFINE([HAVE_WORKING_UTIMES], 1, [Define if utimes works properly. ])
+    AC_DEFINE([HAVE_WORKING_UTIMES], [1], [Define if utimes works properly. ])
   fi
 ])