* 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 run signal hander in syswrite method.
  [ruby-dev:27134]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 1 deletions

diff --git a/file.c b/file.c
index 4e58a538c9..740ec77bda 100644
--- a/file.c
+++ b/file.c
@@ -2884,7 +2884,11 @@ static int
 rb_thread_flock(int fd, int op, 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) {