2 files changed, 22 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 047bc9b09..b6008c1fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 19 18:46:49 2007  Tanaka Akira  <akr@fsij.org>
+
+	* file.c (utime_internal): fallback utimensat to utimes.
+
 Mon Nov 19 17:51:27 2007  Tanaka Akira  <akr@fsij.org>
 
 	* configure.in: check struct timespec, clock_gettime, utimensat,
diff --git a/file.c b/file.c
index 6f199f662..a7822d0c3 100644
--- a/file.c
+++ b/file.c
@@ -2041,23 +2041,31 @@ rb_file_s_lchown(int argc, VALUE *argv)
 
 struct timespec rb_time_timespec(VALUE time);
 
-#if defined(HAVE_UTIMENSAT)
+#if defined(HAVE_UTIMES)
 
 static void
 utime_internal(const char *path, void *arg)
 {
     struct timespec *tsp = arg;
-    if (utimensat(AT_FDCWD, path, tsp, 0) < 0)
-	rb_sys_fail(path);
-}
+    struct timeval tvbuf[2], *tvp = arg;
 
-#elif defined(HAVE_UTIMES)
+#ifdef HAVE_UTIMENSAT
+    static int try_utimensat = 1;
+
+    if (try_utimensat) {
+        struct timespec *tsp = arg;
+        if (utimensat(AT_FDCWD, path, tsp, 0) < 0) {
+            if (errno == ENOSYS) {
+                try_utimensat = 0;
+                goto no_utimensat;
+            }
+            rb_sys_fail(path);
+        }
+        return;
+    }
+no_utimensat:
+#endif
 
-static void
-utime_internal(const char *path, void *arg)
-{
-    struct timespec *tsp = arg;
-    struct timeval tvbuf[2], *tvp = arg;
     if (tsp) {
         tvbuf[0].tv_sec = tsp[0].tv_sec;
         tvbuf[0].tv_usec = tsp[0].tv_nsec / 1000;