ruby-changes:2110
From: ko1@a...
Date: 2 Oct 2007 21:21:11 +0900
Subject: [ruby-changes:2110] usa - Ruby:r13602 (ruby_1_8): * win32/win32.c (make_cmdvector): adjust escaped successive
usa 2007-10-02 21:21:03 +0900 (Tue, 02 Oct 2007) New Revision: 13602 Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/win32/win32.c Log: * win32/win32.c (make_cmdvector): adjust escaped successive double-quote handling. (merge from trunk) http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13602&r2=13601 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/win32/win32.c?r1=13602&r2=13601 Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 13601) +++ ruby_1_8/ChangeLog (revision 13602) @@ -1,3 +1,8 @@ +Tue Oct 2 21:20:14 2007 NAKAMURA Usaku <usa@r...> + + * win32/win32.c (make_cmdvector): adjust escaped successive + double-quote handling. (merge from trunk) + Tue Oct 2 20:35:24 2007 NAKAMURA Usaku <usa@r...> * win32/win32.c (init_env): initialize HOME and USER environment Index: ruby_1_8/win32/win32.c =================================================================== --- ruby_1_8/win32/win32.c (revision 13601) +++ ruby_1_8/win32/win32.c (revision 13602) @@ -1291,10 +1291,13 @@ 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,10 +1324,10 @@ // 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++; @@ -1332,33 +1335,27 @@ 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: -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml