From f0ab5bdea254cedc620cd8de6add6e76ac57cabc Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 14 Feb 2006 04:49:01 +0000 Subject: [PATCH] * win32/win32.c (rb_w32_utime): drop read-only attribute before changing file time. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/win32.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7f09a4b77d..57cc743bf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 14 13:47:22 2006 NAKAMURA Usaku + + * win32/win32.c (rb_w32_utime): drop read-only attribute before + changing file time. + Tue Feb 14 13:38:01 2006 NAKAMURA Usaku * win32/Makefile.sub (config.h): should define HAVE_LONG_LONG with diff --git a/win32/win32.c b/win32/win32.c index b1c6197ec2..973a795c46 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3871,6 +3871,9 @@ rb_w32_utime(const char *path, const struct utimbuf *times) } RUBY_CRITICAL({ + const DWORD attr = GetFileAttributes(path); + if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) + SetFileAttributes(path, attr & ~FILE_ATTRIBUTE_READONLY); hFile = CreateFile(path, GENERIC_WRITE, 0, 0, OPEN_EXISTING, IsWin95() ? 0 : FILE_FLAG_BACKUP_SEMANTICS, 0); if (hFile == INVALID_HANDLE_VALUE) { @@ -3884,6 +3887,8 @@ rb_w32_utime(const char *path, const struct utimbuf *times) } CloseHandle(hFile); } + if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) + SetFileAttributes(path, attr); }); return ret;