kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* signal.c (trap): return "DEFAULT" and "IGNORE" respectively for

Browse source 
previous sighandler SIG_DFL and SIG_IGN. [ruby-talk:67860]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3614 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2003-03-25 15:25:18 +00:00
parent cd6f64e37c
commit 80a97f173f
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Mar 25 23:26:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* signal.c (trap): return "DEFAULT" and "IGNORE" respectively for
previous sighandler SIG_DFL and SIG_IGN. [ruby-talk:67860]
Tue Mar 25 12:24:15 2003 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Mar 25 12:24:15 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_yield_0): call avalue_to_mrhs() to assign block * eval.c (rb_yield_0): call avalue_to_mrhs() to assign block

5
sample/test.rb
View file

@ -248,6 +248,11 @@ f = lambda {|r,*l| test_ok([] == r); test_ok([1] == l)}
f.call([], *[1]) f.call([], *[1])
f.yield([], *[1]) f.yield([], *[1])
a = [42,55]
lambda{|x| test_ok([42,55] == x)}.call(a)
lambda{|x,| test_ok([42,55] == x)}.call(a)
lambda{|*x| test_ok([[42,55]] == x)}.call(a)
a,=*[1] a,=*[1]
test_ok(a == 1) test_ok(a == 1)

16
signal.c
View file

@ -481,8 +481,8 @@ static VALUE
trap(arg) trap(arg)
struct trap_arg *arg; struct trap_arg *arg;
{ {
sighandler_t func; sighandler_t func, oldfunc;
VALUE command, old; VALUE command, oldcmd;
int sig = -1; int sig = -1;
char *s; char *s;
@ -588,9 +588,13 @@ trap(arg)
#endif #endif
} }
} }
ruby_signal(sig, func); oldfunc = ruby_signal(sig, func);
old = trap_list[sig]; oldcmd = trap_list[sig];
if (!old) old = Qnil; if (!oldcmd) {
if (oldfunc == SIG_IGN) oldcmd = rb_str_new2("IGNORE");
else if (oldfunc == sighandler) oldcmd = rb_str_new2("DEFAULT");
else oldcmd = Qnil;
}
trap_list[sig] = command; trap_list[sig] = command;
/* enable at least specified signal. */ /* enable at least specified signal. */
@ -601,7 +605,7 @@ trap(arg)
arg->mask &= ~sigmask(sig); arg->mask &= ~sigmask(sig);
#endif #endif
#endif #endif
return old; return oldcmd;
} }
#ifndef _WIN32 #ifndef _WIN32