kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/win32.c: revert r30987 because it causes some failures in

Browse source 
test-all, especially webrick.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2011-03-01 07:23:37 +00:00
parent 6016591e1c
commit 86bb0af7ea
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Tue Mar 1 15:59:53 2011 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (rb_str_byteslice): the resulted encoding should keep * string.c (rb_str_byteslice): the resulted encoding should keep

9
win32/win32.c
View file

@ -851,9 +851,6 @@ is_internal_cmd(const char *cmd, int nt)
{ {
char cmdname[9], *b = cmdname, c; char cmdname[9], *b = cmdname, c;
if (strchr(cmd, '^'))
return 1;
do { do {
if (!(c = *cmd++)) return 0; if (!(c = *cmd++)) return 0;
} while (isspace(c)); } while (isspace(c));
@ -1141,12 +1138,6 @@ rb_w32_spawn(int mode, const char *cmd, const char *prog)
sprintf(tmp, "%s -c \"%s\"", shell, cmd); sprintf(tmp, "%s -c \"%s\"", shell, cmd);
cmd = tmp; 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")) && else if ((shell = getenv("COMSPEC")) &&
(nt = !is_command_com(shell), (nt = !is_command_com(shell),
(redir < 0 ? has_redirection(cmd) : redir) || (redir < 0 ? has_redirection(cmd) : redir) ||