From a69db44acec55e04dc4a37800285ebb3c4767439 Mon Sep 17 00:00:00 2001 From: matz Date: Sun, 31 Oct 2004 17:37:52 +0000 Subject: * io.c (rb_f_open): create copy of popen specifier. [ruby-dev:24656] * string.c (rb_str_locktmp): lock string temporarily. * string.c (str_independent): add tmplock check. * io.c (io_write): lock output string temporarily. [ruby-dev:24649] * io.c (io_write): use rb_str_locktmp(). * io.c (read_all): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- process.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'process.c') diff --git a/process.c b/process.c index b7058b04c..bdf651f37 100644 --- a/process.c +++ b/process.c @@ -1260,14 +1260,17 @@ rb_f_exec(argc, argv) prog = rb_check_argv(argc, argv); if (!prog && argc == 1) { - --argc; - prog = *argv++; + e.argc = 0; + e.argv = 0; + e.prog = RSTRING(argv[0])->ptr; + } + else { + e.argc = argc; + e.argv = argv; + e.prog = RSTRING(prog)->ptr; } - e.argc = argc; - e.argv = argv; - e.prog = prog ? RSTRING(prog)->ptr : 0; rb_exec(&e); - rb_sys_fail(prog ? e.prog : RSTRING(argv[0])->ptr); + rb_sys_fail(e.prog); return Qnil; /* dummy */ } -- cgit