aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Hruska <jirka@fud.cz>2013-03-10 20:23:27 +0100
committerSteve Holme <steve_holme@hotmail.com>2013-03-10 19:27:40 +0000
commitc2e2938a7e9537986f86fccc31c903df36f78844 (patch)
tree9e571d2b6f74e0e5c2dd4aedc1e7128a4eb351bb
parent62b5015796e2462c42a7ac99a0172727e11cd418 (diff)
tests: Fix ftpserver.pl indentation
The whole of FETCH_imap() had one extra space of indentation, whilst APPEND_imap() used indentation of 2 instead of 4 in places.
-rwxr-xr-xtests/ftpserver.pl94
1 files changed, 47 insertions, 47 deletions
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index b4076f4be..b696ab781 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -804,54 +804,54 @@ sub SELECT_imap {
}
sub FETCH_imap {
- my ($args) = @_;
- my ($uid, $how) = split(/ /, $args, 2);
- my @data;
- my $size;
+ my ($args) = @_;
+ my ($uid, $how) = split(/ /, $args, 2);
+ my @data;
+ my $size;
- logmsg "FETCH_imap got $args\n";
+ logmsg "FETCH_imap got $args\n";
- if($selected =~ /^verifiedserver$/) {
- # this is the secret command that verifies that this actually is
- # the curl test server
- my $response = "WE ROOLZ: $$\r\n";
- if($verbose) {
- print STDERR "FTPD: We returned proof we are the test server\n";
- }
- $data[0] = $response;
- logmsg "return proof we are we\n";
- }
- else {
- logmsg "retrieve a mail\n";
+ if($selected =~ /^verifiedserver$/) {
+ # this is the secret command that verifies that this actually is
+ # the curl test server
+ my $response = "WE ROOLZ: $$\r\n";
+ if($verbose) {
+ print STDERR "FTPD: We returned proof we are the test server\n";
+ }
+ $data[0] = $response;
+ logmsg "return proof we are we\n";
+ }
+ else {
+ logmsg "retrieve a mail\n";
- my $testno = $selected;
- $testno =~ s/^([^0-9]*)//;
- my $testpart = "";
- if ($testno > 10000) {
- $testpart = $testno % 10000;
- $testno = int($testno / 10000);
- }
+ my $testno = $selected;
+ $testno =~ s/^([^0-9]*)//;
+ my $testpart = "";
+ if ($testno > 10000) {
+ $testpart = $testno % 10000;
+ $testno = int($testno / 10000);
+ }
- # send mail content
- loadtest("$srcdir/data/test$testno");
+ # send mail content
+ loadtest("$srcdir/data/test$testno");
- @data = getpart("reply", "data$testpart");
- }
+ @data = getpart("reply", "data$testpart");
+ }
- for (@data) {
- $size += length($_);
- }
+ for (@data) {
+ $size += length($_);
+ }
- sendcontrol "* $uid FETCH ($how {$size}\r\n";
+ sendcontrol "* $uid FETCH ($how {$size}\r\n";
- for my $d (@data) {
- sendcontrol $d;
- }
+ for my $d (@data) {
+ sendcontrol $d;
+ }
- sendcontrol ")\r\n";
- sendcontrol "$cmdid OK FETCH completed\r\n";
+ sendcontrol ")\r\n";
+ sendcontrol "$cmdid OK FETCH completed\r\n";
- return 0;
+ return 0;
}
sub APPEND_imap {
@@ -889,18 +889,18 @@ sub APPEND_imap {
my $datasize = ($left > $chunksize) ? $chunksize : $left;
if($datasize > 0) {
- logmsg "> Appending $datasize bytes to file\n";
- print FILE substr($line, 0, $datasize) if(!$nosave);
- $line = substr($line, $datasize);
-
- $received += $datasize;
- if($received == $size) {
- logmsg "Received all data, waiting for final CRLF.\n";
- }
+ logmsg "> Appending $datasize bytes to file\n";
+ print FILE substr($line, 0, $datasize) if(!$nosave);
+ $line = substr($line, $datasize);
+
+ $received += $datasize;
+ if($received == $size) {
+ logmsg "Received all data, waiting for final CRLF.\n";
+ }
}
if($received == $size && $line eq "\r\n") {
- last;
+ last;
}
}
elsif($line eq "DISC\n") {