moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

ftpserver.pl: Reworked some variable names to be more meaningful

This commit is contained in:
Steve Holme 2014-03-29 23:30:58 +00:00
parent f559611aa1
commit 5b773658a8
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/ftpserver.pl
View File

@ -1369,16 +1369,16 @@ sub LSUB_imap {
} }
sub EXAMINE_imap { sub EXAMINE_imap {
my ($testno) = @_; my ($mailbox) = @_;
fix_imap_params($testno); fix_imap_params($mailbox);
logmsg "EXAMINE_imap got $testno\n"; logmsg "EXAMINE_imap got $mailbox\n";
if ($testno eq "") { if ($mailbox eq "") {
sendcontrol "$cmdid BAD Command Argument\r\n"; sendcontrol "$cmdid BAD Command Argument\r\n";
} }
else { else {
my @data = getreplydata($testno); my @data = getreplydata($mailbox);
for my $d (@data) { for my $d (@data) {
sendcontrol $d; sendcontrol $d;
@ -1756,10 +1756,10 @@ sub PASS_pop3 {
} }
sub RETR_pop3 { sub RETR_pop3 {
my ($testno) = @_; my ($msgid) = @_;
my @data; my @data;
if($testno =~ /^verifiedserver$/) { if($msgid =~ /^verifiedserver$/) {
# this is the secret command that verifies that this actually is # this is the secret command that verifies that this actually is
# the curl test server # the curl test server
my $response = "WE ROOLZ: $$\r\n"; my $response = "WE ROOLZ: $$\r\n";
@ -1773,7 +1773,7 @@ sub RETR_pop3 {
# send mail content # send mail content
logmsg "retrieve a mail\n"; logmsg "retrieve a mail\n";
@data = getreplydata($testno); @data = getreplydata($msgid);
} }
sendcontrol "+OK Mail transfer starts\r\n"; sendcontrol "+OK Mail transfer starts\r\n";
@ -1812,15 +1812,15 @@ sub LIST_pop3 {
} }
sub DELE_pop3 { sub DELE_pop3 {
my ($msg) = @_; my ($msgid) = @_;
logmsg "DELE_pop3 got $msg\n"; logmsg "DELE_pop3 got $msgid\n";
if (!$msg) { if (!$msgid) {
sendcontrol "-ERR Protocol error\r\n"; sendcontrol "-ERR Protocol error\r\n";
} }
else { else {
push (@deleted, $msg); push (@deleted, $msgid);
sendcontrol "+OK\r\n"; sendcontrol "+OK\r\n";
} }
@ -1885,14 +1885,14 @@ sub UIDL_pop3 {
sub TOP_pop3 { sub TOP_pop3 {
my ($args) = @_; my ($args) = @_;
my ($msg, $lines) = split(/ /, $args, 2); my ($msgid, $lines) = split(/ /, $args, 2);
logmsg "TOP_pop3 got $args\n"; logmsg "TOP_pop3 got $args\n";
if (!grep /^TOP$/, @capabilities) { if (!grep /^TOP$/, @capabilities) {
sendcontrol "-ERR Unrecognized command\r\n"; sendcontrol "-ERR Unrecognized command\r\n";
} }
elsif (($msg eq "") || ($lines eq "")) { elsif (($msgid eq "") || ($lines eq "")) {
sendcontrol "-ERR Protocol error\r\n"; sendcontrol "-ERR Protocol error\r\n";
} }
else { else {
@ -1903,7 +1903,7 @@ sub TOP_pop3 {
logmsg "retrieve top $lines lines of mail\n"; logmsg "retrieve top $lines lines of mail\n";
} }
my @data = getreplydata($msg); my @data = getreplydata($msgid);
sendcontrol "+OK Mail transfer starts\r\n"; sendcontrol "+OK Mail transfer starts\r\n";