* lib/utimens.c (futimens) [HAVE_WORKING_UTIMES && HAVE_FUTIMES]:

Don't assume that futimes failing means we mustfail.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 87bf2c246ac5c14a834e4e5da75c257422c18aa3..bb1edf84fc316bece5ce93259a1c88078be7ebac 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix porting problem reported by Theodoros V. Kalamatianos.
+       * utimens.c (futimens) [HAVE_WORKING_UTIMES && HAVE_FUTIMES]:
+       Don't assume that futimes failing means we mustfail.
+
 2005-10-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        * getcwd.c (__getcwd): Don't assume that system calls after readdir

diff --git a/lib/utimens.c b/lib/utimens.c
index 7f88f2fa960cd63d14d7283ebfcd7546759d4457..8d8bef468ecdef2f444f2434d20cdbdbe3e0a31b 100644 (file)
--- a/lib/utimens.c
+++ b/lib/utimens.c
@@ -99,17 +99,15 @@ futimens (int fd ATTRIBUTE_UNUSED,
       if (futimes (fd, t) == 0)
        return 0;
 
-      /* On GNU/Linux without the futimes syscall and without /proc
-        mounted, glibc futimes fails with errno == ENOENT.  Fall back
-        on utimes if we get a weird error number like that.  */
-      switch (errno)
-       {
-       case EACCES:
-       case EIO:
-       case EPERM:
-       case EROFS:
-         return -1;
-       }
+      /* Don't worry about trying to speed things up by returning right
+        away here.  glibc futimes can incorrectly fail with errno ==
+        ENOENT if /proc isn't mounted.  Also, Mandrake 10.0 in high
+        security mode doesn't allow ordinary users to read /proc/self, so
+        glibc futimes incorrectly fails with errno == EACCES.  If futimes
+        fails with errno == EIO, EPERM, or EROFS, it's probably safe to
+        fail right away, but these cases are rare enough that they're not
+        worth optimizing, and who knows what other messed-up systems are
+        out there?  So play it safe and fall back on the code below.  */
     }
 # endif
 #endif