summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-22 01:01:26 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-22 01:01:26 +0000
commit730e44efc868ee7860d46e8933ec8e59ae16d950 (patch)
treea8a5339430928c9035291d181c76913313f45cf2
parentd3c8811a5bbc1d4e1954ca771cfa83fca8a48b33 (diff)
* win32/win32.c (CreateChild): enclose command line except for
command.com which can not handle quotes. [ruby-talk:258939] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@13168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--version.h2
-rw-r--r--win32/win32.c29
3 files changed, 25 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index ebb6d05..62d55b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 22 10:01:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (CreateChild): enclose command line except for
+ command.com which can not handle quotes. [ruby-talk:258939]
+
Wed Aug 22 09:58:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand
diff --git a/version.h b/version.h
index 2f8b06d..facb4be 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-08-22"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 58
+#define RUBY_PATCHLEVEL 59
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
diff --git a/win32/win32.c b/win32/win32.c
index 606f4bf..af4631e 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -506,7 +506,7 @@ FindFreeChildSlot(void)
-e 'END{$cmds.sort.each{|n,f|puts " \"\\#{f.to_s(8)}\" #{n.dump} + 1,"}}'
98cmd ntcmd
*/
-static char *szInternalCmds[] = {
+static const char *const szInternalCmds[] = {
"\2" "assoc" + 1,
"\3" "break" + 1,
"\3" "call" + 1,
@@ -565,16 +565,22 @@ internal_match(const void *key, const void *elem)
}
static int
-isInternalCmd(const char *cmd, const char *interp)
+is_command_com(const char *interp)
{
- int i, nt = 1;
- char cmdname[9], *b = cmdname, c, **nm;
+ int i = strlen(interp) - 11;
- i = strlen(interp) - 11;
if ((i == 0 || i > 0 && isdirsep(interp[i-1])) &&
strcasecmp(interp+i, "command.com") == 0) {
- nt = 0;
+ return 1;
}
+ return 0;
+}
+
+static int
+is_internal_cmd(const char *cmd, int nt)
+{
+ char cmdname[9], *b = cmdname, c, **nm;
+
do {
if (!(c = *cmd++)) return 0;
} while (isspace(c));
@@ -942,6 +948,7 @@ CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa,
else {
int redir = -1;
int len = 0;
+ int nt;
while (ISSPACE(*cmd)) cmd++;
for (prog = cmd; *prog; prog = CharNext(prog)) {
if (ISSPACE(*prog)) {
@@ -960,10 +967,12 @@ CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa,
cmd = tmp;
}
else if ((shell = getenv("COMSPEC")) &&
- ((redir < 0 ? has_redirection(cmd) : redir) ||
- isInternalCmd(cmd, shell))) {
- char *tmp = ALLOCA_N(char, strlen(shell) + len + sizeof(" /c "));
- sprintf(tmp, "%s /c %.*s", shell, len, cmd);
+ (nt = !is_command_com(shell),
+ (redir < 0 ? has_redirection(cmd) : redir) ||
+ is_internal_cmd(cmd, nt))) {
+ char *tmp = ALLOCA_N(char, strlen(shell) + len + sizeof(" /c ")
+ + (nt ? 2 : 0));
+ sprintf(tmp, nt ? "%s /c \"%.*s\"" : "%s /c %.*s", shell, len, cmd);
cmd = tmp;
}
else {