nobu	2008-03-05 17:53:08 +0900 (Wed, 05 Mar 2008)

  New Revision: 15693

  Modified files:
    trunk/ChangeLog
    trunk/file.c

  Log:
    * file.c (rb_file_flock): returns false on EAGAIN if non-blocking.
      [ruby-core:15795]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/file.c?r1=15693&r2=15692&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15693&r2=15692&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15692)
+++ ChangeLog	(revision 15693)
@@ -1,3 +1,8 @@
+Wed Mar  5 17:53:01 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (rb_file_flock): returns false on EAGAIN if non-blocking.
+	  [ruby-core:15795]
+
 Web Mar  5 17:43:43 2008  Martin Duerst  <duerst@i...>
 
 	* transcode.c (transcode_loop): Adjusted detection of invalid
Index: file.c
===================================================================
--- file.c	(revision 15692)
+++ file.c	(revision 15693)
@@ -3273,7 +3273,7 @@
 #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_sys_fail(fptr->path);
 	}
     }
-  exit:
 #endif
     return INT2FIX(0);
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/