merge revision(s) 13602:

shyouhei · shyouhei · commit 3a7b4c036368 · 2008-06-05T07:21:20.000Z
* win32/win32.c (make_cmdvector): adjust escaped successive
	  double-quote handling. (merge from trunk)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun  5 16:21:16 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (make_cmdvector): adjust escaped successive
+	  double-quote handling. (merge from trunk)
+
 Thu Jun  5 12:26:45 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (init_env): initialize HOME and USER environment
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-05"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080605
-#define RUBY_PATCHLEVEL 127
+#define RUBY_PATCHLEVEL 128
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
diff --git a/win32/win32.c b/win32/win32.c
@@ -1291,10 +1291,13 @@ rb_w32_cmdvector(const char *cmd, char ***vec)
 		if (!(slashes & 1)) {
 		    if (!quote)
 			quote = *ptr;
-		    else if (quote == *ptr)
+		    else if (quote == *ptr) {
+			if (quote == '"' && quote == ptr[1])
+			    ptr++;
 			quote = '\0';
-		    escape++;
+		    }
 		}
+		escape++;
 		slashes = 0;
 		break;
 
@@ -1321,44 +1324,38 @@ rb_w32_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++;
 		    if (quote != '\'') slashes++;
 		    break;
 
 		  case '\'':
 		  case '"':
+		    if (!(slashes & 1) && quote && quote != c) {
+			p++;
+			slashes = 0;
+			break;
+		    }
+		    memcpy(p - ((slashes + 1) >> 1), p + (~slashes & 1),
+			   base + len - p);
+		    len -= ((slashes + 1) >> 1) + (~slashes & 1);
+		    p -= (slashes + 1) >> 1;
 		    if (!(slashes & 1)) {
-			if (!quote)
-			    quote = *p;
-			else if (quote == *p)
+			if (quote) {
+			    if (quote == '"' && quote == *p)
+				p++;
 			    quote = '\0';
-			else {
-			    p++;
-			    slashes = 0;
-			    break;
 			}
+			else
+			    quote = c;
 		    }
-		    if (base + slashes == p) {
-			base += slashes >> 1;
-			len -= slashes >> 1;
-			slashes &= 1;
-		    }
-		    if (base == p) {
-			base = ++p;
-			--len;
-		    }
-		    else {
-			memcpy(p - ((slashes + 1) >> 1), p + (~slashes & 1), base + len - p);
-			slashes >>= 1;
-			p -= slashes;
-			len -= slashes + 1;
-			slashes = 0;
-		    }
+		    else
+			p++;
+		    slashes = 0;
 		    break;
 
 		  default:
