Merge r2876 to the 1.0 release branch....

base/command_line.cc

 // Copyright (c) 2006-2008 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"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif
@@ skipping 11 matching lines @@
 // Since we use a lazy match, make sure that longer versions (like L"--")
 // are listed before shorter versions (like L"-") of similar prefixes.
 #if defined(OS_WIN)
 const wchar_t* const CommandLine::kSwitchPrefixes[] = {L"--", L"-", L"/"};
 #elif defined(OS_POSIX)
 // Unixes don't use slash as a switch.
 const wchar_t* const CommandLine::kSwitchPrefixes[] = {L"--", L"-"};
 #endif
 
 const wchar_t CommandLine::kSwitchValueSeparator[] = L"=";
+const wchar_t CommandLine::kSwitchTerminator[] = L"--";
 
 // Needed to avoid a typecast on the tolower() function pointer in Lowercase().
 // MSVC accepts it as-is but GCC requires the typecast.
 static int ToLower(int c) {
   return tolower(c);
 }
 
 static void Lowercase(wstring* parameter) {
   transform(parameter->begin(), parameter->end(), parameter->begin(), 
             ToLower);
@@ skipping 39 matching lines @@
       return;
 
     int num_args = 0;
     wchar_t** args = NULL;
 
     args = CommandLineToArgvW(command_line_string_.c_str(), &num_args);
 
     // Populate program_ with the trimmed version of the first arg.
     TrimWhitespace(args[0], TRIM_ALL, &program_);
 
+    bool parse_switches = true;
     for (int i = 1; i < num_args; ++i) {
       wstring arg;
       TrimWhitespace(args[i], TRIM_ALL, &arg);
 
+      if (!parse_switches) {
+        loose_values_.push_back(arg);
+        continue;
+      }
+
+      if (arg == kSwitchTerminator) {
+        parse_switches = false;
+        continue;
+      }
+
       wstring switch_string;
       wstring switch_value;
       if (IsSwitch(arg, &switch_string, &switch_value)) {
         switches_[switch_string] = switch_value;
       } else {
         loose_values_.push_back(arg);
       }
     }
 
     if (args)
       LocalFree(args);
   }
 
 #elif defined(OS_POSIX)
   // Does the actual parsing of the command line.
   void Init(int argc, const char* const* argv) {
     if (argc < 1)
       return;
     program_ = base::SysNativeMBToWide(argv[0]);
     command_line_string_ = program_;
 
+    bool parse_switches = true;
     for (int i = 1; i < argc; ++i) {
       std::wstring arg = base::SysNativeMBToWide(argv[i]);
       command_line_string_.append(L" ");
       command_line_string_.append(arg);
 
+      if (!parse_switches) {
+        loose_values_.push_back(arg);
+        continue;
+      }
+
+      if (arg == kSwitchTerminator) {
+        parse_switches = false;
+        continue;
+      }
+
       wstring switch_string;
       wstring switch_value;
       if (IsSwitch(arg, &switch_string, &switch_value)) {
         switches_[switch_string] = switch_value;
       } else {
         loose_values_.push_back(arg);
       }
     }
   }
 #endif
@@ skipping 152 matching lines @@
   if ((value_string.find(L" ") != std::wstring::npos) &&
       (value_string[0] != L'"') &&
       (value_string[value_string.length() - 1] != L'"')) {
     // need to provide quotes
     StringAppendF(command_line_string, L"\"%ls\"", value_string.c_str());
   } else {
     command_line_string->append(value_string);
   }
 }