(futimens): Account for the fact that futimes

can also fail with errno == ENOENT or errno == ENOSYS.

diff --git a/lib/utimens.c b/lib/utimens.c
index ad5d8fb1aee9b499db6c4c2d8286d1e40c2012e0..4448f19f4777b1f57be7c56e9bf3d1e0ac505c05 100644 (file)
--- a/lib/utimens.c
+++ b/lib/utimens.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -24,6 +24,8 @@
 
 #include "utimens.h"
 
+#include <errno.h>
+
 #if HAVE_UTIME_H
 # include <utime.h>
 #endif
@@ -74,7 +76,22 @@ futimens (int fd ATTRIBUTE_UNUSED,
     t = NULL;
 # if HAVE_FUTIMES
   if (0 <= fd)
-    return futimes (fd, t);
+    {
+      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;
+       }
+    }
 # endif
   return utimes (file, t);