From: Steve Holme Date: Sat, 29 Mar 2014 10:29:03 +0000 (+0000) Subject: ftpserver.pl: Introduced common method for getting a test's reply data X-Git-Tag: curl-7_37_0~239 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a29ee41;p=thirdparty%2Fcurl.git ftpserver.pl: Introduced common method for getting a test's reply data --- diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index 0116e2073c..2eed040d46 100755 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -436,6 +436,25 @@ sub startsf { } } +#********************************************************************** +# Returns the given test's reply data +# +sub getreplydata { + my ($testno) = @_; + my $testpart = ""; + + $testno =~ s/^([^0-9]*)// + if($testno > 10000) { + $testpart = $testno % 10000; + $testno = int($testno / 10000); + } + + loadtest("$srcdir/data/test$testno"); + + my @data = getpart("reply", "data$testpart"); + + return @data; +} sub sockfilt { my $l; @@ -445,7 +464,6 @@ sub sockfilt { } } - sub sockfiltsecondary { my $l; foreach $l (@_) { @@ -454,10 +472,10 @@ sub sockfiltsecondary { } } - +#********************************************************************** # Send data to the client on the control stream, which happens to be plain # stdout. - +# sub sendcontrol { if(!$ctrldelay) { # spit it all out at once