FTP: add directory listing parser for OS/2 format.

net/ftp/ftp_directory_listing_parser_os2.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_directory_listing_parser_windows.h"
+#include "net/ftp/ftp_directory_listing_parser_os2.h"
 
 #include <vector>
 
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "net/ftp/ftp_directory_listing_parser.h"
 #include "net/ftp/ftp_util.h"
 
 namespace {
 
 bool WindowsDateListingToTime(const std::vector<string16>& columns,

[eroman, 2011/08/10 23:52:16]

Delete this.

[Paweł Hajdan Jr., 2011/08/11 00:03:19]

Good catch, done.

                               base::Time* time) {
   DCHECK_LE(3U, columns.size());
 
   base::Time::Exploded time_exploded = { 0 };
 
   // Date should be in format MM-DD-YY[YY].
   std::vector<string16> date_parts;
   base::SplitString(columns[0], '-', &date_parts);
   if (date_parts.size() != 3)
     return false;
@@ skipping 38 matching lines @@
 
   // We don't know the time zone of the server, so just use local time.
   *time = base::Time::FromLocalExploded(time_exploded);
   return true;
 }
 
 }  // namespace
 
 namespace net {
 
-bool ParseFtpDirectoryListingWindows(
+bool ParseFtpDirectoryListingOS2(
     const std::vector<string16>& lines,
     std::vector<FtpDirectoryListingEntry>* entries) {
   for (size_t i = 0; i < lines.size(); i++) {
     if (lines[i].empty())
       continue;
 
     std::vector<string16> columns;
     base::SplitString(CollapseWhitespace(lines[i], false), ' ', &columns);
 
     // Every line of the listing consists of the following:
     //
-    //   1. date
-    //   2. time
-    //   3. size in bytes (or "<DIR>" for directories)
-    //   4. filename (may be empty or contain spaces)
+    //   1. size in bytes (0 for directories)
+    //   2. type (A for files, DIR for directories)
+    //   3. date
+    //   4. time
+    //   5. filename (may be empty or contain spaces)
     //
-    // For now, make sure we have 1-3, and handle 4 later.
-    if (columns.size() < 3)
+    // For now, make sure we have 1-4, and handle 5 later.
+    if (columns.size() < 4)
       return false;
 
     FtpDirectoryListingEntry entry;
-    if (EqualsASCII(columns[2], "<DIR>")) {
+    if (!base::StringToInt64(columns[0], &entry.size))
+      return false;
+    if (EqualsASCII(columns[1], "DIR")) {
+      if (entry.size != 0)
+        return false;
       entry.type = FtpDirectoryListingEntry::DIRECTORY;
       entry.size = -1;
-    } else {
+    } else if (EqualsASCII(columns[1], "A")) {
       entry.type = FtpDirectoryListingEntry::FILE;
-      if (!base::StringToInt64(columns[2], &entry.size))
-        return false;
       if (entry.size < 0)
         return false;
+    } else {
+      return false;
     }
 
-    if (!WindowsDateListingToTime(columns, &entry.last_modified))
+    if (!FtpUtil::WindowsDateListingToTime(columns[2],
+                                           columns[3],
+                                           &entry.last_modified)) {
       return false;
+    }
 
-    entry.name = FtpUtil::GetStringPartAfterColumns(lines[i], 3);
+    entry.name = FtpUtil::GetStringPartAfterColumns(lines[i], 4);
     if (entry.name.empty()) {
       // Some FTP servers send listing entries with empty names.
       // It's not obvious how to display such an entry, so ignore them.
       // We don't want to make the parsing fail at this point though.
       // Other entries can still be useful.
       continue;
     }
 
     entries->push_back(entry);
   }
 
   return true;
 }
 
 }  // namespace net