From 66d39f93b40b9af5b4eb626cd65df904cba0f8bc Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 26 Jan 2005 01:51:06 +0000 Subject: [PATCH] * win32/win32.c (flock_winnt, flock_win95): unlock file even if LOCK_NB is specified. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/win32.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7f73649c05..22c634d152 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 26 10:45:19 2005 NAKAMURA Usaku + + * win32/win32.c (flock_winnt, flock_win95): unlock file even if + LOCK_NB is specified. + Tue Jan 25 23:10:48 2005 Hidetoshi NAGAI * ext/tk: merge tcltklib for Ruby/Tk installation control diff --git a/win32/win32.c b/win32/win32.c index e8fea80729..9de71d7a25 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -289,6 +289,7 @@ flock_winnt(VALUE self, int argc, VALUE* argv) 0, LK_LEN, LK_LEN, &o), i); break; case LOCK_UN: /* unlock lock */ + case LOCK_UN|LOCK_NB: /* unlock is always non-blocking, I hope */ LK_ERR(UnlockFileEx(fh, 0, LK_LEN, LK_LEN, &o), i); break; default: /* unknown */ @@ -316,6 +317,7 @@ flock_win95(VALUE self, int argc, VALUE* argv) LK_ERR(LockFile(fh, 0, 0, LK_LEN, LK_LEN), i); break; case LOCK_UN: + case LOCK_UN|LOCK_NB: LK_ERR(UnlockFile(fh, 0, 0, LK_LEN, LK_LEN), i); break; default: