FTP: correctly handle newlines in file names

This converts all .expected test files to CRLF line endings. BUG=164724 Review URL: https://codereview.chromium.org/11470035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172656 0039d316-1c4b-4281-b951-d872f2087c98
author: phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-12-12 21:11:10 +0000
committer: phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-12-12 21:11:10 +0000
commit: 0ea508612f10bbd8578e4384c26afe4859f7f7ba (patch)
tree: a6327d211957e367567aa70fb4cc71a08506315a
parent: bfd82e21f9ab168e2aa27454e11e97fc87a55a58 (diff)
download: chromium_src-0ea508612f10bbd8578e4384c26afe4859f7f7ba.zip
chromium_src-0ea508612f10bbd8578e4384c26afe4859f7f7ba.tar.gz
chromium_src-0ea508612f10bbd8578e4384c26afe4859f7f7ba.tar.bz2
38 files changed, 2129 insertions, 1988 deletions
diff --git a/net/data/ftp/dir-listing-ls-1-utf8.expected b/net/data/ftp/dir-listing-ls-1-utf8.expected
index 8e4508f..17db110 100644
--- a/net/data/ftp/dir-listing-ls-1-utf8.expected
+++ b/net/data/ftp/dir-listing-ls-1-utf8.expected
@@ -1,53 +1,53 @@
-d
-.
--1
-1994
-5
-15
-18
-11
-
-d
-..
--1
-1994
-5
-15
-18
-11
-
--
-.message
-528
-2007
-11
-1
-0
-0
-
--
-README！
-528
-2007
-11
-1
-0
-0
-
--
-こんにちは.html
-560
-2007
-9
-28
-0
-0
-
-d
-pub
--1
-2008
-8
-12
-0
-0
+d
+.
+-1
+1994
+5
+15
+18
+11
+
+d
+..
+-1
+1994
+5
+15
+18
+11
+
+-
+.message
+528
+2007
+11
+1
+0
+0
+
+-
+README！
+528
+2007
+11
+1
+0
+0
+
+-
+こんにちは.html
+560
+2007
+9
+28
+0
+0
+
+d
+pub
+-1
+2008
+8
+12
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-1.expected b/net/data/ftp/dir-listing-ls-1.expected
index 4037590..7998960 100644
--- a/net/data/ftp/dir-listing-ls-1.expected
+++ b/net/data/ftp/dir-listing-ls-1.expected
@@ -1,53 +1,53 @@
-d
-.
--1
-1994
-5
-15
-18
-11
-
-d
-..
--1
-1994
-5
-15
-18
-11
-
--
-.message
-528
-2007
-11
-1
-0
-0
-
--
-README
-528
-2007
-11
-1
-0
-0
-
--
-index.html
-560
-2007
-9
-28
-0
-0
-
-d
-pub
--1
-2008
-8
-12
-0
-0
+d
+.
+-1
+1994
+5
+15
+18
+11
+
+d
+..
+-1
+1994
+5
+15
+18
+11
+
+-
+.message
+528
+2007
+11
+1
+0
+0
+
+-
+README
+528
+2007
+11
+1
+0
+0
+
+-
+index.html
+560
+2007
+9
+28
+0
+0
+
+d
+pub
+-1
+2008
+8
+12
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-10.expected b/net/data/ftp/dir-listing-ls-10.expected
index 6e63cd0..73f16bf 100644
--- a/net/data/ftp/dir-listing-ls-10.expected
+++ b/net/data/ftp/dir-listing-ls-10.expected
@@ -1,80 +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
-1994
-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
+-
+.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
+1994
+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-11.expected b/net/data/ftp/dir-listing-ls-11.expected
index 82f1a9d..813bdba 100644
--- a/net/data/ftp/dir-listing-ls-11.expected
+++ b/net/data/ftp/dir-listing-ls-11.expected
@@ -1,62 +1,62 @@
-d
-beid
--1
-2009
-2
-25
-0
-0
-
-l
-bin
--1
-2007
-5
-1
-0
-0
-
-d
-dev
--1
-2007
-5
-1
-0
-0
-
-d
-etc
--1
-2007
-5
-1
-0
-0
-
-d
-pub
--1
-2009
-3
-27
-0
-0
-
-d
-tigerd1
--1
-2007
-4
-11
-0
-0
-
-d
-usr
--1
-2007
-5
-1
-0
-0
+d
+beid
+-1
+2009
+2
+25
+0
+0
+
+l
+bin
+-1
+2007
+5
+1
+0
+0
+
+d
+dev
+-1
+2007
+5
+1
+0
+0
+
+d
+etc
+-1
+2007
+5
+1
+0
+0
+
+d
+pub
+-1
+2009
+3
+27
+0
+0
+
+d
+tigerd1
+-1
+2007
+4
+11
+0
+0
+
+d
+usr
+-1
+2007
+5
+1
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-12.expected b/net/data/ftp/dir-listing-ls-12.expected
index c2f3232..c68e415 100644
--- a/net/data/ftp/dir-listing-ls-12.expected
+++ b/net/data/ftp/dir-listing-ls-12.expected
@@ -1,62 +1,62 @@
-l
-bin
--1
-2005
-9
-1
-0
-0
-
-d
-dev
--1
-2004
-8
-9
-0
-0
-
-d
-etc
--1
-2006
-9
-28
-0
-0
-
-d
-msgs
--1
-2006
-9
-28
-0
-0
-
-d
-pub
--1
-1994
-6
-30
-9
-52
-
-d
-usr
--1
-2004
-8
-9
-0
-0
-
-d
-var
--1
-2004
-8
-9
-0
-0
+l
+bin
+-1
+2005
+9
+1
+0
+0
+
+d
+dev
+-1
+2004
+8
+9
+0
+0
+
+d
+etc
+-1
+2006
+9
+28
+0
+0
+
+d
+msgs
+-1
+2006
+9
+28
+0
+0
+
+d
+pub
+-1
+1994
+6
+30
+9
+52
+
+d
+usr
+-1
+2004
+8
+9
+0
+0
+
+d
+var
+-1
+2004
+8
+9
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-13.expected b/net/data/ftp/dir-listing-ls-13.expected
index 049f3bf..30b0b70 100644
--- a/net/data/ftp/dir-listing-ls-13.expected
+++ b/net/data/ftp/dir-listing-ls-13.expected
@@ -1,26 +1,26 @@
--
-test.jpg
-93064
-2007
-12
-28
-0
-0
-
-d
-kernels
--1
-1993
-11
-17
-17
-8
-
--
-UpTime.exe
-13274
-2006
-3
-1
-0
-0
+-
+test.jpg
+93064
+2007
+12
+28
+0
+0
+
+d
+kernels
+-1
+1993
+11
+17
+17
+8
+
+-
+UpTime.exe
+13274
+2006
+3
+1
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-14.expected b/net/data/ftp/dir-listing-ls-14.expected
index 05c0398..86aca30 100644
--- a/net/data/ftp/dir-listing-ls-14.expected
+++ b/net/data/ftp/dir-listing-ls-14.expected
@@ -1,26 +1,26 @@
--
-!readme
-214
-2005
-6
-30
-0
-0
-
-d
-online
--1
-2006
-7
-17
-0
-0
-
--
-welcome.txt
-339
-2004
-2
-5
-0
-0
+-
+!readme
+214
+2005
+6
+30
+0
+0
+
+d
+online
+-1
+2006
+7
+17
+0
+0
+
+-
+welcome.txt
+339
+2004
+2
+5
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-15.expected b/net/data/ftp/dir-listing-ls-15.expected
index c521d00..99576fb 100644
--- a/net/data/ftp/dir-listing-ls-15.expected
+++ b/net/data/ftp/dir-listing-ls-15.expected
@@ -1,35 +1,35 @@
--
-.notar
-0
-2004
-3
-26
-0
-0
-
-d
-incoming
--1
-1993
-12
-8
-15
-54
-
--
-incoming.README
-7196
-2007
-8
-22
-0
-0
-
-d
-pub
--1
-1994
-9
-25
-9
-56
+-
+.notar
+0
+2004
+3
+26
+0
+0
+
+d
+incoming
+-1
+1993
+12
+8
+15
+54
+
+-
+incoming.README
+7196
+2007
+8
+22
+0
+0
+
+d
+pub
+-1
+1994
+9
+25
+9
+56
diff --git a/net/data/ftp/dir-listing-ls-16.expected b/net/data/ftp/dir-listing-ls-16.expected
index 90e39e6..18e553c 100644
--- a/net/data/ftp/dir-listing-ls-16.expected
+++ b/net/data/ftp/dir-listing-ls-16.expected
@@ -1,62 +1,62 @@
-d
-documentales
--1
-2008
-11
-28
-0
-0
-
-d
-dosier
--1
-2008
-11
-28
-0
-0
-
-d
-promos
--1
-2008
-12
-1
-0
-0
-
-d
-Sueños_futbol
--1
-2008
-11
-28
-0
-0
-
-d
-test
--1
-1994
-11
-2
-15
-53
-
-d
-tmp
--1
-1993
-11
-25
-10
-4
-
--
-Gastronomía.txt
-125
-2007
-10
-11
-0
-0
+d
+documentales
+-1
+2008
+11
+28
+0
+0
+
+d
+dosier
+-1
+2008
+11
+28
+0
+0
+
+d
+promos
+-1
+2008
+12
+1
+0
+0
+
+d
+Sueños_futbol
+-1
+2008
+11
+28
+0
+0
+
+d
+test
+-1
+1994
+11
+2
+15
+53
+
+d
+tmp
+-1
+1993
+11
+25
+10
+4
+
+-
+Gastronomía.txt
+125
+2007
+10
+11
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-18.expected b/net/data/ftp/dir-listing-ls-18.expected
index 41ba4c2..1a1fe36 100644
--- a/net/data/ftp/dir-listing-ls-18.expected
+++ b/net/data/ftp/dir-listing-ls-18.expected
@@ -1,26 +1,26 @@
--
-.pureftpd-upload.47fcbb3c.849.191b.cd40d08a
-0
-2008
-4
-9
-0
-0
-
--
-.pureftpd-upload.4925a00d.849.668d.9ea5b3ed
-0
-2008
-11
-20
-0
-0
-
--
-.pureftpd-upload.492b0a03.849.12d.bf5d2bc6
-8760
-2008
-11
-24
-0
-0
+-
+.pureftpd-upload.47fcbb3c.849.191b.cd40d08a
+0
+2008
+4
+9
+0
+0
+
+-
+.pureftpd-upload.4925a00d.849.668d.9ea5b3ed
+0
+2008
+11
+20
+0
+0
+
+-
+.pureftpd-upload.492b0a03.849.12d.bf5d2bc6
+8760
+2008
+11
+24
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-19.expected b/net/data/ftp/dir-listing-ls-19.expected
index 9f0f297..1d057a9 100644
--- a/net/data/ftp/dir-listing-ls-19.expected
+++ b/net/data/ftp/dir-listing-ls-19.expected
@@ -1,8 +1,8 @@
--
-junorelease.zip
-4327486
-2006
-6
-16
-0
-0
+-
+junorelease.zip
+4327486
+2006
+6
+16
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-2.expected b/net/data/ftp/dir-listing-ls-2.expected
index 315f0a5..403a61c 100644
--- a/net/data/ftp/dir-listing-ls-2.expected
+++ b/net/data/ftp/dir-listing-ls-2.expected
@@ -1,62 +1,62 @@
-d
-.
--1
-2008
-9
-18
-0
-0
-
-d
-..
--1
-2008
-9
-18
-0
-0
-
-l
-ftp
--1
-2007
-11
-8
-0
-0
-
-l
-mirror
--1
-2007
-10
-12
-0
-0
-
-l
-pub
--1
-2008
-9
-18
-0
-0
-
-l
-site
--1
-2007
-10
-16
-0
-0
-
-d
-vol
--1
-2008
-7
-2
-0
-0
+d
+.
+-1
+2008
+9
+18
+0
+0
+
+d
+..
+-1
+2008
+9
+18
+0
+0
+
+l
+ftp
+-1
+2007
+11
+8
+0
+0
+
+l
+mirror
+-1
+2007
+10
+12
+0
+0
+
+l
+pub
+-1
+2008
+9
+18
+0
+0
+
+l
+site
+-1
+2007
+10
+16
+0
+0
+
+d
+vol
+-1
+2008
+7
+2
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-24.expected b/net/data/ftp/dir-listing-ls-24.expected
index c46afa2..bdfd309 100644
--- a/net/data/ftp/dir-listing-ls-24.expected
+++ b/net/data/ftp/dir-listing-ls-24.expected
@@ -1,8 +1,8 @@
-d
-note_empty_line_below
--1
-2008
-8
-12
-0
-0
+d
+note_empty_line_below
+-1
+2008
+8
+12
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-25.expected b/net/data/ftp/dir-listing-ls-25.expected
index 3405f86..8b1b2db 100644
--- a/net/data/ftp/dir-listing-ls-25.expected
+++ b/net/data/ftp/dir-listing-ls-25.expected
@@ -1,53 +1,53 @@
-d
-.
--1
-1994
-4
-15
-18
-11
-
-d
-..
--1
-1994
-7
-15
-18
-11
-
--
-.message
-528
-2007
-5
-1
-0
-0
-
--
-README
-528
-2007
-11
-1
-0
-0
-
--
-index.html
-560
-2007
-9
-28
-0
-0
-
-d
-pub
--1
-2008
-2
-12
-0
-0
+d
+.
+-1
+1994
+4
+15
+18
+11
+
+d
+..
+-1
+1994
+7
+15
+18
+11
+
+-
+.message
+528
+2007
+5
+1
+0
+0
+
+-
+README
+528
+2007
+11
+1
+0
+0
+
+-
+index.html
+560
+2007
+9
+28
+0
+0
+
+d
+pub
+-1
+2008
+2
+12
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-26.expected b/net/data/ftp/dir-listing-ls-26.expected
index 3405f86..8b1b2db 100644
--- a/net/data/ftp/dir-listing-ls-26.expected
+++ b/net/data/ftp/dir-listing-ls-26.expected
@@ -1,53 +1,53 @@
-d
-.
--1
-1994
-4
-15
-18
-11
-
-d
-..
--1
-1994
-7
-15
-18
-11
-
--
-.message
-528
-2007
-5
-1
-0
-0
-
--
-README
-528
-2007
-11
-1
-0
-0
-
--
-index.html
-560
-2007
-9
-28
-0
-0
-
-d
-pub
--1
-2008
-2
-12
-0
-0
+d
+.
+-1
+1994
+4
+15
+18
+11
+
+d
+..
+-1
+1994
+7
+15
+18
+11
+
+-
+.message
+528
+2007
+5
+1
+0
+0
+
+-
+README
+528
+2007
+11
+1
+0
+0
+
+-
+index.html
+560
+2007
+9
+28
+0
+0
+
+d
+pub
+-1
+2008
+2
+12
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-27.expected b/net/data/ftp/dir-listing-ls-27.expected
index 3405f86..8b1b2db 100644
--- a/net/data/ftp/dir-listing-ls-27.expected
+++ b/net/data/ftp/dir-listing-ls-27.expected
@@ -1,53 +1,53 @@
-d
-.
--1
-1994
-4
-15
-18
-11
-
-d
-..
--1
-1994
-7
-15
-18
-11
-
--
-.message
-528
-2007
-5
-1
-0
-0
-
--
-README
-528
-2007
-11
-1
-0
-0
-
--
-index.html
-560
-2007
-9
-28
-0
-0
-
-d
-pub
--1
-2008
-2
-12
-0
-0
+d
+.
+-1
+1994
+4
+15
+18
+11
+
+d
+..
+-1
+1994
+7
+15
+18
+11
+
+-
+.message
+528
+2007
+5
+1
+0
+0
+
+-
+README
+528
+2007
+11
+1
+0
+0
+
+-
+index.html
+560
+2007
+9
+28
+0
+0
+
+d
+pub
+-1
+2008
+2
+12
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-28.expected b/net/data/ftp/dir-listing-ls-28.expected
index 6f68ba4..ca5fb9c 100644
--- a/net/data/ftp/dir-listing-ls-28.expected
+++ b/net/data/ftp/dir-listing-ls-28.expected
@@ -1,45 +1,44 @@
-d
-pollq
--1
-1993
-12
-10
-14
-32
-
-d
-etc
--1
-1994
-7
-28
-1
-44
-
-d
-tmp
--1
-1994
-7
-28
-2
-41
-
-d
-status
--1
-1994
-7
-28
-2
-0
-
-d
-bin
--1
-1994
-7
-27
-23
-21
-
+d
+pollq
+-1
+1993
+12
+10
+14
+32
+
+d
+etc
+-1
+1994
+7
+28
+1
+44
+
+d
+tmp
+-1
+1994
+7
+28
+2
+41
+
+d
+status
+-1
+1994
+7
+28
+2
+0
+
+d
+bin
+-1
+1994
+7
+27
+23
+21
diff --git a/net/data/ftp/dir-listing-ls-29.expected b/net/data/ftp/dir-listing-ls-29.expected
index fd835ca..b480f09 100644
--- a/net/data/ftp/dir-listing-ls-29.expected
+++ b/net/data/ftp/dir-listing-ls-29.expected
@@ -1,62 +1,62 @@
-d
-.
--1
-1994
-4
-6
-0
-36
-
-d
-..
--1
-1994
-4
-10
-18
-0
-
--
-GRBRATLIN64_4_77_ia64_4.77_S0@874222@03717.rpm.Z
-110583757 
-1994
-4
-5
-13
-43
-
--
-GRBRATLIN_4_77_ia32_4.77_S0@874222@20701.rpm.Z
-121591811 
-1994
-4
-5
-13
-43
-
--
-XENRATLIN64_4_77_ia64_4.77_S0@874222@17785.rpm.Z
-110965625 
-1994
-4
-5
-13
-43
-
--
-XENRATLIN_4_77_ia32_4.77_S0@874222@09635.rpm.Z
-121986153 
-1994
-4
-5
-13
-44
-
--
-XENRATS10_4_77_sun4_10_4.77_S0@874222@21358.dstream.Z
-151525255 
-1994
-4
-5
-13
-44
+d
+.
+-1
+1994
+4
+6
+0
+36
+
+d
+..
+-1
+1994
+4
+10
+18
+0
+
+-
+GRBRATLIN64_4_77_ia64_4.77_S0@874222@03717.rpm.Z
+110583757 
+1994
+4
+5
+13
+43
+
+-
+GRBRATLIN_4_77_ia32_4.77_S0@874222@20701.rpm.Z
+121591811 
+1994
+4
+5
+13
+43
+
+-
+XENRATLIN64_4_77_ia64_4.77_S0@874222@17785.rpm.Z
+110965625 
+1994
+4
+5
+13
+43
+
+-
+XENRATLIN_4_77_ia32_4.77_S0@874222@09635.rpm.Z
+121986153 
+1994
+4
+5
+13
+44
+
+-
+XENRATS10_4_77_sun4_10_4.77_S0@874222@21358.dstream.Z
+151525255 
+1994
+4
+5
+13
+44
diff --git a/net/data/ftp/dir-listing-ls-3.expected b/net/data/ftp/dir-listing-ls-3.expected
index 37bbbaf..c2431a6 100644
--- a/net/data/ftp/dir-listing-ls-3.expected
+++ b/net/data/ftp/dir-listing-ls-3.expected
@@ -1,53 +1,53 @@
--
-.welcome
-90
-2003
-3
-1
-0
-0
-
-d
-decus
--1
-2005
-2
-26
-0
-0
-
-d
-gnv
--1
-2006
-12
-2
-0
-0
-
--
-unzip.alpha_exe
-158208
-2003
-4
-10
-0
-0
-
--
-unzip.vax_exe
-102400
-2003
-4
-10
-0
-0
-
-d
-vms-freeware
--1
-2003
-3
-1
-0
-0
+-
+.welcome
+90
+2003
+3
+1
+0
+0
+
+d
+decus
+-1
+2005
+2
+26
+0
+0
+
+d
+gnv
+-1
+2006
+12
+2
+0
+0
+
+-
+unzip.alpha_exe
+158208
+2003
+4
+10
+0
+0
+
+-
+unzip.vax_exe
+102400
+2003
+4
+10
+0
+0
+
+d
+vms-freeware
+-1
+2003
+3
+1
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-30.expected b/net/data/ftp/dir-listing-ls-30.expected
index 19dcc75..a94497a 100644
--- a/net/data/ftp/dir-listing-ls-30.expected
+++ b/net/data/ftp/dir-listing-ls-30.expected
@@ -1,8 +1,8 @@
-d
-downloads
--1
-2010
-5
-27
-0
-0
+d
+downloads
+-1
+2010
+5
+27
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-31 b/net/data/ftp/dir-listing-ls-31
new file mode 100644
index 0000000..237a54a
--- /dev/null
+++ b/net/data/ftp/dir-listing-ls-31
@@ -0,0 +1,15 @@
+drwxrwxrwx    6 1000     1000         4096 Jul 23  2011 Alfresco
+drwxrwxrwx    2 1000     1000         4096 Mar 18  2010 DIRECTUM
+-rwxrwxrwx    1 1000     1000       222510 Mar 29  2010 Featurelist 6.30.pdf
+drwxrwxrwx    2 1000     1000         4096 Jul 23  2011 NauDoc_v4.4
+-rwxrwxrwx    1 1000     1000      1564767 Apr 06  2010 RUS_v_01_00_МЕТОД СБОРА И ДОКУМЕНТИРОВАНИЯ
+     ТРЕБОВАНИЙ К ПОРТАЛУ
+.pdf
+drwxrwxrwx    4 1000     1000         4096 Jul 22  2011 Videoconferencing
+drwxrwxrwx    3 1000     1000         4096 Apr 15  2010 Virtualization
+-rwxrwxrwx    1 1000     1000     111726333 Jan 10  2010 electr_docoborot_2010.flv
+-rwxrwxrwx    1 1000     1000      4224387 Mar 31  2010 millenniumbsa.pdf
+drwxrwxrwx    5 1000     1000         4096 Apr 16  2010 Бизнес План
+-rwxrwxrwx    1 1000     1000       138217 Apr 16  2010 Мониторинг в инфраструктуре распределенных приложений .NET.rar
+-rwxrwxrwx    1 1000     1000         4131 Feb 25  2010 О законе О персональных данных.txt
+-rwxrwxrwx    1 1000     1000      3627173 Feb 21  2010 Шеер А.В. -- Бизнес-процессы. Основные понятия..djvu
diff --git a/net/data/ftp/dir-listing-ls-31.expected b/net/data/ftp/dir-listing-ls-31.expected
new file mode 100644
index 0000000..3addbee
--- /dev/null
+++ b/net/data/ftp/dir-listing-ls-31.expected
@@ -0,0 +1,118 @@
+d
+Alfresco
+-1
+2011
+7
+23
+0
+0
+
+d
+DIRECTUM
+-1
+2010
+3
+18
+0
+0
+
+-
+Featurelist 6.30.pdf
+222510
+2010
+3
+29
+0
+0
+
+d
+NauDoc_v4.4
+-1
+2011
+7
+23
+0
+0
+
+-
+RUS_v_01_00_МЕТОД СБОРА И ДОКУМЕНТИРОВАНИЯ
+     ТРЕБОВАНИЙ К ПОРТАЛУ
+.pdf
+1564767
+2010
+4
+6
+0
+0
+
+d
+Videoconferencing
+-1
+2011
+7
+22
+0
+0
+
+d
+Virtualization
+-1
+2010
+4
+15
+0
+0
+
+-
+electr_docoborot_2010.flv
+111726333
+2010
+1
+10
+0
+0
+
+-
+millenniumbsa.pdf
+4224387
+2010
+3
+31
+0
+0
+
+d
+Бизнес План
+-1
+2010
+4
+16
+0
+0
+
+-
+Мониторинг в инфраструктуре распределенных приложений .NET.rar
+138217
+2010
+4
+16
+0
+0
+
+-
+О законе О персональных данных.txt
+4131
+2010
+2
+25
+0
+0
+
+-
+Шеер А.В. -- Бизнес-процессы. Основные понятия..djvu
+3627173
+2010
+2
+21
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-4.expected b/net/data/ftp/dir-listing-ls-4.expected
index 5339703..0a49e5e 100644
--- a/net/data/ftp/dir-listing-ls-4.expected
+++ b/net/data/ftp/dir-listing-ls-4.expected
@@ -1,80 +1,80 @@
--
-.welcome
-472
-2004
-6
-28
-0
-0
-
-d
-contributed-software
--1
-1998
-3
-5
-0
-0
-
-d
-customer_support
--1
-1997
-11
-11
-0
-0
-
-d
-docs
--1
-1998
-12
-30
-0
-0
-
-d
-faq
--1
-1998
-5
-8
-0
-0
-
-d
-mail_archives
--1
-1997
-11
-11
-0
-0
-
-d
-patches
--1
-1997
-11
-11
-0
-0
-
-d
-tech-tips
--1
-1997
-11
-11
-0
-0
-
-d
-white_papers
--1
-1997
-11
-11
-0
-0
+-
+.welcome
+472
+2004
+6
+28
+0
+0
+
+d
+contributed-software
+-1
+1998
+3
+5
+0
+0
+
+d
+customer_support
+-1
+1997
+11
+11
+0
+0
+
+d
+docs
+-1
+1998
+12
+30
+0
+0
+
+d
+faq
+-1
+1998
+5
+8
+0
+0
+
+d
+mail_archives
+-1
+1997
+11
+11
+0
+0
+
+d
+patches
+-1
+1997
+11
+11
+0
+0
+
+d
+tech-tips
+-1
+1997
+11
+11
+0
+0
+
+d
+white_papers
+-1
+1997
+11
+11
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-5.expected b/net/data/ftp/dir-listing-ls-5.expected
index 3acbcf3..1cf3e9a 100644
--- a/net/data/ftp/dir-listing-ls-5.expected
+++ b/net/data/ftp/dir-listing-ls-5.expected
@@ -1,8 +1,8 @@
-d
-pub
--1
-2007
-2
-20
-0
-0
+d
+pub
+-1
+2007
+2
+20
+0
+0
diff --git a/net/data/ftp/dir-listing-ls-6.expected b/net/data/ftp/dir-listing-ls-6.expected
index 80b61dd..be30bc6 100644
--- a/net/data/ftp/dir-listing-ls-6.expected
+++ b/net/data/ftp/dir-listing-ls-6.expected
@@ -1,53 +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
+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.expected b/net/data/ftp/dir-listing-ls-7.expected
index 90c13511..1e0e5d3 100644
--- a/net/data/ftp/dir-listing-ls-7.expected
+++ b/net/data/ftp/dir-listing-ls-7.expected
@@ -1,53 +1,53 @@
--
-00readme.html
-3108
-2001
-3
-7
-0
-0
-
-d
-OCU
--1
-1994
-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
+-
+00readme.html
+3108
+2001
+3
+7
+0
+0
+
+d
+OCU
+-1
+1994
+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-9.expected b/net/data/ftp/dir-listing-ls-9.expected
index afc9791..98fe537 100644
--- a/net/data/ftp/dir-listing-ls-9.expected
+++ b/net/data/ftp/dir-listing-ls-9.expected
@@ -1,26 +1,26 @@
--
-Akademia Teatralna spot.mpg
-174680068 
-1994
-6
-4
-23
-20
-
--
-Foo - Instrukcja_Obsługi.pdf
-3447432 
-2009
-5
-18
-0
-0
-
--
-Zdjecia.zip
-23197684 
-1994
-6
-9
-13
-36
+-
+Akademia Teatralna spot.mpg
+174680068 
+1994
+6
+4
+23
+20
+
+-
+Foo - Instrukcja_Obsługi.pdf
+3447432 
+2009
+5
+18
+0
+0
+
+-
+Zdjecia.zip
+23197684 
+1994
+6
+9
+13
+36
diff --git a/net/data/ftp/dir-listing-netware-1.expected b/net/data/ftp/dir-listing-netware-1.expected
index be3f9b8..3084dbf 100644
--- a/net/data/ftp/dir-listing-netware-1.expected
+++ b/net/data/ftp/dir-listing-netware-1.expected
@@ -1,17 +1,17 @@
-d
-pandora
--1
-2007
-6
-25
-0
-0
-
-d
-pub
--1
-2004
-1
-29
-0
-0
+d
+pandora
+-1
+2007
+6
+25
+0
+0
+
+d
+pub
+-1
+2004
+1
+29
+0
+0
diff --git a/net/data/ftp/dir-listing-netware-2.expected b/net/data/ftp/dir-listing-netware-2.expected
index 3c78ff0..e958a1a 100644
--- a/net/data/ftp/dir-listing-netware-2.expected
+++ b/net/data/ftp/dir-listing-netware-2.expected
@@ -1,26 +1,26 @@
--
-rootcert.der
-1328
-2007
-12
-27
-0
-0
-
-d
-Driver
--1
-1994
-11
-13
-7
-51
-
-d
-temp
--1
-1993
-11
-16
-15
-40
+-
+rootcert.der
+1328
+2007
+12
+27
+0
+0
+
+d
+Driver
+-1
+1994
+11
+13
+7
+51
+
+d
+temp
+-1
+1993
+11
+16
+15
+40
diff --git a/net/data/ftp/dir-listing-netware-3.expected b/net/data/ftp/dir-listing-netware-3.expected
index fe809e3..44393e1 100644
--- a/net/data/ftp/dir-listing-netware-3.expected
+++ b/net/data/ftp/dir-listing-netware-3.expected
@@ -1,188 +1,188 @@
--
-leltar.as
-1588
-1994
-10
-28
-22
-21
-
--
-leltarVizellatas.as
-19440
-1994
-10
-28
-22
-21
-
--
-leltarVizelvezetes.as
-38795
-1994
-10
-28
-22
-21
-
--
-Olvass_el.txt
-227
-2010
-1
-6
-0
-0
-
--
-vegleges.pdf
-19300888
-2011
-1
-15
-0
-0
-
-d
-DHI
--1
-2011
-11
-10
-0
-0
-
-d
-English
--1
-1994
-8
-2
-11
-48
-
-d
-Floodrisk
--1
-2011
-6
-24
-0
-0
-
-d
-HC_MIR_FD
--1
-1994
-3
-10
-14
-53
-
-d
-HCWP614-11
--1
-1994
-10
-8
-15
-59
-
-d
-Mike
--1
-1994
-3
-26
-15
-10
-
-d
-NVP anyagok
--1
-2010
-5
-17
-0
-0
-
-d
-Oktatas
--1
-2010
-9
-15
-0
-0
-
-d
-processing_modflow
--1
-1994
-10
-9
-12
-47
-
-d
-Prospektushoz
--1
-2010
-3
-24
-0
-0
-
-d
-sewcad
--1
-2011
-9
-5
-0
-0
-
-d
-szakmernok
--1
-1994
-5
-9
-8
-50
-
-d
-tomi
--1
-1994
-8
-3
-18
-53
-
-d
-Virtualis-GEP
--1
-1994
-9
-20
-21
-10
-
-d
-Vizrajzi evkonyvek
--1
-1994
-9
-26
-12
-31
-
-d
-VKKI-Tanulmanyok
--1
-2011
-7
-9
-0
-0
+-
+leltar.as
+1588
+1994
+10
+28
+22
+21
+
+-
+leltarVizellatas.as
+19440
+1994
+10
+28
+22
+21
+
+-
+leltarVizelvezetes.as
+38795
+1994
+10
+28
+22
+21
+
+-
+Olvass_el.txt
+227
+2010
+1
+6
+0
+0
+
+-
+vegleges.pdf
+19300888
+2011
+1
+15
+0
+0
+
+d
+DHI
+-1
+2011
+11
+10
+0
+0
+
+d
+English
+-1
+1994
+8
+2
+11
+48
+
+d
+Floodrisk
+-1
+2011
+6
+24
+0
+0
+
+d
+HC_MIR_FD
+-1
+1994
+3
+10
+14
+53
+
+d
+HCWP614-11
+-1
+1994
+10
+8
+15
+59
+
+d
+Mike
+-1
+1994
+3
+26
+15
+10
+
+d
+NVP anyagok
+-1
+2010
+5
+17
+0
+0
+
+d
+Oktatas
+-1
+2010
+9
+15
+0
+0
+
+d
+processing_modflow
+-1
+1994
+10
+9
+12
+47
+
+d
+Prospektushoz
+-1
+2010
+3
+24
+0
+0
+
+d
+sewcad
+-1
+2011
+9
+5
+0
+0
+
+d
+szakmernok
+-1
+1994
+5
+9
+8
+50
+
+d
+tomi
+-1
+1994
+8
+3
+18
+53
+
+d
+Virtualis-GEP
+-1
+1994
+9
+20
+21
+10
+
+d
+Vizrajzi evkonyvek
+-1
+1994
+9
+26
+12
+31
+
+d
+VKKI-Tanulmanyok
+-1
+2011
+7
+9
+0
+0
diff --git a/net/data/ftp/dir-listing-vms-1.expected b/net/data/ftp/dir-listing-vms-1.expected
index 5bc2ab5..8e9dddd 100644
--- a/net/data/ftp/dir-listing-vms-1.expected
+++ b/net/data/ftp/dir-listing-vms-1.expected
@@ -1,98 +1,98 @@
--
-.welcome
-1024
-2002
-2
-13
-23
-32
-
-d
-decus
--1
-2001
-5
-9
-22
-18
-
-d
-information
--1
-2001
-5
-9
-22
-23
-
-d
-madgoat
--1
-2001
-5
-9
-22
-23
-
-d
-mail_archives
--1
-2005
-12
-13
-8
-45
-
-d
-mozilla
--1
-2001
-6
-21
-14
-57
-
--
-readme.txt
-1024
-2000
-4
-18
-10
-40
-
-d
-ssh
--1
-2002
-6
-22
-15
-11
-
-d
-support
--1
-2001
-5
-9
-22
-29
-
-d
-tcpware
--1
-2001
-5
-9
-23
-34
-
-d
-vms-freeware
--1
-2001
-5
-9
-23
-58
+-
+.welcome
+1024
+2002
+2
+13
+23
+32
+
+d
+decus
+-1
+2001
+5
+9
+22
+18
+
+d
+information
+-1
+2001
+5
+9
+22
+23
+
+d
+madgoat
+-1
+2001
+5
+9
+22
+23
+
+d
+mail_archives
+-1
+2005
+12
+13
+8
+45
+
+d
+mozilla
+-1
+2001
+6
+21
+14
+57
+
+-
+readme.txt
+1024
+2000
+4
+18
+10
+40
+
+d
+ssh
+-1
+2002
+6
+22
+15
+11
+
+d
+support
+-1
+2001
+5
+9
+22
+29
+
+d
+tcpware
+-1
+2001
+5
+9
+23
+34
+
+d
+vms-freeware
+-1
+2001
+5
+9
+23
+58
diff --git a/net/data/ftp/dir-listing-vms-2.expected b/net/data/ftp/dir-listing-vms-2.expected
index 6b3ca66..92ea55b 100644
--- a/net/data/ftp/dir-listing-vms-2.expected
+++ b/net/data/ftp/dir-listing-vms-2.expected
@@ -1,260 +1,260 @@
--
-announce.txt
-512
-2005
-3
-12
-8
-44
-
-d
-boinc
--1
-2005
-12
-29
-21
-33
-
-d
-bzip2
--1
-2005
-9
-27
-19
-45
-
-d
-cdrtools
--1
-2005
-3
-10
-17
-31
-
-d
-diffutils
--1
-2007
-6
-23
-23
-4
-
-d
-dtss_ntp
--1
-2000
-9
-25
-21
-3
-
-d
-fixrec
--1
-2003
-12
-20
-10
-57
-
-d
-gnupg
--1
-2006
-8
-9
-2
-11
-
-d
-gzip
--1
-2006
-7
-5
-21
-59
-
-d
-info-zip
--1
-2004
-9
-20
-21
-27
-
-d
-input
--1
-1999
-3
-4
-22
-14
-
-d
-kermit
--1
-2006
-2
-25
-12
-22
-
--
-login.com
-512
-2006
-9
-28
-9
-20
-
-d
-misc
--1
-1999
-12
-12
-17
-31
-
-d
-mmk
--1
-2009
-9
-30
-8
-6
-
-d
-moz_test
--1
-2008
-4
-8
-17
-12
-
-d
-mpack
--1
-2009
-8
-21
-10
-28
-
-d
-mtools
--1
-2006
-3
-14
-15
-5
-
-d
-openssl
--1
-2009
-1
-12
-8
-42
-
-d
-pgp
--1
-1999
-9
-19
-16
-39
-
-d
-qreadcd
--1
-2004
-9
-29
-20
-32
-
-d
-rzspinup
--1
-2004
-7
-24
-21
-34
-
-d
-test
--1
-2008
-11
-5
-21
-59
-
-d
-vim
--1
-2005
-4
-30
-16
-32
-
-d
-vmstar
--1
-2007
-6
-7
-9
-36
-
--
-welcome.txt
-512
-2005
-3
-12
-8
-45
-
-d
-wget
--1
-1999
-8
-17
-20
-41
-
-d
-wget_test
--1
-2006
-6
-13
-21
-29
-
-d
-wput
--1
-2004
-12
-9
-20
-16
+-
+announce.txt
+512
+2005
+3
+12
+8
+44
+
+d
+boinc
+-1
+2005
+12
+29
+21
+33
+
+d
+bzip2
+-1
+2005
+9
+27
+19
+45
+
+d
+cdrtools
+-1
+2005
+3
+10
+17
+31
+
+d
+diffutils
+-1
+2007
+6
+23
+23
+4
+
+d
+dtss_ntp
+-1
+2000
+9
+25
+21
+3
+
+d
+fixrec
+-1
+2003
+12
+20
+10
+57
+
+d
+gnupg
+-1
+2006
+8
+9
+2
+11
+
+d
+gzip
+-1
+2006
+7
+5
+21
+59
+
+d
+info-zip
+-1
+2004
+9
+20
+21
+27
+
+d
+input
+-1
+1999
+3
+4
+22
+14
+
+d
+kermit
+-1
+2006
+2
+25
+12
+22
+
+-
+login.com
+512
+2006
+9
+28
+9
+20
+
+d
+misc
+-1
+1999
+12
+12
+17
+31
+
+d
+mmk
+-1
+2009
+9
+30
+8
+6
+
+d
+moz_test
+-1
+2008
+4
+8
+17
+12
+
+d
+mpack
+-1
+2009
+8
+21
+10
+28
+
+d
+mtools
+-1
+2006
+3
+14
+15
+5
+
+d
+openssl
+-1
+2009
+1
+12
+8
+42
+
+d
+pgp
+-1
+1999
+9
+19
+16
+39
+
+d
+qreadcd
+-1
+2004
+9
+29
+20
+32
+
+d
+rzspinup
+-1
+2004
+7
+24
+21
+34
+
+d
+test
+-1
+2008
+11
+5
+21
+59
+
+d
+vim
+-1
+2005
+4
+30
+16
+32
+
+d
+vmstar
+-1
+2007
+6
+7
+9
+36
+
+-
+welcome.txt
+512
+2005
+3
+12
+8
+45
+
+d
+wget
+-1
+1999
+8
+17
+20
+41
+
+d
+wget_test
+-1
+2006
+6
+13
+21
+29
+
+d
+wput
+-1
+2004
+12
+9
+20
+16
diff --git a/net/data/ftp/dir-listing-vms-4.expected b/net/data/ftp/dir-listing-vms-4.expected
index 3c89235..a638df9 100644
--- a/net/data/ftp/dir-listing-vms-4.expected
+++ b/net/data/ftp/dir-listing-vms-4.expected
@@ -1,71 +1,71 @@
--
-$main.tpu$journal
-512
-2009
-11
-4
-5
-59
-
--
-.welcome
-512
-2009
-11
-4
-6
-2
-
--
-example.txt
-512
-2009
-11
-4
-6
-2
-
--
-file.
-512
-2009
-11
-4
-8
-59
-
--
-ftp_server.log
-0
-2009
-11
-4
-9
-12
-
--
-login.com
-1024
-2009
-11
-4
-5
-58
-
--
-notes$notebook.note
-18432
-2009
-11
-4
-5
-55
-
-d
-test
--1
-2009
-11
-4
-8
-15
+-
+$main.tpu$journal
+512
+2009
+11
+4
+5
+59
+
+-
+.welcome
+512
+2009
+11
+4
+6
+2
+
+-
+example.txt
+512
+2009
+11
+4
+6
+2
+
+-
+file.
+512
+2009
+11
+4
+8
+59
+
+-
+ftp_server.log
+0
+2009
+11
+4
+9
+12
+
+-
+login.com
+1024
+2009
+11
+4
+5
+58
+
+-
+notes$notebook.note
+18432
+2009
+11
+4
+5
+55
+
+d
+test
+-1
+2009
+11
+4
+8
+15
diff --git a/net/data/ftp/dir-listing-vms-5.expected b/net/data/ftp/dir-listing-vms-5.expected
index a768a23..9159498 100644
--- a/net/data/ftp/dir-listing-vms-5.expected
+++ b/net/data/ftp/dir-listing-vms-5.expected
@@ -1,36 +1,35 @@
--
-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
-
+-
+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
diff --git a/net/data/ftp/dir-listing-windows-1.expected b/net/data/ftp/dir-listing-windows-1.expected
index 8fbbb48..068c296 100644
--- a/net/data/ftp/dir-listing-windows-1.expected
+++ b/net/data/ftp/dir-listing-windows-1.expected
@@ -1,17 +1,17 @@
-d
-NT
--1
-2009
-11
-2
-17
-32
-
--
-Readme.txt
-458
-2009
-1
-6
-14
-42
+d
+NT
+-1
+2009
+11
+2
+17
+32
+
+-
+Readme.txt
+458
+2009
+1
+6
+14
+42
diff --git a/net/data/ftp/dir-listing-windows-2.expected b/net/data/ftp/dir-listing-windows-2.expected
index 81388ee..be951fa 100644
--- a/net/data/ftp/dir-listing-windows-2.expected
+++ b/net/data/ftp/dir-listing-windows-2.expected
@@ -1,143 +1,143 @@
-d
-beta
--1
-2009
-5
-18
-11
-7
-
-d
-cdrom
--1
-2009
-1
-6
-16
-25
-
--
-checkdownload.html
-129
-2009
-1
-6
-14
-38
-
-d
-Digital_Media_Player
--1
-2009
-8
-19
-11
-23
-
-d
-LiveUpdate
--1
-2008
-12
-29
-22
-27
-
-d
-mb
--1
-2009
-8
-20
-16
-34
-
--
-Mb.eng
-83933
-2009
-1
-6
-14
-38
-
-d
-misc
--1
-2009
-11
-4
-15
-42
-
--
-Path.idx
-462
-2009
-6
-12
-16
-20
-
-d
-PDA
--1
-2008
-12
-30
-7
-41
-
--
-Platform.idx
-2625
-2009
-1
-6
-14
-38
-
-d
-print
--1
-2008
-12
-30
-7
-41
-
--
-Readme.txt
-458
-2009
-1
-6
-14
-42
-
-d
-server
--1
-2009
-10
-28
-14
-27
-
-d
-vga
--1
-2008
-12
-30
-8
-59
-
--
-VH203_FR.pdf
-1951823
-2009
-2
-3
-16
-42
+d
+beta
+-1
+2009
+5
+18
+11
+7
+
+d
+cdrom
+-1
+2009
+1
+6
+16
+25
+
+-
+checkdownload.html
+129
+2009
+1
+6
+14
+38
+
+d
+Digital_Media_Player
+-1
+2009
+8
+19
+11
+23
+
+d
+LiveUpdate
+-1
+2008
+12
+29
+22
+27
+
+d
+mb
+-1
+2009
+8
+20
+16
+34
+
+-
+Mb.eng
+83933
+2009
+1
+6
+14
+38
+
+d
+misc
+-1
+2009
+11
+4
+15
+42
+
+-
+Path.idx
+462
+2009
+6
+12
+16
+20
+
+d
+PDA
+-1
+2008
+12
+30
+7
+41
+
+-
+Platform.idx
+2625
+2009
+1
+6
+14
+38
+
+d
+print
+-1
+2008
+12
+30
+7
+41
+
+-
+Readme.txt
+458
+2009
+1
+6
+14
+42
+
+d
+server
+-1
+2009
+10
+28
+14
+27
+
+d
+vga
+-1
+2008
+12
+30
+8
+59
+
+-
+VH203_FR.pdf
+1951823
+2009
+2
+3
+16
+42
diff --git a/net/ftp/ftp_directory_listing_parser.cc b/net/ftp/ftp_directory_listing_parser.cc
index d7c7c7d..3cacee0 100644
--- a/net/ftp/ftp_directory_listing_parser.cc
+++ b/net/ftp/ftp_directory_listing_parser.cc
@@ -11,6 +11,7 @@
 #include "base/stl_util.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/ftp/ftp_directory_listing_parser_ls.h"
 #include "net/ftp/ftp_directory_listing_parser_netware.h"
