Fix recognizing FTP listings consisting of only one line.

net/ftp/ftp_directory_listing_parsers.h

 // 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.
 
 #ifndef NET_FTP_FTP_DIRECTORY_LISTING_PARSERS_H_
 #define NET_FTP_FTP_DIRECTORY_LISTING_PARSERS_H_
 
 #include <queue>
 
 #include "base/basictypes.h"
@@ skipping 20 matching lines @@
 
 class FtpDirectoryListingParser {
  public:
   virtual ~FtpDirectoryListingParser();
 
   virtual FtpServerType GetServerType() const = 0;
 
   // Adds |line| to the internal parsing buffer. Returns true on success.
   virtual bool ConsumeLine(const string16& line) = 0;
 
+  // Called after all input has been consumed. Returns true if the parser
+  // recognizes all received data as a valid listing.
+  virtual bool OnEndOfInput() = 0;
+
   // Returns true if there is at least one FtpDirectoryListingEntry available.
   virtual bool EntryAvailable() const = 0;
 
   // Returns the next entry. It is an error to call this function unless
   // EntryAvailable returns true.
   virtual FtpDirectoryListingEntry PopEntry() = 0;
 };
 
 // Parser for "ls -l"-style directory listing.
 class FtpLsDirectoryListingParser : public FtpDirectoryListingParser {
  public:
   FtpLsDirectoryListingParser();
 
   // FtpDirectoryListingParser methods:
   virtual FtpServerType GetServerType() const { return SERVER_LS; }
   virtual bool ConsumeLine(const string16& line);
+  virtual bool OnEndOfInput();
   virtual bool EntryAvailable() const;
   virtual FtpDirectoryListingEntry PopEntry();
 
  private:
   bool received_nonempty_line_;
 
   std::queue<FtpDirectoryListingEntry> entries_;
 
   DISALLOW_COPY_AND_ASSIGN(FtpLsDirectoryListingParser);
 };
 
 class FtpWindowsDirectoryListingParser : public FtpDirectoryListingParser {
  public:
   FtpWindowsDirectoryListingParser();
 
   // FtpDirectoryListingParser methods:
   virtual FtpServerType GetServerType() const { return SERVER_WINDOWS; }
   virtual bool ConsumeLine(const string16& line);
+  virtual bool OnEndOfInput();
   virtual bool EntryAvailable() const;
   virtual FtpDirectoryListingEntry PopEntry();
 
  private:
   std::queue<FtpDirectoryListingEntry> entries_;
 
   DISALLOW_COPY_AND_ASSIGN(FtpWindowsDirectoryListingParser);
 };
 
 // Parser for VMS-style directory listing (including variants).
 class FtpVmsDirectoryListingParser : public FtpDirectoryListingParser {
  public:
   FtpVmsDirectoryListingParser();
 
   // FtpDirectoryListingParser methods:
   virtual FtpServerType GetServerType() const { return SERVER_VMS; }
   virtual bool ConsumeLine(const string16& line);
+  virtual bool OnEndOfInput();
   virtual bool EntryAvailable() const;
   virtual FtpDirectoryListingEntry PopEntry();
 
  private:
   // Consumes listing line which is expected to be a directory listing entry
   // (and not a comment etc). Returns true on success.
   bool ConsumeEntryLine(const string16& line);
 
   enum State {
     STATE_INITIAL,
@@ skipping 20 matching lines @@
   bool last_is_directory_;
 
   std::queue<FtpDirectoryListingEntry> entries_;
 
   DISALLOW_COPY_AND_ASSIGN(FtpVmsDirectoryListingParser);
 };
 
 }  // namespace net
 
 #endif  // NET_FTP_FTP_DIRECTORY_LISTING_PARSERS_H_