mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* win32/win32.c (w32_spawn): r41710 made that if the command starts with
a quote and includes slash, removed the top quote and NOT removed the last quote. this fixes test failures on test/ruby/test_process.rb and test/webrick. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
01ca13013a
commit
5716c5ef2c
2 changed files with 9 additions and 6 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
Fri Jul 5 11:08:00 2013 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
|
* win32/win32.c (w32_spawn): r41710 made that if the command starts with
|
||||||
|
a quote and includes slash, removed the top quote and NOT removed the
|
||||||
|
last quote.
|
||||||
|
this fixes test failures on test/ruby/test_process.rb and
|
||||||
|
test/webrick.
|
||||||
|
|
||||||
Fri Jul 5 09:53:15 2013 NARUSE, Yui <naruse@ruby-lang.org>
|
Fri Jul 5 09:53:15 2013 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
* lib/mkmf.rb (CONFIG['CPPOUTFILE']): fix r41769; CONFIG['CPPOUTFILE']
|
* lib/mkmf.rb (CONFIG['CPPOUTFILE']): fix r41769; CONFIG['CPPOUTFILE']
|
||||||
|
|
|
@ -1260,12 +1260,7 @@ w32_spawn(int mode, const char *cmd, const char *prog, UINT cp)
|
||||||
}
|
}
|
||||||
if ((unsigned char)*prog == quote) {
|
if ((unsigned char)*prog == quote) {
|
||||||
len = prog++ - cmd - 1;
|
len = prog++ - cmd - 1;
|
||||||
STRNDUPV(p, v2, cmd + 1 - slash, len + (slash ? strlen(prog) + 2 : 0));
|
STRNDUPV(p, v2, cmd + 1, len);
|
||||||
if (slash) {
|
|
||||||
cmd = p++;
|
|
||||||
sep = *(cmd_sep = &p[len + 1]);
|
|
||||||
*cmd_sep = '\0';
|
|
||||||
}
|
|
||||||
shell = p;
|
shell = p;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue