David McCreedy brought line end conversions when doing FTP ASCII

transfers. They are done on non-windows systems and translate CRLF to LF.

15 files changed, 227 insertions, 197 deletions

diff --git a/tests/data/test100 b/tests/data/test100
index de5ba9ec0..930c70ccd 100644
--- a/tests/data/test100
+++ b/tests/data/test100
@@ -8,19 +8,21 @@ LIST
 #
 # Server-side
 <reply>
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 </reply>
 
 #
diff --git a/tests/data/test101 b/tests/data/test101
index 5290ec65d..3109eef18 100644
--- a/tests/data/test101
+++ b/tests/data/test101
@@ -7,19 +7,21 @@ LIST
 </info>
 # Server-side
 <reply>
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 </reply>
 
 # Client-side
diff --git a/tests/data/test130 b/tests/data/test130
index 0eb336406..34406ec9b 100644
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -9,19 +9,21 @@ netrc
 #
 # Server-side
 <reply>
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 </reply>
 
 #
diff --git a/tests/data/test131 b/tests/data/test131
index 087cd4c61..14bdae3e3 100644
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -8,20 +8,23 @@ netrca
 </info>
 #
 # Server-side
-<reply name="1">
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+<reply>
+#
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 </reply>
 
 #
diff --git a/tests/data/test132 b/tests/data/test132
index 2ee66268e..bf09ee72d 100644
--- a/tests/data/test132
+++ b/tests/data/test132
@@ -9,19 +9,21 @@ netrc
 #
 # Server-side
 <reply>
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 </reply>
 
 #
diff --git a/tests/data/test133 b/tests/data/test133
index cf9125bea..6c2b7a2ea 100644
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -8,21 +8,22 @@ netrc
 </info>
 #
 # Server-side
-<reply name="1">
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
-</reply>
+<reply>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 
 #
 # Client-side
diff --git a/tests/data/test134 b/tests/data/test134
index dc68536bf..ced21d789 100644
--- a/tests/data/test134
+++ b/tests/data/test134
@@ -8,20 +8,22 @@ netrc
 </info>
 #
 # Server-side
-<reply name="1">
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+<reply>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 </reply>
 
 #
diff --git a/tests/data/test215 b/tests/data/test215
index 677d6e6c3..ac60618d9 100644
--- a/tests/data/test215
+++ b/tests/data/test215
@@ -1,17 +1,19 @@
 # Server-side
 <reply>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
 <datacheck>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 </datacheck>
 
 </reply>
diff --git a/tests/data/test250 b/tests/data/test250
index da5c6dfd9..b3fa1cfdc 100644
--- a/tests/data/test250
+++ b/tests/data/test250
@@ -1,19 +1,21 @@
 #
 # Server-side
 <reply>
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 <servercmd>
 SLOWDOWN
 </servercmd>
diff --git a/tests/data/test251 b/tests/data/test251
index cbf93e075..6b3cf7b21 100644
--- a/tests/data/test251
+++ b/tests/data/test251
@@ -1,18 +1,20 @@
 # Server-side
 <reply>
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 <servercmd>
 SLOWDOWN
 </servercmd>
diff --git a/tests/data/test252 b/tests/data/test252
index 3e5ffa6d3..0cb6544b8 100644
--- a/tests/data/test252
+++ b/tests/data/test252
@@ -7,19 +7,21 @@ EPSV
 #
 # Server-side
 <reply>
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 </reply>
 
 #
diff --git a/tests/data/test253 b/tests/data/test253
index 7f66ae604..c4419a4a6 100644
--- a/tests/data/test253
+++ b/tests/data/test253
@@ -7,19 +7,21 @@ EPRT
 #
 # Server-side
 <reply>
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 </reply>
 
 #
diff --git a/tests/data/test254 b/tests/data/test254
index 8466ce200..ddabed8a2 100644
--- a/tests/data/test254
+++ b/tests/data/test254
@@ -8,19 +8,21 @@ EPSV
 #
 # Server-side
 <reply>
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 </reply>
 
 #
diff --git a/tests/data/test255 b/tests/data/test255
index 212847356..893256e9c 100644
--- a/tests/data/test255
+++ b/tests/data/test255
@@ -8,19 +8,21 @@ EPRT
 #
 # Server-side
 <reply>
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 </reply>
 
 #
diff --git a/tests/data/test521 b/tests/data/test521
index b3aad9646..747037c85 100644
--- a/tests/data/test521
+++ b/tests/data/test521
@@ -8,19 +8,21 @@ CURLOPT_PORT
 #
 # Server-side
 <reply>
-<data>
-total 20

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

--r--r--r--   1 0        1             35 Jul 16  1996 README

-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

-</data>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck>
+total 20
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
+-r--r--r--   1 0        1             35 Jul 16  1996 README
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</datacheck>
 </reply>
 
 #