From 790dc105cd3d099e96a4d4cdf059cbd1a38ca78b Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 18 Sep 2005 18:22:44 +0000
Subject: * file.c (rb_thread_flock): wrap the flock system call by  
 TRAP_BEG/TRAP_END to enable signals.  [ruby-dev:27122]

* ext/socket/socket.c (bsock_send): wrap the sendto and send system
  call by TRAP_BEG/TRAP_END to enable signals when writing to a socket
  which is full.  [ruby-dev:27132]

* io.c (rb_io_syswrite): wrap the write system call by
  TRAP_BEG/TRAP_END to enable signals when writing to a pipe which is
  full.  [ruby-dev:27134]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 file.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'file.c')

diff --git a/file.c b/file.c
index 818d8087b..0f35ec074 100644
--- a/file.c
+++ b/file.c
@@ -2915,7 +2915,11 @@ rb_thread_flock(fd, op, fptr)
     OpenFile *fptr;
 {
     if (rb_thread_alone() || (op & LOCK_NB)) {
-	return flock(fd, op);
+        int ret;
+        TRAP_BEG;
+	ret = flock(fd, op);
+        TRAP_END;
+	return ret;
     }
     op |= LOCK_NB;
     while (flock(fd, op) < 0) {
-- 
cgit