AU: Common code to parse simple key/value store files

src/platform/update_engine/omaha_request_prep_action.cc

 // Copyright (c) 2009 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 "update_engine/omaha_request_prep_action.h"
 #include <sys/utsname.h>
 #include <errno.h>
+#include <map>
 #include <string>
 #include "base/string_util.h"
+#include "update_engine/simple_key_value_store.h"
 #include "update_engine/utils.h"
 
+using std::map;
 using std::string;
 
 // This gathers local system information and prepares info used by the
 // update check action.
 
 namespace {
 const string OmahaIdPath() {
   return string(chromeos_update_engine::utils::kStatefulPartition) +
       "/etc/omaha_id";
 }
@@ skipping 73 matching lines @@
 string OmahaRequestPrepAction::GetLsbValue(
     const string& key, const string& default_value) const {
   string files[] = {string(utils::kStatefulPartition) + "/etc/lsb-release",
                     "/etc/lsb-release"};
   for (unsigned int i = 0; i < arraysize(files); i++) {
     // TODO(adlr): make sure files checked are owned as root (and all
     // their parents are recursively, too).
     string file_data;
     if (!utils::ReadFileToString(root_ + files[i], &file_data))
       continue;
-    string::size_type pos = 0;
-    if (!utils::StringHasPrefix(file_data, key + "=")) {
-      pos = file_data.find(string("\n") + key + "=");
-      if (pos != string::npos)
-        pos++;  // advance past \n
-    }
-    if (pos == string::npos)
-      continue;
-    pos += key.size() + 1;  // advance past the key and the '='
-    string::size_type endpos = file_data.find('\n', pos);
-    string::size_type length =
-        (endpos == string::npos ? string::npos : endpos - pos);
-    return file_data.substr(pos, length);
+    
+    map<string, string> data = simple_key_value_store::ParseString(file_data);
+    if (utils::MapContainsKey(data, key))
+      return data[key];
   }
   // not found
   return default_value;
 }
 
 string OmahaRequestPrepAction::GetMachineType() const {
   struct utsname buf;
   string ret;
   if (uname(&buf) == 0)
     ret = buf.machine;
   return ret;
 }
 
 }  // namespace chromeos_update_engine