Handle spaces and quotes in chrome_elf command line parser

chrome/install_static/install_util_unittest.cc

 // Copyright 2016 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 "chrome/install_static/install_util.h"
 
 #include <tuple>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 72 matching lines @@
 
   // Whitespace after a switch.
   value =
       GetSwitchValueFromCommandLine(L"c:\\temp\\bleh.exe --type= ", L"type");
   EXPECT_TRUE(value.empty());
 
   // Just tabs after a switch.
   value = GetSwitchValueFromCommandLine(L"c:\\temp\\bleh.exe --type=\t\t\t",
                                         L"type");
   EXPECT_TRUE(value.empty());
+}
 
-  // Whitespace after the "=" before the value.
-  value =
-      GetSwitchValueFromCommandLine(L"c:\\temp\\bleh.exe --type= bar", L"type");
-  EXPECT_EQ(L"bar", value);
+TEST(InstallStaticTest, SpacesAndQuotesInCommandLineArguments) {

[grt (UTC plus 2), 2016/12/01 09:07:13]

would you be so kind as to add an expectation for each of the examples in the
blog posts you cite?

[scottmg, 2016/12/01 19:04:22]

Done. The windowsinspired.com ones were primarily about the bizzaro special
handling of argv[0], but since we're in here digging ourselves quite a lovely
hole, I figured I might as well dig the whole hole while I'm at it.

So I implemented that too. (The CommandLineToArgvW version, not the
__argc/__argv CRT version... because why wouldn't they be different?!).

+  std::vector<std::wstring> tokenized;
 
-  // Tabs after the "=" before the value.
-  value = GetSwitchValueFromCommandLine(L"c:\\temp\\bleh.exe --type=\t\t\tbar",
-                                        L"type");
-  EXPECT_EQ(value, L"bar");
+  tokenized = TokenizeCommandLineToArray(L"\"C:\\a\\b.exe\"");
+  ASSERT_EQ(1u, tokenized.size());
+  EXPECT_EQ(L"C:\\a\\b.exe", tokenized[0]);
+
+  tokenized = TokenizeCommandLineToArray(L"x.exe");
+  ASSERT_EQ(1u, tokenized.size());
+  EXPECT_EQ(L"x.exe", tokenized[0]);
+
+  tokenized = TokenizeCommandLineToArray(L"\"c:\\with space\\something.exe\"");
+  ASSERT_EQ(1u, tokenized.size());
+  EXPECT_EQ(L"c:\\with space\\something.exe", tokenized[0]);
+
+  tokenized = TokenizeCommandLineToArray(L"\"C:\\a\\b.exe\" arg");
+  ASSERT_EQ(2u, tokenized.size());
+  EXPECT_EQ(L"C:\\a\\b.exe", tokenized[0]);
+  EXPECT_EQ(L"arg", tokenized[1]);
+
+  tokenized = TokenizeCommandLineToArray(L"\"C:\\with space\\b.exe\" \"arg\"");
+  ASSERT_EQ(2u, tokenized.size());
+  EXPECT_EQ(L"C:\\with space\\b.exe", tokenized[0]);
+  EXPECT_EQ(L"arg", tokenized[1]);
+
+  tokenized = TokenizeCommandLineToArray(L"\"C:\\a\\b.exe\" c:\\tmp\\");
+  ASSERT_EQ(2u, tokenized.size());
+  EXPECT_EQ(L"C:\\a\\b.exe", tokenized[0]);
+  EXPECT_EQ(L"c:\\tmp\\", tokenized[1]);
+
+  tokenized =
+      TokenizeCommandLineToArray(L"\"C:\\a\\b.exe\" \"c:\\some file path\\\"");
+  ASSERT_EQ(2, tokenized.size());
+  EXPECT_EQ(L"C:\\a\\b.exe", tokenized[0]);
+  EXPECT_EQ(L"c:\\some file path\"", tokenized[1]);
+
+  tokenized = TokenizeCommandLineToArray(
+      L"\"C:\\with space\\b.exe\" \\\\x\\\\ \\\\y\\\\");
+  ASSERT_EQ(3u, tokenized.size());
+  EXPECT_EQ(L"C:\\with space\\b.exe", tokenized[0]);
+  EXPECT_EQ(L"\\\\x\\\\", tokenized[1]);
+  EXPECT_EQ(L"\\\\y\\\\", tokenized[2]);
+
+  tokenized = TokenizeCommandLineToArray(
+      L"\"C:\\with space\\b.exe\" \"\\\\space quoted\\\\\"");
+  ASSERT_EQ(2u, tokenized.size());
+  EXPECT_EQ(L"C:\\with space\\b.exe", tokenized[0]);
+  EXPECT_EQ(L"\\\\space quoted\\", tokenized[1]);
+
+  tokenized = TokenizeCommandLineToArray(
+      L"\"C:\\with space\\b.exe\" --stuff    -x -Y   \"c:\\some thing\\\"    "
+      L"weewaa    ");
+  EXPECT_EQ(5u, tokenized.size());
+  EXPECT_EQ(L"C:\\with space\\b.exe", tokenized[0]);
+  EXPECT_EQ(L"--stuff", tokenized[1]);
+  EXPECT_EQ(L"-x", tokenized[2]);
+  EXPECT_EQ(L"-Y", tokenized[3]);
+  EXPECT_EQ(L"c:\\some thing\"    weewaa    ", tokenized[4]);
+
+  tokenized = TokenizeCommandLineToArray(
+      L"\"C:\\with space\\b.exe\" --stuff=\"d:\\stuff and things\"");
+  EXPECT_EQ(2u, tokenized.size());
+  EXPECT_EQ(L"C:\\with space\\b.exe", tokenized[0]);
+  EXPECT_EQ(L"--stuff=d:\\stuff and things", tokenized[1]);
 }
 
 TEST(InstallStaticTest, BrowserProcessTest) {
   EXPECT_EQ(ProcessType::UNINITIALIZED, g_process_type);
   InitializeProcessType();
   EXPECT_FALSE(IsNonBrowserProcess());
 }
 
 class InstallStaticUtilTest
     : public ::testing::TestWithParam<
@@ skipping 180 matching lines @@
 #else   // GOOGLE_CHROME_BUILD
 // Chromium supports multi-install at user and system levels.
 INSTANTIATE_TEST_CASE_P(Chromium,
                         InstallStaticUtilTest,
                         testing::Combine(testing::Values(CHROMIUM_INDEX),
                                          testing::Values("user", "system"),
                                          testing::Values("single", "multi")));
 #endif  // !GOOGLE_CHROME_BUILD
 
 }  // namespace install_static