archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 02:53:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* include/ruby/intern.h (rb_hash_dup): declared.

Browse source 
* hash.c (rb_hash_dup): new function.

* process.c (rb_spawn_internal): don't modify option hash.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-04-26 12:52:25 +00:00
parent 6fb36ebab0
commit 514715250a
5 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sat Apr 26 21:30:40 2008 Tanaka Akira <akr@fsij.org>
* include/ruby/intern.h (rb_hash_dup): declared.
* hash.c (rb_hash_dup): new function.
* process.c (rb_spawn_internal): don't modify option hash.
Sat Apr 26 18:36:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Apr 26 18:36:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c, signal.c, thread.c, thread_win32.c, include/ruby/intern.h: * io.c, signal.c, thread.c, thread_win32.c, include/ruby/intern.h:

13
hash.c
View file

@ -228,6 +228,19 @@ rb_hash_new(void)
return hash_alloc(rb_cHash); return hash_alloc(rb_cHash);
} }
VALUE
rb_hash_dup(VALUE hash)
{
VALUE ret = hash_alloc(RBASIC(hash)->klass);
if (!RHASH_EMPTY_P(hash))
RHASH(ret)->ntbl = st_copy(RHASH(hash)->ntbl);
if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
FL_SET(ret, HASH_PROC_DEFAULT);
}
RHASH(ret)->ifnone = RHASH(hash)->ifnone;
return ret;
}
static void static void
rb_hash_modify_check(VALUE hash) rb_hash_modify_check(VALUE hash)
{ {

1
include/ruby/intern.h
View file

@ -344,6 +344,7 @@ void st_foreach_safe(struct st_table *, int (*)(ANYARGS), st_data_t);
void rb_hash_foreach(VALUE, int (*)(ANYARGS), VALUE); void rb_hash_foreach(VALUE, int (*)(ANYARGS), VALUE);
VALUE rb_hash(VALUE); VALUE rb_hash(VALUE);
VALUE rb_hash_new(void); VALUE rb_hash_new(void);
VALUE rb_hash_dup(VALUE);
VALUE rb_hash_freeze(VALUE); VALUE rb_hash_freeze(VALUE);
VALUE rb_hash_aref(VALUE, VALUE); VALUE rb_hash_aref(VALUE, VALUE);
VALUE rb_hash_lookup(VALUE, VALUE); VALUE rb_hash_lookup(VALUE, VALUE);

4
process.c
View file

@ -2560,6 +2560,10 @@ rb_spawn_internal(int argc, VALUE *argv, int default_close_others)
opthash = rb_hash_new(); opthash = rb_hash_new();
RBASIC(opthash)->klass = 0; RBASIC(opthash)->klass = 0;
} }
if (RBASIC(opthash)->klass) {
opthash = rb_hash_dup(opthash);
RBASIC(opthash)->klass = 0;
}
if (!st_lookup(RHASH_TBL(opthash), close_others, 0)) if (!st_lookup(RHASH_TBL(opthash), close_others, 0))
rb_hash_aset(opthash, close_others, Qtrue); rb_hash_aset(opthash, close_others, Qtrue);
} }

15
test/ruby/test_process.rb
View file

@ -500,6 +500,21 @@ class TestProcess < Test::Unit::TestCase
} }
end end
def test_execopts_modification
h = {}
Process.wait spawn(EnvUtil.rubybin, '-e', '', h)
assert_equal({}, h)
h = {}
system(EnvUtil.rubybin, '-e', '', h)
assert_equal({}, h)
h = {}
io = IO.popen([EnvUtil.rubybin, '-e', '', h])
io.close
assert_equal({}, h)
end
def test_system def test_system
str = "echo fofo" str = "echo fofo"
assert_nil(system([str, str])) assert_nil(system([str, str]))