diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/win32.c | 7 |
2 files changed, 6 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Fri Jul 8 14:40:39 2011 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (wunlink): reverted a part of r32426. it was mistakenly + mixed. + Fri Jul 8 14:29:47 2011 Narihiro Nakamura <authornari@gmail.com> * configure.in: can't subtract void *. diff --git a/win32/win32.c b/win32/win32.c index e3bba4412f..6699c2cd44 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -5642,18 +5642,13 @@ wunlink(const WCHAR *path) if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) { SetFileAttributesW(path, attr & ~FILE_ATTRIBUTE_READONLY); } - if (DeleteFileW(path) == FALSE) { + if (!DeleteFileW(path)) { errno = map_errno(GetLastError()); ret = -1; if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) { SetFileAttributesW(path, attr); } } - else { - while (GetFileAttributesW(path) != (DWORD)-1 || GetLastError() != ERROR_FILE_NOT_FOUND) { - Sleep(0); - } - } }); return ret; } |