Fix the "ls -l" style date parser to correctly guess the year if it is not provided.

net/ftp/ftp_directory_listing_parser_ls.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 "net/ftp/ftp_directory_listing_parser_ls.h"
 
 #include <vector>
 
 #include "base/string_util.h"
 #include "net/ftp/ftp_util.h"
@@ skipping 24 matching lines @@
       text[0] != 'l' && text[0] != 'p' && text[0] != 's' &&
       text[0] != '-')
     return false;
 
   return (LooksLikeUnixPermission(text.substr(1, 3)) &&
           LooksLikeUnixPermission(text.substr(4, 3)) &&
           LooksLikeUnixPermission(text.substr(7, 3)) &&
           (text.substr(10).empty() || text.substr(10) == ASCIIToUTF16("+")));
 }
 
-bool DetectColumnOffset(const std::vector<string16>& columns, int* offset) {
+bool DetectColumnOffset(const std::vector<string16>& columns,
+                        const base::Time& current_time, int* offset) {
   base::Time time;
 
   if (columns.size() >= 8 &&
       net::FtpUtil::LsDateListingToTime(columns[5], columns[6], columns[7],
-                                        &time)) {
+                                        current_time, &time)) {
     // Standard listing, exactly like ls -l.
     *offset = 2;
     return true;
   }
 
   if (columns.size() >= 7 &&
       net::FtpUtil::LsDateListingToTime(columns[4], columns[5], columns[6],
-                                        &time)) {
+                                        current_time, &time)) {
     // wu-ftpd listing, no "number of links" column.
     *offset = 1;
     return true;
   }
 
   if (columns.size() >= 6 &&
       net::FtpUtil::LsDateListingToTime(columns[3], columns[4], columns[5],
-                                        &time)) {
+                                        current_time, &time)) {
     // Xplain FTP Server listing for folders, like this:
     // drwxr-xr-x               folder        0 Jul 17  2006 online
     *offset = 0;
     return true;
   }
 
   // Unrecognized listing style.
   return false;
 }
 
 }  // namespace
 
 namespace net {
 
-FtpDirectoryListingParserLs::FtpDirectoryListingParserLs()
+FtpDirectoryListingParserLs::FtpDirectoryListingParserLs(
+    const base::Time& current_time)
     : received_nonempty_line_(false),
-      received_total_line_(false) {
+      received_total_line_(false),
+      current_time_(current_time) {
 }
 
 bool FtpDirectoryListingParserLs::ConsumeLine(const string16& line) {
   if (line.empty() && !received_nonempty_line_) {
     // Allow empty lines only at the beginning of the listing. For example VMS
     // systems in Unix emulation mode add an empty line before the first listing
     // entry.
     return true;
   }
   received_nonempty_line_ = true;
@@ skipping 12 matching lines @@
     int total_number;
     if (!StringToInt(columns[1], &total_number))
       return false;
     if (total_number < 0)
       return false;
 
     return true;
   }
 
   int column_offset;
-  if (!DetectColumnOffset(columns, &column_offset))
+  if (!DetectColumnOffset(columns, current_time_, &column_offset))
     return false;
 
   // We may receive file names containing spaces, which can make the number of
   // columns arbitrarily large. We will handle that later. For now just make
   // sure we have all the columns that should normally be there.
   if (columns.size() < 7U + column_offset)
     return false;
 
   if (!LooksLikeUnixPermissionsListing(columns[0]))
     return false;
@@ skipping 10 matching lines @@
   if (!StringToInt64(columns[2 + column_offset], &entry.size))
     return false;
   if (entry.size < 0)
     return false;
   if (entry.type != FtpDirectoryListingEntry::FILE)
     entry.size = -1;
 
   if (!FtpUtil::LsDateListingToTime(columns[3 + column_offset],
                                     columns[4 + column_offset],
                                     columns[5 + column_offset],
+                                    current_time_,
                                     &entry.last_modified)) {
     return false;
   }
 
   entry.name = FtpUtil::GetStringPartAfterColumns(line, 6 + column_offset);
   if (entry.type == FtpDirectoryListingEntry::SYMLINK) {
     string16::size_type pos = entry.name.rfind(ASCIIToUTF16(" -> "));
     if (pos == string16::npos)
       return false;
     entry.name = entry.name.substr(0, pos);
@@ skipping 11 matching lines @@
   return !entries_.empty();
 }
 
 FtpDirectoryListingEntry FtpDirectoryListingParserLs::PopEntry() {
   FtpDirectoryListingEntry entry = entries_.front();
   entries_.pop();
   return entry;
 }
 
 }  // namespace net