diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 16:13:03 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 16:13:03 +0000 |
commit | 698c61616b5725f94021464d8d4828c54cb88d25 (patch) | |
tree | 8d0f0ed9d24a6e54285d2ac0b2afa161bd88f836 /net/data/ftp | |
parent | 7c3764b163f9d45d23b46ea238464a54e1ec20bc (diff) | |
download | chromium_src-698c61616b5725f94021464d8d4828c54cb88d25.zip chromium_src-698c61616b5725f94021464d8d4828c54cb88d25.tar.gz chromium_src-698c61616b5725f94021464d8d4828c54cb88d25.tar.bz2 |
Make new FTP LIST parsing code more robust.
Some highlights:
- more tests (including non-ASCII characters in different encodings)
- handling more variants of "ls" listing
- handling spaces in file names in "ls" listings
TEST=Covered by net_unittests.
BUG=25520
Review URL: http://codereview.chromium.org/449011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/data/ftp')
-rw-r--r-- | net/data/ftp/dir-listing-ls-10 | 10 | ||||
-rw-r--r-- | net/data/ftp/dir-listing-ls-10.expected | 80 | ||||
-rw-r--r-- | net/data/ftp/dir-listing-ls-6 | 7 | ||||
-rw-r--r-- | net/data/ftp/dir-listing-ls-6.expected | 53 | ||||
-rw-r--r-- | net/data/ftp/dir-listing-ls-7 | 6 | ||||
-rw-r--r-- | net/data/ftp/dir-listing-ls-7.expected | 53 | ||||
-rw-r--r-- | net/data/ftp/dir-listing-ls-8 | 1 | ||||
-rw-r--r-- | net/data/ftp/dir-listing-ls-8.expected | 0 | ||||
-rw-r--r-- | net/data/ftp/dir-listing-ls-9 | 4 | ||||
-rw-r--r-- | net/data/ftp/dir-listing-ls-9.expected | 26 | ||||
-rw-r--r-- | net/data/ftp/dir-listing-vms-5 | 12 | ||||
-rw-r--r-- | net/data/ftp/dir-listing-vms-5.expected | 36 |
12 files changed, 288 insertions, 0 deletions
diff --git a/net/data/ftp/dir-listing-ls-10 b/net/data/ftp/dir-listing-ls-10 new file mode 100644 index 0000000..deff68f --- /dev/null +++ b/net/data/ftp/dir-listing-ls-10 @@ -0,0 +1,10 @@ +Gesamt 4352 +---------- 1 1 1 0 Okt 25 1999 .notar +lrwxrwxrwx 1 1 1 7 Okt 23 2007 bin -> usr/bin +d--x--x--x 1 2 2 512 Apr 23 2002 dev +d--x--x--x 1 2 2 512 Apr 1 2004 etc +drwx------ 1 7 root 1536 Aug 14 13:49 lost+found +drwxr-xr-x 1 3 1 512 Mär 10 2003 private +drwxrwsr-x 1 25 1260 1024 Aug 10 2006 pub +-rw------- 1 1 1 2211496 Okt 23 2007 restoresymtable +d--x--x--x 1 6 2 512 Apr 23 2002 usr diff --git a/net/data/ftp/dir-listing-ls-10.expected b/net/data/ftp/dir-listing-ls-10.expected new file mode 100644 index 0000000..bbc4cd3 --- /dev/null +++ b/net/data/ftp/dir-listing-ls-10.expected @@ -0,0 +1,80 @@ +- +.notar +0 +1999 +10 +25 +0 +0 + +l +bin +-1 +2007 +10 +23 +0 +0 + +d +dev +-1 +2002 +4 +23 +0 +0 + +d +etc +-1 +2004 +4 +1 +0 +0 + +d +lost+found +-1 +current +8 +14 +13 +49 + +d +private +-1 +2003 +3 +10 +0 +0 + +d +pub +-1 +2006 +8 +10 +0 +0 + +- +restoresymtable +2211496 +2007 +10 +23 +0 +0 + +d +usr +-1 +2002 +4 +23 +0 +0 diff --git a/net/data/ftp/dir-listing-ls-6 b/net/data/ftp/dir-listing-ls-6 new file mode 100644 index 0000000..5cc802c --- /dev/null +++ b/net/data/ftp/dir-listing-ls-6 @@ -0,0 +1,7 @@ +total 14 +dr-xr-xr-x 7 0 1 512 Jun 19 2006 . +dr-xr-xr-x 7 0 1 512 Jun 19 2006 .. +dr-xr-xr-x 2 0 1 512 Mar 24 2003 bin +dr-xr-xr-x 2 0 1 512 Mar 24 2003 etc +dr-xr-xr-x 12 0 0 512 Apr 7 2009 pub +dr-xr-xr-x 3 0 1 512 Mar 24 2003 usr diff --git a/net/data/ftp/dir-listing-ls-6.expected b/net/data/ftp/dir-listing-ls-6.expected new file mode 100644 index 0000000..80b61dd --- /dev/null +++ b/net/data/ftp/dir-listing-ls-6.expected @@ -0,0 +1,53 @@ +d +. +-1 +2006 +6 +19 +0 +0 + +d +.. +-1 +2006 +6 +19 +0 +0 + +d +bin +-1 +2003 +3 +24 +0 +0 + +d +etc +-1 +2003 +3 +24 +0 +0 + +d +pub +-1 +2009 +4 +7 +0 +0 + +d +usr +-1 +2003 +3 +24 +0 +0 diff --git a/net/data/ftp/dir-listing-ls-7 b/net/data/ftp/dir-listing-ls-7 new file mode 100644 index 0000000..93dd804 --- /dev/null +++ b/net/data/ftp/dir-listing-ls-7 @@ -0,0 +1,6 @@ +-rw-r--r-- 1 0 100 3108 Mar 07 2001 00readme.html +drwxr-xr-x 3 1164 100 4096 Oct 19 13:45 OCU +lrwxrwxrwx 1 203 1 10 Jun 15 2006 año2000 -> ./urte2000 +drwxr-xr-x 2 0 0 4096 Mar 07 2001 bin +drwxr-xr-x 2 0 100 4096 Mar 07 2001 dev +drwxr-xr-x 3 0 100 4096 Apr 20 2005 doc diff --git a/net/data/ftp/dir-listing-ls-7.expected b/net/data/ftp/dir-listing-ls-7.expected new file mode 100644 index 0000000..8f4cfe0 --- /dev/null +++ b/net/data/ftp/dir-listing-ls-7.expected @@ -0,0 +1,53 @@ +- +00readme.html +3108 +2001 +3 +7 +0 +0 + +d +OCU +-1 +current +10 +19 +13 +45 + +l +año2000 +-1 +2006 +6 +15 +0 +0 + +d +bin +-1 +2001 +3 +7 +0 +0 + +d +dev +-1 +2001 +3 +7 +0 +0 + +d +doc +-1 +2005 +4 +20 +0 +0 diff --git a/net/data/ftp/dir-listing-ls-8 b/net/data/ftp/dir-listing-ls-8 new file mode 100644 index 0000000..9281104 --- /dev/null +++ b/net/data/ftp/dir-listing-ls-8 @@ -0,0 +1 @@ +total 0 diff --git a/net/data/ftp/dir-listing-ls-8.expected b/net/data/ftp/dir-listing-ls-8.expected new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/net/data/ftp/dir-listing-ls-8.expected diff --git a/net/data/ftp/dir-listing-ls-9 b/net/data/ftp/dir-listing-ls-9 new file mode 100644 index 0000000..89df17c --- /dev/null +++ b/net/data/ftp/dir-listing-ls-9 @@ -0,0 +1,4 @@ +total 510528 +-rw-r--r-- 1 nobody nogroup 174680068 Jun 4 23:20 Akademia Teatralna spot.mpg +-rw-r--r-- 1 nobody nogroup 3447432 May 18 2009 Foo - Instrukcja_ObsÅ‚ugi.pdf +-rw-r--r-- 1 nobody nogroup 23197684 Jun 9 13:36 Zdjecia.zip diff --git a/net/data/ftp/dir-listing-ls-9.expected b/net/data/ftp/dir-listing-ls-9.expected new file mode 100644 index 0000000..08bdb20 --- /dev/null +++ b/net/data/ftp/dir-listing-ls-9.expected @@ -0,0 +1,26 @@ +- +Akademia Teatralna spot.mpg +174680068 +current +6 +4 +23 +20 + +- +Foo - Instrukcja_ObsÅ‚ugi.pdf +3447432 +2009 +5 +18 +0 +0 + +- +Zdjecia.zip +23197684 +current +6 +9 +13 +36 diff --git a/net/data/ftp/dir-listing-vms-5 b/net/data/ftp/dir-listing-vms-5 new file mode 100644 index 0000000..d769993 --- /dev/null +++ b/net/data/ftp/dir-listing-vms-5 @@ -0,0 +1,12 @@ + +SYS:[ANON_LOGS] + +FTP_SERVER.LOG;1682 0 27-NOV-2009 14:35 [NET,ANONYMOUS] (RWED,RWED,,) +FTP_SERVER_LOG.KEEP;11400 + 2 19-DEC-1994 15:40 [NET,ANONYMOUS] (RWED,RWED,,) +FTP_SERVER_LOG.SEARCH;1 + 274 7-DEC-1993 15:54 [NET,ANONYMOUS] (RWED,RWED,,) +TESTLOG.DAT;1 0 27-APR-1995 13:18 [NET,ANONYMOUS] (RWED,RWED,,) + + +Total of 276 blocks in 4 files. diff --git a/net/data/ftp/dir-listing-vms-5.expected b/net/data/ftp/dir-listing-vms-5.expected new file mode 100644 index 0000000..a768a23 --- /dev/null +++ b/net/data/ftp/dir-listing-vms-5.expected @@ -0,0 +1,36 @@ +- +ftp_server.log +0 +2009 +11 +27 +14 +35 + +- +ftp_server_log.keep +1024 +1994 +12 +19 +15 +40 + +- +ftp_server_log.search +140288 +1993 +12 +7 +15 +54 + +- +testlog.dat +0 +1995 +4 +27 +13 +18 + |