From 450fc7bb5706d63834807790f9f779393f5ad0c1 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 18 Oct 2006 14:03:43 +0000
Subject: [PATCH] * win32/win32.c (rb_w32_utime): allow NULL to set the current
 time.   [ruby-talk:219248]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog     |  5 ++++-
 win32/win32.c | 14 ++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 859047b2c0..08bb4a378d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,12 @@
-Wed Oct 18 22:58:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct 18 23:02:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (rb_ary_shift): shorten copy size.  fixed: [ruby-list:42907]
 
 	* signal.c (Init_signal): handle SIGTERM.  fixed: [ruby-list:42895]
 
+	* win32/win32.c (rb_w32_utime): allow NULL to set the current time.
+	  [ruby-talk:219248]
+
 Wed Oct 18 13:25:50 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_each_line): String#lines now works when a block
diff --git a/win32/win32.c b/win32/win32.c
index de0da968f3..7c7f310bb0 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4117,11 +4117,17 @@ rb_w32_utime(const char *path, const struct utimbuf *times)
 	return -1;
     }
 
-    if (unixtime_to_filetime(times->actime, &atime)) {
-	return -1;
+    if (times) {
+	if (unixtime_to_filetime(times->actime, &atime)) {
+	    return -1;
+	}
+	if (unixtime_to_filetime(times->modtime, &mtime)) {
+	    return -1;
+	}
     }
-    if (unixtime_to_filetime(times->modtime, &mtime)) {
-	return -1;
+    else {
+	GetSystemTimeAsFileTime(&atime);
+	mtime = atime;
     }
 
     RUBY_CRITICAL({