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

net/ftp/ftp_directory_listing_parser.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.h"
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/stl_util.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/ftp/ftp_directory_listing_parser_ls.h"
 #include "net/ftp/ftp_directory_listing_parser_netware.h"
+#include "net/ftp/ftp_directory_listing_parser_os2.h"
 #include "net/ftp/ftp_directory_listing_parser_vms.h"
 #include "net/ftp/ftp_directory_listing_parser_windows.h"
 #include "net/ftp/ftp_server_type_histograms.h"
 
 namespace net {
 
 namespace {
 
 // Fills in |raw_name| for all |entries| using |encoding|. Returns network
 // error code.
@@ skipping 40 matching lines @@
     return FillInRawName(encoding, entries);
   }
 
   entries->clear();
   if (ParseFtpDirectoryListingNetware(lines, current_time, entries)) {
     *server_type = SERVER_NETWARE;
     return FillInRawName(encoding, entries);
   }
 
   entries->clear();
+  if (ParseFtpDirectoryListingOS2(lines, entries)) {
+    *server_type = SERVER_OS2;
+    return FillInRawName(encoding, entries);
+  }
+
+  entries->clear();
   return ERR_UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT;
 }
 
 // Detects encoding of |text| and parses it as an FTP directory listing.
 // Fills in |entries| and |server_type| and returns network error code.
 int DecodeAndParse(const std::string& text,
                    const base::Time& current_time,
                    std::vector<FtpDirectoryListingEntry>* entries,
                    FtpServerType* server_type) {
   std::vector<std::string> encodings;
@@ skipping 32 matching lines @@
 int ParseFtpDirectoryListing(const std::string& text,
                              const base::Time& current_time,
                              std::vector<FtpDirectoryListingEntry>* entries) {
   FtpServerType server_type = SERVER_UNKNOWN;
   int rv = DecodeAndParse(text, current_time, entries, &server_type);
   UpdateFtpServerTypeHistograms(server_type);
   return rv;
 }
 
 }  // namespace net