Also parse file size in new FTP LIST parsing code.

net/ftp/ftp_directory_listing_parsers.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_parsers.h"
 
 #include "base/string_util.h"
 
 namespace {
   
@@ skipping 110 matching lines @@
     entry.type = FtpDirectoryListingEntry::SYMLINK;
   } else if (columns[0][0] == 'd') {
     entry.type = FtpDirectoryListingEntry::DIRECTORY;
   } else {
     entry.type = FtpDirectoryListingEntry::FILE;
   }
   
   if (!IsStringNonNegativeNumber(columns[1]))
     return false;
   
-  if (!IsStringNonNegativeNumber(columns[4]))
+  if (!StringToInt64(columns[4], &entry.size))
     return false;
+  if (entry.size < 0)
+    return false;
+  if (entry.type != FtpDirectoryListingEntry::FILE)

[wtc, 2009/10/28 19:12:08]

Why don't we test entry.type earlier, like this?

  if (entry.type == FtpDirectoryListingEntry::FILE) {
    if (!StringToInt64(columns[4], &entry.size) || entry.size < 0)
      return false;
  } else {
    entry.size = -1;  // File size not applicable.
  }
    
This avoids the unnecessary StringToInt64 call for non-file
entries.

[wtc, 2009/10/28 23:51:58]

I see.  Your code will return false if the format is
wrong, whereas my suggested code will return true with
entry.size = -1.

+    entry.size = -1;
   
   if (!UnixDateListingToTime(columns, &entry.last_modified))
     return false;
   
   entry.name = columns[8];
   
   entries_.push(entry);
   return true;
 }
   
 bool FtpLsDirectoryListingParser::EntryAvailable() const {
   return !entries_.empty();
 }
   
 FtpDirectoryListingEntry FtpLsDirectoryListingParser::PopEntry() {
   FtpDirectoryListingEntry entry = entries_.front();
   entries_.pop();
   return entry;
 }
 
 }  // namespace net