Make NameValuePairsParser support values that contain the 'equal' separator.

chrome/browser/chromeos/system/name_value_pairs_parser.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 "chrome/browser/chromeos/system/name_value_pairs_parser.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 
 namespace chromeos {  // NOLINT
 namespace system {
 
 namespace {
 
 const char kQuoteChars[] = "\"";
-const char kTrimChars[] = "\" ";
+const char kTrimChars[] = "\" \t\r";

[Mattias Nissler (ping if slow), 2012/04/19 13:51:39]

Are you sure this change is save? I.e. did you make sure the existing tools
don't use this and the Chrome-side code doesn't rely on these being present?

[Joao da Silva, 2012/04/19 16:01:30]

Better leave it out for now :-) Everything seemed to work but testing wasn't
extensive.

 
 bool GetToolOutput(int argc, const char* argv[], std::string& output) {
   DCHECK_GE(argc, 1);
 
   if (!file_util::PathExists(FilePath(argv[0]))) {
     LOG(WARNING) << "Tool for statistics not found: " << argv[0];
     return false;
   }
 
   CommandLine command_line(argc, argv);
@@ skipping 21 matching lines @@
                                                const std::string& eq,
                                                const std::string& delim) {
   return ParseNameValuePairsWithComments(in_string, eq, delim, "");
 }
 
 bool NameValuePairsParser::ParseNameValuePairsWithComments(
     const std::string& in_string,
     const std::string& eq,
     const std::string& delim,
     const std::string& comment_delim) {
+  bool all_valid = true;
   // Set up the pair tokenizer.
   StringTokenizer pair_toks(in_string, delim);
   pair_toks.set_quote_chars(kQuoteChars);
   // Process token pairs.
   while (pair_toks.GetNext()) {
     std::string pair(pair_toks.token());
-    if (pair.find(eq) == 0) {
-      LOG(WARNING) << "Empty key: '" << pair << "'. Aborting.";
-      return false;
-    }
-    StringTokenizer keyvalue(pair, eq);
-    std::string key;
-    std::string value;
-    if (keyvalue.GetNext()) {
-      TrimString(keyvalue.token(), kTrimChars, &key);
-      if (keyvalue.GetNext()) {
-        value = keyvalue.token();
-        if (keyvalue.GetNext()) {
-          LOG(WARNING) << "Multiple key tokens: '" << pair << "'. Aborting.";
-          return false;
-        }
-        // If value ends with a comment, throw away everything after
-        // comment_delim is encountered.
-        if (!comment_delim.empty()) {
-          StringTokenizer value_with_comment(value, comment_delim);
-          value_with_comment.GetNext();
-          value = value_with_comment.token();
-        }
+    // Anything before the first |eq| is the key, anything after is the value.
+    // |eq| must exist.
+    size_t eq_pos = pair.find(eq);
+    if (eq_pos != std::string::npos) {
+      // First |comment_delim| after |eq_pos| starts the comment.
+      // A value of |std::string::npos| means that the value spans to the end
+      // of |pair|.
+      size_t value_size = std::string::npos;
+      if (!comment_delim.empty()) {
+        size_t comment_pos = pair.find(comment_delim, eq_pos + 1);
+        if (comment_pos != std::string::npos)
+          value_size = comment_pos - eq_pos - 1;
+      }
 
-        TrimString(value, kTrimChars, &value);
+      std::string key;
+      std::string value;
+      TrimString(pair.substr(0, eq_pos), kTrimChars, &key);
+      TrimString(pair.substr(eq_pos + 1, value_size), kTrimChars, &value);
+
+      if (!key.empty()) {
+        AddNameValuePair(key, value);
+        continue;
       }
     }
-    if (key.empty()) {
-      LOG(WARNING) << "Invalid token pair: '" << pair << "'. Aborting.";
-      return false;
-    }
-    AddNameValuePair(key, value);
+
+    LOG(WARNING) << "Invalid token pair: " << pair << ". Ignoring.";
+    all_valid = false;
   }
-  return true;
+  return all_valid;
 }
 
 bool NameValuePairsParser::GetSingleValueFromTool(int argc,
                                                   const char* argv[],
                                                   const std::string& key) {
   std::string output_string;
   if (!GetToolOutput(argc, argv, output_string))
     return false;
 
   TrimWhitespaceASCII(output_string, TRIM_ALL, &output_string);
   AddNameValuePair(key, output_string);
   return true;
 }
 
-void NameValuePairsParser::GetNameValuePairsFromFile(const FilePath& file_path,
+bool NameValuePairsParser::GetNameValuePairsFromFile(const FilePath& file_path,
                                                      const std::string& eq,
                                                      const std::string& delim) {
   std::string contents;
   if (file_util::ReadFileToString(file_path, &contents)) {
-    ParseNameValuePairs(contents, eq, delim);
+    return ParseNameValuePairs(contents, eq, delim);
   } else {
     LOG(WARNING) << "Unable to read statistics file: " << file_path.value();
+    return false;
   }
 }
 
 bool NameValuePairsParser::ParseNameValuePairsFromTool(
     int argc,
     const char* argv[],
     const std::string& eq,
     const std::string& delim,
     const std::string& comment_delim) {
   std::string output_string;
   if (!GetToolOutput(argc, argv, output_string))
     return false;
 
   return ParseNameValuePairsWithComments(
       output_string, eq, delim, comment_delim);
 }
 
 }  // namespace system
 }  // namespace chromeos