summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-01 10:13:41 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-01 10:13:41 +0000
commit4912ccb2a70f623235013fb3699c24dbc6a6176a (patch)
treea558ce92fc5efb23b31d978e388ee1c936d20588
parent46eea445ed3c026791af6775eb19b5a2eec04ffc (diff)
downloadruby-4912ccb2a70f623235013fb3699c24dbc6a6176a.tar.gz
ruby-4912ccb2a70f623235013fb3699c24dbc6a6176a.tar.xz
ruby-4912ccb2a70f623235013fb3699c24dbc6a6176a.zip
* win32/win32.c (rb_w32_cmdvector): backslashes inside single-quotes
no longer has special meanings. fixed: [ruby-list:42311] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10202 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0420366a5..b6f549e82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 1 19:12:37 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_cmdvector): backslashes inside single-quotes
+ no longer has special meanings. fixed: [ruby-list:42311]
+
Thu Jun 1 16:14:41 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_getcwd): runtime's getcwd() will not success
diff --git a/win32/win32.c b/win32/win32.c
index f06073e00..74ecebb91 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1185,7 +1185,7 @@ rb_w32_cmdvector(const char *cmd, char ***vec)
switch (*ptr) {
case '\\':
- slashes++;
+ if (quote != '\'') slashes++;
break;
case ' ':
@@ -1264,7 +1264,7 @@ rb_w32_cmdvector(const char *cmd, char ***vec)
switch (*p) {
case '\\':
p++;
- slashes++;
+ if (quote != '\'') slashes++;
break;
case '\'':