base: Support command line wrappers with quoted 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/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif
 
 namespace base {
@@ skipping 380 matching lines @@
 void CommandLine::AppendArguments(const CommandLine& other,
                                   bool include_program) {
   if (include_program)
     SetProgram(other.GetProgram());
   AppendSwitchesAndArguments(this, other.argv());
 }
 
 void CommandLine::PrependWrapper(const CommandLine::StringType& wrapper) {
   if (wrapper.empty())
     return;
-  // The wrapper may have embedded arguments (like "gdb --args"). In this case,
-  // we don't pretend to do anything fancy, we just split on spaces.
-  StringVector wrapper_argv = SplitString(
-      wrapper, FilePath::StringType(1, ' '), base::TRIM_WHITESPACE,
-      base::SPLIT_WANT_ALL);
-  // Prepend the wrapper and update the switches/arguments |begin_args_|.
+  // Split the wrapper command based on whitespace (with quoting).
+  using CommandLineTokenizer =
+      StringTokenizerT<StringType, CommandLine::StringType::const_iterator>;

[gab, 2017/03/28 19:31:46]

can we forgo the CommandLine:: namespace prefix in const_iterator as well?

[Sami, 2017/03/29 09:17:28]

Well spotted, done.

+  CommandLineTokenizer tokenizer(wrapper, FILE_PATH_LITERAL(" "));

[gab, 2017/03/28 19:31:46]

Unfortunate to use FILE_PATH_LITERAL on a non-file-path argument but looking at
the rest of this file I guess we're committed to that..!

[Sami, 2017/03/29 09:17:28]

Yep, doesn't look like there's any neat alternative :P

+  tokenizer.set_quote_chars(FILE_PATH_LITERAL("'\""));
+  std::vector<StringType> wrapper_argv;
+  while (tokenizer.GetNext())
+    wrapper_argv.emplace_back(tokenizer.token());
+
+  // Prepend the wrapper and update the switches/arguments |begin_args_|

[gab, 2017/03/28 19:31:46]

nit: keep '.' at end of comment

[Sami, 2017/03/29 09:17:28]

Done.

   argv_.insert(argv_.begin(), wrapper_argv.begin(), wrapper_argv.end());
   begin_args_ += wrapper_argv.size();
 }
 
 #if defined(OS_WIN)
 void CommandLine::ParseFromString(const string16& command_line) {
   string16 command_line_string;
   TrimWhitespace(command_line, TRIM_ALL, &command_line_string);
   if (command_line_string.empty())
     return;
@@ skipping 54 matching lines @@
   return params;
 }
 
 void CommandLine::ResetStringPieces() {
   switches_by_stringpiece_.clear();
   for (const auto& entry : switches_)
     switches_by_stringpiece_[entry.first] = &(entry.second);
 }
 
 }  // namespace base