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

base/command_line.h

 // 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.
 
 // This class works with command lines: building and parsing.
 // Arguments with prefixes ('--', '-', and on Windows, '/') are switches.
 // Switches will precede all other arguments without switch prefixes.
 // Switches can optionally have values, delimited by '=', e.g., "-switch=value".
 // An argument of "--" will terminate switch parsing during initialization,
 // interpreting subsequent tokens as non-switch arguments, regardless of prefix.
@@ skipping 79 matching lines @@
   static CommandLine FromString(const std::wstring& command_line);
 #endif
 
   // Initialize from an argv vector.
   void InitFromArgv(int argc, const CharType* const* argv);
   void InitFromArgv(const StringVector& argv);
 
   // Constructs and returns the represented command line string.
   // CAUTION! This should be avoided on POSIX because quoting behavior is
   // unclear.
-  StringType GetCommandLineString() const;
+  StringType GetCommandLineString() const {
+    return GetCommandLineStringInternal(false);
+  }
+
+#if defined(OS_WIN)
+  // Constructs and returns the represented command line string. Assumes the
+  // command line contains placeholders (eg, %1) and quotes any program or
+  // argument with a '%' in it.

[Mark Mentovai, 2014/09/25 13:14:15]

The comment here and on the other method should say that this is really intended
for use in the registry, and because of the limitations on who does the
expansion and on how it’s not possible to reliably quote arbitrary data, it
should be avoided in any other case except where an established interface that
we don’t control dictates its use.

[Matt Giuca, 2014/09/26 03:49:05]

Done.

+  StringType GetCommandLineStringWithPlaceholders() const {
+    return GetCommandLineStringInternal(true);
+  }
+#endif
 
   // Constructs and returns the represented arguments string.
   // CAUTION! This should be avoided on POSIX because quoting behavior is
   // unclear.
-  StringType GetArgumentsString() const;
+  StringType GetArgumentsString() const {
+    return GetArgumentsStringInternal(false);
+  }
+
+#if defined(OS_WIN)
+  // Constructs and returns the represented arguments string. Assumes the
+  // command line contains placeholders (eg, %1) and quotes any argument with a
+  // '%' in it.
+  StringType GetArgumentsStringWithPlaceholders() const {
+    return GetArgumentsStringInternal(true);
+  }
+#endif
 
   // Returns the original command line string as a vector of strings.
   const StringVector& argv() const { return argv_; }
 
   // Get and Set the program part of the command line string (the first item).
   FilePath GetProgram() const;
   void SetProgram(const FilePath& program);
 
   // Returns true if this command line contains the given switch.
   // (Switch names are case-insensitive).
@@ skipping 50 matching lines @@
 #endif
 
  private:
   // Disallow default constructor; a program name must be explicitly specified.
   CommandLine();
   // Allow the copy constructor. A common pattern is to copy of the current
   // process's command line and then add some flags to it. For example:
   //   CommandLine cl(*CommandLine::ForCurrentProcess());
   //   cl.AppendSwitch(...);
 
+  // Internal version of GetCommandLineString. If |quote_placeholders| is true,
+  // also quotes parts with '%' in them.
+  StringType GetCommandLineStringInternal(bool quote_placeholders) const;
+
+  // Internal version of GetArgumentsString. If |quote_placeholders| is true,
+  // also quotes parts with '%' in them.
+  StringType GetArgumentsStringInternal(bool quote_placeholders) const;
+
   // The singleton CommandLine representing the current process's command line.
   static CommandLine* current_process_commandline_;
 
   // The argv array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* }
   StringVector argv_;
 
   // Parsed-out switch keys and values.
   SwitchMap switches_;
 
   // The index after the program and switches, any arguments start here.
   size_t begin_args_;
 };
 
 }  // namespace base
 
 // TODO(brettw) remove once all callers specify the namespace properly.
 using base::CommandLine;
 
 #endif  // BASE_COMMAND_LINE_H_