diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-14 04:49:01 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-14 04:49:01 +0000 |
| commit | f0ab5bdea254cedc620cd8de6add6e76ac57cabc (patch) | |
| tree | e0c59f4b7f399c1b8a6e1c9376c6e7345d90e49f | |
| parent | 8fe090790d6af1e5943cb6589eee16f9dd1c4250 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/win32.c | 5 |
2 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Feb 14 13:47:22 2006 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_utime): drop read-only attribute before + changing file time. + Tue Feb 14 13:38:01 2006 NAKAMURA Usaku <usa@ruby-lang.org> * 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; |