| Index: net/ftp/ftp_directory_listing_parser.cc
|
| diff --git a/net/ftp/ftp_directory_listing_parser.cc b/net/ftp/ftp_directory_listing_parser.cc
|
| index 605abb881158e232f1fd5de2f869d7d8aebdeaa3..0cc5d218fc0c7ed83506ea070b6136e964df9ba6 100644
|
| --- a/net/ftp/ftp_directory_listing_parser.cc
|
| +++ b/net/ftp/ftp_directory_listing_parser.cc
|
| @@ -12,6 +12,7 @@
|
| #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"
|
| @@ -72,6 +73,12 @@ int ParseListing(const string16& text,
|
| }
|
|
|
| entries->clear();
|
| + if (ParseFtpDirectoryListingOS2(lines, entries)) {
|
| + *server_type = SERVER_OS2;
|
| + return FillInRawName(encoding, entries);
|
| + }
|
| +
|
| + entries->clear();
|
| return ERR_UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT;
|
| }
|
|
|
|
|