diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/win32.c | 9 |
2 files changed, 5 insertions, 9 deletions
@@ -1,3 +1,8 @@ +Tue Mar 1 16:22:22 2011 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c: revert r30987 because it causes some failures in + test-all, especially webrick. + Tue Mar 1 15:59:53 2011 NARUSE, Yui <naruse@ruby-lang.org> * string.c (rb_str_byteslice): the resulted encoding should keep diff --git a/win32/win32.c b/win32/win32.c index 1e658de156..99802d07d0 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -851,9 +851,6 @@ is_internal_cmd(const char *cmd, int nt) { char cmdname[9], *b = cmdname, c; - if (strchr(cmd, '^')) - return 1; - do { if (!(c = *cmd++)) return 0; } while (isspace(c)); @@ -1142,12 +1139,6 @@ rb_w32_spawn(int mode, const char *cmd, const char *prog) cmd = tmp; } else if ((shell = getenv("COMSPEC")) && - strchr(cmd, '"')) { - char *tmp = ALLOCV(v, strlen(shell) + strlen(cmd) + sizeof(" /c ")); - sprintf(tmp, "%s /c %s", shell, cmd); - cmd = tmp; - } - else if ((shell = getenv("COMSPEC")) && (nt = !is_command_com(shell), (redir < 0 ? has_redirection(cmd) : redir) || is_internal_cmd(cmd, nt))) { |