base::CommandLine: Added optional quoting of placeholder arguments.

base/command_line.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 
 #include <algorithm>
 #include <ostream>
 
 #include "base/basictypes.h"
@@ skipping 87 matching lines @@
 #if defined(OS_WIN)
   return base::StringToLowerASCII(string);
 #elif defined(OS_POSIX)
   return string;
 #endif
 }
 
 
 #if defined(OS_WIN)
 // Quote a string as necessary for CommandLineToArgvW compatiblity *on Windows*.
-std::wstring QuoteForCommandLineToArgvW(const std::wstring& arg) {
+std::wstring QuoteForCommandLineToArgvW(const std::wstring& arg,
+                                        bool quote_placeholders) {
   // We follow the quoting rules of CommandLineToArgvW.
   // http://msdn.microsoft.com/en-us/library/17w5ykft.aspx
-  if (arg.find_first_of(L" \\\"") == std::wstring::npos) {
+  std::wstring quotable_chars(L" \\\"");
+  // We may also be required to quote '%', which is commonly used in a command
+  // line as a placeholder. (It may be substituted for a string with spaces.)
+  if (quote_placeholders)
+    quotable_chars.push_back(L'%');
+  if (arg.find_first_of(quotable_chars) == std::wstring::npos) {
     // No quoting necessary.
     return arg;
   }
 
   std::wstring out;
   out.push_back(L'"');
   for (size_t i = 0; i < arg.size(); ++i) {
     if (arg[i] == '\\') {
       // Find the extent of this run of backslashes.
       size_t start = i, end = start + 1;
@@ skipping 118 matching lines @@
 }
 
 void CommandLine::InitFromArgv(const StringVector& argv) {
   argv_ = StringVector(1);
   switches_.clear();
   begin_args_ = 1;
   SetProgram(argv.empty() ? FilePath() : FilePath(argv[0]));
   AppendSwitchesAndArguments(*this, argv);
 }
 
-CommandLine::StringType CommandLine::GetCommandLineString() const {
+CommandLine::StringType CommandLine::GetCommandLineString(
+    bool quote_placeholders) const {
   StringType string(argv_[0]);
 #if defined(OS_WIN)
-  string = QuoteForCommandLineToArgvW(string);
+  string = QuoteForCommandLineToArgvW(string, quote_placeholders);
 #endif
-  StringType params(GetArgumentsString());
+  StringType params(GetArgumentsString(quote_placeholders));
   if (!params.empty()) {
     string.append(StringType(FILE_PATH_LITERAL(" ")));
     string.append(params);
   }
   return string;
 }
 
-CommandLine::StringType CommandLine::GetArgumentsString() const {
+CommandLine::StringType CommandLine::GetArgumentsString(
+    bool quote_placeholders) const {
   StringType params;
   // Append switches and arguments.
   bool parse_switches = true;
   for (size_t i = 1; i < argv_.size(); ++i) {
     StringType arg = argv_[i];
     StringType switch_string;
     StringType switch_value;
     parse_switches &= arg != kSwitchTerminator;
     if (i > 1)
       params.append(StringType(FILE_PATH_LITERAL(" ")));
     if (parse_switches && IsSwitch(arg, &switch_string, &switch_value)) {
       params.append(switch_string);
       if (!switch_value.empty()) {
 #if defined(OS_WIN)
-        switch_value = QuoteForCommandLineToArgvW(switch_value);
+        switch_value =
+            QuoteForCommandLineToArgvW(switch_value, quote_placeholders);
 #endif
         params.append(kSwitchValueSeparator + switch_value);
       }
     }
     else {
 #if defined(OS_WIN)
-      arg = QuoteForCommandLineToArgvW(arg);
+      arg = QuoteForCommandLineToArgvW(arg, quote_placeholders);
 #endif
       params.append(arg);
     }
   }
   return params;
 }
 
 FilePath CommandLine::GetProgram() const {
   return FilePath(argv_[0]);
 }
@@ skipping 137 matching lines @@
   args = ::CommandLineToArgvW(command_line_string.c_str(), &num_args);
 
   DPLOG_IF(FATAL, !args) << "CommandLineToArgvW failed on command line: "
                          << UTF16ToUTF8(command_line);
   InitFromArgv(num_args, args);
   LocalFree(args);
 }
 #endif
 
 }  // namespace base