FTP: Multiple fixes for localized directory listings:

net/ftp/ftp_util.cc

 // Copyright (c) 2011 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 "net/ftp/ftp_util.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 119 matching lines @@
       continue;
 
     int32_t months_count;
     const icu::UnicodeString* months =
         format_symbols.getShortMonths(months_count);
 
     // Loop over all abbreviated month names in given locale.
     // An alternative solution (to parse |text| in given locale) is more
     // lenient, and may accept more than we want even with setLenient(false).
     for (int32_t month = 0; month < months_count; month++) {
-      if (months[month].caseCompare(unicode_text, 0) == 0) {
+      // Compare (case-insensitive), but just first three characters. Sometimes
+      // ICU returns longer strings (for example for Russian locale), and in FTP
+      // listings they are abbreviated to just three characters.
+      if (months[month].caseCompare(0, 3, unicode_text, 0) == 0) {

[gavinp, 2011/03/30 17:14:23]

NIT: maybe worth noting that caseCompare works when months[month] is zero, one
or two chars long too.  It took a bit of digging to convince myself of this.

[Paweł Hajdan Jr., 2011/04/01 15:55:27]

Done.

         *number = month + 1;
         return true;
       }
     }
   }
 
   return false;
 }
 
 // static
 bool FtpUtil::LsDateListingToTime(const string16& month, const string16& day,
                                   const string16& rest,
                                   const base::Time& current_time,
                                   base::Time* result) {
   base::Time::Exploded time_exploded = { 0 };
 
   if (!AbbreviatedMonthToNumber(month, &time_exploded.month))
     return false;
 
   if (!base::StringToInt(day, &time_exploded.day_of_month))
     return false;
+  if (time_exploded.day_of_month > 31)
+    return false;
 
   if (!base::StringToInt(rest, &time_exploded.year)) {
     // Maybe it's time. Does it look like time (HH:MM)?
     if (rest.length() == 5 && rest[2] == ':') {
       if (!base::StringToInt(rest.begin(),
                              rest.begin() + 2,
                              &time_exploded.hour))
         return false;
 
       if (!base::StringToInt(rest.begin() + 3,
@@ skipping 48 matching lines @@
     while (pos < text.length() && !isspace(text[pos]))
       pos++;
   }
 
   string16 result(text.substr(pos));
   TrimWhitespace(result, TRIM_ALL, &result);
   return result;
 }
 
 }  // namespace