summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--win32/win32.c8
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cff28b6d94..b4ad74d48a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 23 19:51:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_spawn): deals with quoted commands.
+
Tue Dec 23 18:44:21 2008 Tanaka Akira <akr@fsij.org>
* strftime.c (rb_strftime): use locale insensitive functions for tr_TR
diff --git a/win32/win32.c b/win32/win32.c
index e111bf87ec..d346a925d6 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -918,6 +918,13 @@ rb_w32_spawn(int mode, const char *cmd, const char *prog)
}
else {
int len = 0;
+ if (*cmd == '"') {
+ for (prog = cmd + 1; *prog && *prog != '"'; prog = CharNext(prog));
+ len = prog - cmd - 1;
+ STRNDUPA(p, cmd + 1, len);
+ p = dln_find_exe_r(p, NULL, fbuf, sizeof(fbuf));
+ if (p) goto command_found;
+ }
for (prog = cmd; *prog; prog = CharNext(prog)) {
if (ISSPACE(*prog)) {
len = prog - cmd;
@@ -955,6 +962,7 @@ rb_w32_spawn(int mode, const char *cmd, const char *prog)
}
}
if (p) {
+ command_found:
shell = p;
translate_char(p, '/', '\\');
}