From a52b1cae064a01de97c59dc51ada747ebe327dde Mon Sep 17 00:00:00 2001 From: "idanan@google.com" Date: Fri, 2 Oct 2009 20:01:09 +0000 Subject: Support multiple EOL types in Privacy Blacklists BUG=16932 TEST=none TBR=maruel Review URL: http://codereview.chromium.org/251078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27884 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/privacy_blacklist/blacklist_io.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'chrome/browser') diff --git a/chrome/browser/privacy_blacklist/blacklist_io.cc b/chrome/browser/privacy_blacklist/blacklist_io.cc index 0d33e42..9c61b12 100644 --- a/chrome/browser/privacy_blacklist/blacklist_io.cc +++ b/chrome/browser/privacy_blacklist/blacklist_io.cc @@ -19,6 +19,7 @@ const char header[] = "[Chromium::PrivacyBlacklist]"; const char name_tag[] = "Name:"; const char url_tag[] = "URL:"; const char arrow_tag[] = "=>"; +const char eol[] = "\n\r"; class IsWhiteSpace { public: @@ -121,11 +122,11 @@ bool BlacklistIO::Read(const FilePath& file) { scoped_ptr entry(new Blacklist::Entry(pattern, provider)); cur = std::find_if(cur+arraysize(arrow_tag), end, IsNotWhiteSpace()); - skip = std::find(cur, end, '\n'); + skip = std::find_first_of(cur, end, eol, eol+2); std::string buf(cur, skip); cur = skip + 1; - StringTokenizer tokenier(buf, " (),"); + StringTokenizer tokenier(buf, " (),\n\r"); tokenier.set_options(StringTokenizer::RETURN_DELIMS); bool in_attribute = false; -- cgit v1.1