From 12551ae5732e83e8ba77cf68c3501529d608c282 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 5 Mar 2008 08:53:08 +0000 Subject: [PATCH] * file.c (rb_file_flock): returns false on EAGAIN if non-blocking. [ruby-core:15795] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ file.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbe8b29e5c..05a320f3b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 5 17:53:01 2008 Nobuyoshi Nakada + + * file.c (rb_file_flock): returns false on EAGAIN if non-blocking. + [ruby-core:15795] + Web Mar 5 17:43:43 2008 Martin Duerst * transcode.c (transcode_loop): Adjusted detection of invalid diff --git a/file.c b/file.c index e7089d88aa..c32afbc103 100644 --- a/file.c +++ b/file.c @@ -3273,7 +3273,7 @@ rb_file_flock(VALUE obj, VALUE operation) #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN case EWOULDBLOCK: #endif - if (op1 & LOCK_NB) goto exit; + if (op1 & LOCK_NB) return Qfalse; rb_thread_polling(); rb_io_check_closed(fptr); continue; @@ -3288,7 +3288,6 @@ rb_file_flock(VALUE obj, VALUE operation) rb_sys_fail(fptr->path); } } - exit: #endif return INT2FIX(0); }