FTP: misc fixes resulting from my testing.

net/ftp/ftp_directory_listing_parser_ls.cc

 // Copyright (c) 2012 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_ls.h"
 
 #include <vector>
 
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "net/ftp/ftp_directory_listing_parser.h"
 #include "net/ftp/ftp_util.h"
 
 namespace {
 
 bool LooksLikeUnixPermission(const string16& text) {
   if (text.length() != 3)
     return false;
 
   // Meaning of the flags:
   // r - file is readable
   // w - file is writable
   // x - file is executable
-  // s or S - setuid/setgid bit set
+  // s, S or l - setuid/setgid bit set
   // t or T - "sticky" bit set
   return ((text[0] == 'r' || text[0] == '-') &&
           (text[1] == 'w' || text[1] == '-') &&
-          (text[2] == 'x' || text[2] == 's' || text[2] == 'S' ||
-           text[2] == 't' || text[2] == 'T' || text[2] == '-'));
+          (text[2] == 'x' || text[2] == '-' ||
+           text[2] == 's' || text[2] == 'S' || text[2] == 'l' ||
+           text[2] == 't' || text[2] == 'T'));
 }
 
 bool LooksLikeUnixPermissionsListing(const string16& text) {
   if (text.length() < 7)
     return false;
 
   // Do not check the first character (entry type). There are many weird
   // servers that use special file types (for example Plan9 and append-only
   // files). Fortunately, the rest of the permission listing is more consistent.
 
@@ skipping 130 matching lines @@
     base::SplitString(CollapseWhitespace(lines[i], false), ' ', &columns);
 
     // Some FTP servers put a "total n" line at the beginning of the listing
     // (n is an integer). Allow such a line, but only once, and only if it's
     // the first non-empty line. Do not match the word exactly, because it may
     // be in different languages (at least English and German have been seen
     // in the field).
     if (columns.size() == 2 && !received_total_line) {
       received_total_line = true;
 
-      int total_number;
-      if (!base::StringToInt(columns[1], &total_number))
+      int64 total_number;
+      if (!base::StringToInt64(columns[1], &total_number))
         return false;
       if (total_number < 0)
         return false;
 
       continue;
     }
 
     FtpDirectoryListingEntry entry;
 
     size_t column_offset;
@@ skipping 63 matching lines @@
         entry.name = entry.name.substr(0, pos);
     }
 
     entries->push_back(entry);
   }
 
   return true;
 }
 
 }  // namespace net