From 660fc730730aa4b567f2065363bb33d03105f9e1 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 2 Jan 2004 17:46:02 +0000 Subject: * rubysig.h (TRAP_END): preserve errno before switching context. [ruby-core:02137] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5366 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ rubysig.h | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed49627f1..38978cf91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jan 3 02:44:48 2004 Yukihiro Matsumoto + + * rubysig.h (TRAP_END): preserve errno before switching context. + [ruby-core:02137] + Sat Jan 3 01:18:08 2004 Yukihiro Matsumoto * dir.c: merge tuning from H.Yamamoto . diff --git a/rubysig.h b/rubysig.h index 6be634787..5b8ea4586 100644 --- a/rubysig.h +++ b/rubysig.h @@ -23,10 +23,13 @@ typedef LONG rb_atomic_t; /* Windows doesn't allow interrupt while system calls */ # define TRAP_BEG do {\ + extern int errno;\ rb_atomic_t trap_immediate = ATOMIC_SET(rb_trap_immediate, 1) # define TRAP_END\ - ATOMIC_SET(rb_trap_immediate, trap_immediate);\ - CHECK_INTS;\ + ATOMIC_SET(rb_trap_immediate, trap_immediate);\ + saved_errno = errno;\ + CHECK_INTS;\ + errno = saved_errno;\ } while (0) # define RUBY_CRITICAL(statements) do {\ rb_w32_enter_critical();\ @@ -42,10 +45,14 @@ typedef int rb_atomic_t; # define ATOMIC_DEC(var) (--(var)) # define TRAP_BEG do {\ + extern int errno;\ + int saved_errno = 0;\ int trap_immediate = rb_trap_immediate;\ rb_trap_immediate = 1 # define TRAP_END rb_trap_immediate = trap_immediate;\ - CHECK_INTS;\ + saved_errno = errno;\ + CHECK_INTS;\ + errno = saved_errno;\ } while (0) # define RUBY_CRITICAL(statements) do {\ -- cgit