diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-06-20 08:17:53 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-06-20 08:17:53 +0000 |
| commit | 777af545552b1cfcb073580d217287df52c87d23 (patch) | |
| tree | 5143f75961c0b79afea08c2beb768c40b8847d73 /win32/win32.c | |
| parent | 6ef0e081a1c288a39264242b972c64d33dc03536 (diff) | |
| download | ruby-777af545552b1cfcb073580d217287df52c87d23.tar.gz ruby-777af545552b1cfcb073580d217287df52c87d23.tar.xz ruby-777af545552b1cfcb073580d217287df52c87d23.zip | |
* ext/dbm/dbm.c (fdbm_closed): new method DBM#closed?
* ext/gdbm/gdbm.c (fgdbm_closed): new method GDBM#closed?
* ext/sdbm/init.c (fsdbm_closed): new method SDBM#closed?
* test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb
(teardown): close all db objects before deleting data files.
* win32/win32.{ch} (unlink): hook runtime function to change
file attribute before unlinking.
merge from 1.8, see [ruby-dev:26360]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.c')
| -rw-r--r-- | win32/win32.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/win32/win32.c b/win32/win32.c index 3e126e64f..4c916f15c 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3638,6 +3638,26 @@ rb_w32_rmdir(const char *path) return ret; } +#undef unlink +int +rb_w32_unlink(const char *path) +{ + DWORD attr; + int ret; + RUBY_CRITICAL({ + attr = GetFileAttributes(path); + if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) { + attr &= ~FILE_ATTRIBUTE_READONLY; + SetFileAttributes(path, attr); + } + ret = unlink(path); + if (ret < 0 && attr != (DWORD)-1) { + SetFileAttributes(path, attr); + } + }); + return ret; +} + // // Fix bcc32's stdio bug // |