Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(494)

Unified Diff: net/ftp/ftp_directory_listing_parser.cc

Issue 7590011: FTP: add directory listing parser for OS/2 format. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/data/ftp/dir-listing-os2-1.expected ('k') | net/ftp/ftp_directory_listing_parser_os2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « net/data/ftp/dir-listing-os2-1.expected ('k') | net/ftp/ftp_directory_listing_parser_os2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698