diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | win32/win32.c | 7 |
2 files changed, 9 insertions, 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> * lib/mkmf.rb (CONFIG['CPPOUTFILE']): fix r41769; CONFIG['CPPOUTFILE'] diff --git a/win32/win32.c b/win32/win32.c index c76f89a48a..6c27ffa277 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1260,12 +1260,7 @@ w32_spawn(int mode, const char *cmd, const char *prog, UINT cp) } if ((unsigned char)*prog == quote) { len = prog++ - cmd - 1; - STRNDUPV(p, v2, cmd + 1 - slash, len + (slash ? strlen(prog) + 2 : 0)); - if (slash) { - cmd = p++; - sep = *(cmd_sep = &p[len + 1]); - *cmd_sep = '\0'; - } + STRNDUPV(p, v2, cmd + 1, len); shell = p; break; } |