@@ -41,12 +42,13 @@ int FillInRawName(const std::string& encoding,
 // Parses |text| as an FTP directory listing. Fills in |entries|
 // and |server_type| and returns network error code.
 int ParseListing(const string16& text,
+                 const string16& newline_separator,
                  const std::string& encoding,
                  const base::Time& current_time,
                  std::vector<FtpDirectoryListingEntry>* entries,
                  FtpServerType* server_type) {
   std::vector<string16> lines;
-  base::SplitString(text, '\n', &lines);
+  base::SplitStringUsingSubstr(text, newline_separator, &lines);
 
   struct {
     base::Callback<bool(void)> callback;
@@ -93,6 +95,8 @@ int DecodeAndParse(const std::string& text,
                    const base::Time& current_time,
                    std::vector<FtpDirectoryListingEntry>* entries,
                    FtpServerType* server_type) {
+  const char* kNewlineSeparators[] = { "\n", "\r\n" };
+
   std::vector<std::string> encodings;
   if (!base::DetectAllEncodings(text, &encodings))
     return ERR_ENCODING_DETECTION_FAILED;
@@ -104,13 +108,16 @@ int DecodeAndParse(const std::string& text,
                               encodings[i].c_str(),
                               base::OnStringConversionError::FAIL,
                               &converted_text)) {
-      int rv = ParseListing(converted_text,
-                            encodings[i],
-                            current_time,
-                            entries,
-                            server_type);
-      if (rv == OK)
-        return rv;
+      for (size_t j = 0; j < arraysize(kNewlineSeparators); j++) {
+        int rv = ParseListing(converted_text,
+                              ASCIIToUTF16(kNewlineSeparators[j]),
+                              encodings[i],
+                              current_time,
+                              entries,
+                              server_type);
+        if (rv == OK)
+          return rv;
+      }
     }
   }
 
diff --git a/net/ftp/ftp_directory_listing_parser_unittest.cc b/net/ftp/ftp_directory_listing_parser_unittest.cc
index 02f1392..434cdfa 100644
--- a/net/ftp/ftp_directory_listing_parser_unittest.cc
+++ b/net/ftp/ftp_directory_listing_parser_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
-#include "base/string_tokenizer.h"
+#include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/ftp/ftp_directory_listing_parser.h"
@@ -56,26 +56,28 @@ TEST_P(FtpDirectoryListingParserTest, Parse) {
                   &expected_listing));
 
   std::vector<std::string> lines;
-  StringTokenizer tokenizer(expected_listing, "\r\n");
-  while (tokenizer.GetNext())
-    lines.push_back(tokenizer.token());
+  base::SplitStringUsingSubstr(expected_listing, "\r\n", &lines);
 
-  ASSERT_EQ(8 * entries.size(), lines.size());
+  // Special case for empty listings.
+  if (lines.size() == 1 && lines[0].empty())
+    lines.clear();
 
-  for (size_t i = 0; i < lines.size() / 8; i++) {
-    std::string type(lines[8 * i]);
-    std::string name(lines[8 * i + 1]);
+  ASSERT_EQ(9 * entries.size(), lines.size());
+
+  for (size_t i = 0; i < lines.size() / 9; i++) {
+    std::string type(lines[9 * i]);
+    std::string name(lines[9 * i + 1]);
     int64 size;
-    base::StringToInt64(lines[8 * i + 2], &size);
+    base::StringToInt64(lines[9 * i + 2], &size);
 
     SCOPED_TRACE(base::StringPrintf("Filename: %s", name.c_str()));
 
     int year, month, day_of_month, hour, minute;
-    base::StringToInt(lines[8 * i + 3], &year);
-    base::StringToInt(lines[8 * i + 4], &month);
-    base::StringToInt(lines[8 * i + 5], &day_of_month);
-    base::StringToInt(lines[8 * i + 6], &hour);
-    base::StringToInt(lines[8 * i + 7], &minute);
+    base::StringToInt(lines[9 * i + 3], &year);
+    base::StringToInt(lines[9 * i + 4], &month);
+    base::StringToInt(lines[9 * i + 5], &day_of_month);
+    base::StringToInt(lines[9 * i + 6], &hour);
+    base::StringToInt(lines[9 * i + 7], &minute);
 
     const FtpDirectoryListingEntry& entry = entries[i];
 
@@ -138,6 +140,7 @@ const char* kTestFiles[] = {
   "dir-listing-ls-28",  // Hylafax FTP server
   "dir-listing-ls-29",
   "dir-listing-ls-30",
+  "dir-listing-ls-31",
 
   "dir-listing-netware-1",
   "dir-listing-netware-2",
author	phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-12-12 21:11:10 +0000
committer	phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-12-12 21:11:10 +0000
commit	0ea508612f10bbd8578e4384c26afe4859f7f7ba (patch)
tree	a6327d211957e367567aa70fb4cc71a08506315a
parent	bfd82e21f9ab168e2aa27454e11e97fc87a55a58 (diff)
download	chromium_src-0ea508612f10bbd8578e4384c26afe4859f7f7ba.zip chromium_src-0ea508612f10bbd8578e4384c26afe4859f7f7ba.tar.gz chromium_src-0ea508612f10bbd8578e4384c26afe4859f7f7ba.tar.bz2