Ticket #3879: winmain.patch

winmain.cpp

@@ -30 +30 @@
    
             std::string current;
             bool inside_quoted = false;
+            bool empty_quote = false;
             int backslash_count = 0;
             
             for(; i != e; ++i) {
@@ -38 +39 @@
                     // n/2 backslashes and is a quoted block delimiter
                     if (backslash_count % 2 == 0) {
                         current.append(backslash_count / 2, '\\');
+                        empty_quote = inside_quoted && current.empty();
                         inside_quoted = !inside_quoted;
                         // '"' preceded by odd number (n) of backslashes generates
                         // (n-1)/2 backslashes and is literal quote.
@@ -59 +61 @@
                         // Space outside quoted section terminate the current argument
                         result.push_back(current);
                         current.resize(0);
+                        empty_quote = false;
                         for(;i != e && isspace((unsigned char)*i); ++i)
                             ;
                         --i;
@@ -74 +77 @@
         
             // If we have non-empty 'current' or we're still in quoted
             // section (even if 'current' is empty), add the last token.
-            if (!current.empty() || inside_quoted)
+            if (!current.empty() || inside_quoted || empty_quote)
                 result.push_back(current);        
         }
         return result;