From 0ff6bcae350dccd409f5db50cddec0c993faea00 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 26 Feb 2004 03:15:08 +0000
Subject: * win32/win32.c (make_cmdvector): adjust successive double-quote  
 handling.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/win32.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'win32')

diff --git a/win32/win32.c b/win32/win32.c
index 54164322f3..5a346fe1c0 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1167,8 +1167,10 @@ make_cmdvector(const char *cmd, char ***vec)
 		if (!(slashes & 1)) {
 		    if (!quote)
 			quote = *ptr;
-		    else if (quote == *ptr)
+		    else if (quote == *ptr) {
+			if (quote == '"' && ptr[1] == '"') ptr++;
 			quote = '\0';
+		    }
 		    escape++;
 		}
 		slashes = 0;
@@ -1197,10 +1199,10 @@ make_cmdvector(const char *cmd, char ***vec)
 	//
 
 	if (escape) {
-	    char *p = base;
+	    char *p = base, c;
 	    slashes = quote = 0;
 	    while (p < base + len) {
-		switch (*p) {
+		switch (c = *p) {
 		  case '\\':
 		    p++;
 		    slashes++;
@@ -1209,10 +1211,13 @@ make_cmdvector(const char *cmd, char ***vec)
 		  case '\'':
 		  case '"':
 		    if (!(slashes & 1)) {
-			if (!quote)
-			    quote = *p;
-			else if (quote == *p)
+			if (!quote) {
+			    quote = c;
+			    c = '\0';
+			}
+			else if (quote == c) {
 			    quote = '\0';
+			}
 			else {
 			    p++;
 			    slashes = 0;
@@ -1234,6 +1239,7 @@ make_cmdvector(const char *cmd, char ***vec)
 			p -= slashes;
 			len -= slashes + 1;
 			slashes = 0;
+			if (c == '"' && *p == c) p++;
 		    }
 		    break;
 
-- 
cgit v1.2.3