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 76 matching lines @@
   static bool InitializedForCurrentProcess();
 
 #if defined(OS_WIN)
   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
+  // Constructs and returns the represented command line string. If the optional
+  // |quote_placeholders| is true, assumes the command line contains
+  // placeholders (eg, %1) and quotes any program or argument with a '%' in it.
+  // CAUTION! This method should be avoided on POSIX because quoting behavior is
   // unclear.
-  StringType GetCommandLineString() const;
+  StringType GetCommandLineString() const {
+    return GetCommandLineString(false);
+  }
+  StringType GetCommandLineString(bool quote_placeholders) const;
 
-  // Constructs and returns the represented arguments string.
-  // CAUTION! This should be avoided on POSIX because quoting behavior is
+  // Constructs and returns the represented arguments string. If the optional
+  // |quote_placeholders| is true, assumes the command line contains
+  // placeholders (eg, %1) and quotes any argument with a '%' in it.
+  // CAUTION! This method should be avoided on POSIX because quoting behavior is
   // unclear.
-  StringType GetArgumentsString() const;
+  StringType GetArgumentsString() const { return GetArgumentsString(false); }
+  StringType GetArgumentsString(bool quote_placeholders) const;

[Mark Mentovai, 2014/09/25 03:40:43]

Overloading’s discouraged.

Let’s just give this one a different name as I suggested. I think it’s OK to
make it Windows-only.

[Matt Giuca, 2014/09/25 04:35:30]

Done.

 
   // 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 69 matching lines @@
   // 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_