Implement parser for Netware-style FTP LIST response listing.

net/ftp/ftp_directory_listing_buffer.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_buffer.h"
 
 #include "base/i18n/icu_string_conversions.h"
 #include "base/stl_util-inl.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_vms.h"
 #include "net/ftp/ftp_directory_listing_parser_windows.h"
 #include "unicode/ucsdet.h"
 
 namespace {
 
 // A very simple-minded character encoding detection.
 // TODO(jungshik): We can apply more heuristics here (e.g. using various hints
 // like TLD, the UI language/default encoding of a client, etc). In that case,
 // this should be pulled out of here and moved somewhere in base because there
@@ skipping 15 matching lines @@
   return encoding;
 }
 
 }  // namespace
 
 namespace net {
 
 FtpDirectoryListingBuffer::FtpDirectoryListingBuffer()
     : current_parser_(NULL) {
   parsers_.insert(new FtpDirectoryListingParserLs());
+  parsers_.insert(new FtpDirectoryListingParserNetware());
   parsers_.insert(new FtpDirectoryListingParserVms());
   parsers_.insert(new FtpDirectoryListingParserWindows());
 }
 
 FtpDirectoryListingBuffer::~FtpDirectoryListingBuffer() {
   STLDeleteElements(&parsers_);
 }
 
 int FtpDirectoryListingBuffer::ConsumeData(const char* data, int data_length) {
   buffer_.append(data, data_length);
@@ skipping 16 matching lines @@
     return ERR_INVALID_RESPONSE;
 
   rv = ParseLines();
   if (rv != OK)
     return rv;
 
   rv = OnEndOfInput();
   if (rv != OK)
     return rv;
 
-  DCHECK(current_parser_);
   return OK;
 }
 
 bool FtpDirectoryListingBuffer::EntryAvailable() const {
   return (current_parser_ ? current_parser_->EntryAvailable() : false);
 }
 
 FtpDirectoryListingEntry FtpDirectoryListingBuffer::PopEntry() {
   DCHECK(EntryAvailable());
   return current_parser_->PopEntry();
@@ skipping 68 matching lines @@
   while (i != parsers_.end()) {
     if ((*i)->OnEndOfInput()) {
       i++;
     } else {
       delete *i;
       parsers_.erase(i++);
     }
   }
 
   if (parsers_.size() != 1) {
-    current_parser_ = NULL;
+    DCHECK(!current_parser_);
+
+    // We may hit an ambiguity in case of listings which have no entries. That's
+    // fine, as long as all remaining parsers agree that the listing is empty.
+    bool all_listings_empty = true;
+    for (ParserSet::iterator i = parsers_.begin(); i != parsers_.end(); ++i) {
+      if ((*i)->EntryAvailable())
+        all_listings_empty = false;
+    }
+    if (all_listings_empty)
+      return OK;
+
     return ERR_UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT;
   }
 
   current_parser_ = *parsers_.begin();
   return OK;
 }
 
 }  // namespace net