diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-05 14:53:31 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-05 14:53:31 +0000 |
commit | 53b17a769b873a889c15c4cf4d34e9a58a03b552 (patch) | |
tree | 6cdb94ca1cf22635587e8d1d0dd31d9e0af83900 /io.c | |
parent | 71e793533194e1dd03036b4e0c3cc4550d822477 (diff) | |
download | ruby-53b17a769b873a889c15c4cf4d34e9a58a03b552.tar.gz |
* internal.h (rb_exec_arg): use union to represent command invocation
with/without shell.
* process.c: follow the rb_exec_arg change.
* io.c (pipe_open): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -5584,8 +5584,8 @@ pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode, fd = arg.pair[1]; } #elif defined(_WIN32) - if (eargp && eargp->argv_str) { - args = ARGVSTR2ARGV(eargp->argv_str); + if (eargp && !eargp->use_shell) { + args = ARGVSTR2ARGV(eargp->invoke.cmd.argv_str); } switch (fmode & (FMODE_READABLE|FMODE_WRITABLE)) { case FMODE_READABLE|FMODE_WRITABLE: |