FTP: misc fixes resulting from my testing.

net/ftp/ftp_directory_listing_parser_netware.cc

 // Copyright (c) 2011 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_parser_netware.h"
 
 #include <vector>
 
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 31 matching lines @@
   if (!lines.empty() && !StartsWith(lines[0], ASCIIToUTF16("total "), true))
     return false;
 
   for (size_t i = 1U; i < lines.size(); i++) {
     if (lines[i].empty())
       continue;
 
     std::vector<string16> columns;
     base::SplitString(CollapseWhitespace(lines[i], false), ' ', &columns);
 
-    if (columns.size() != 8)
+    if (columns.size() < 8)
       return false;
 
     FtpDirectoryListingEntry entry;
 
     if (columns[0].length() != 1)
       return false;
     if (columns[0][0] == 'd') {
       entry.type = FtpDirectoryListingEntry::DIRECTORY;
     } else if (columns[0][0] == '-') {
       entry.type = FtpDirectoryListingEntry::FILE;
@@ skipping 13 matching lines @@
       return false;
     if (entry.type != FtpDirectoryListingEntry::FILE)
       entry.size = -1;
 
     // Netware uses the same date listing format as Unix "ls -l".
     if (!FtpUtil::LsDateListingToTime(columns[4], columns[5], columns[6],
                                       current_time, &entry.last_modified)) {
       return false;
     }
 
-    entry.name = columns[7];
+    entry.name = FtpUtil::GetStringPartAfterColumns(lines[i], 7);
 
     entries->push_back(entry);
   }
 
   return true;
 }
 
 }  // namespace net