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

ftpserver.pl: Reworked custom reply handling code 

1) To fix issues with IMAP custom replies
2) So initial space is not required in IMAP display text
3) To be more readable and understandable
This commit is contained in:
Steve Holme 2013-11-07 20:12:51 +00:00
parent c876f6ae6d
commit 460adfef93
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/ftpserver.pl
View File

@ -3108,34 +3108,33 @@ while(1) {
}
}
my $text;
$text = $customreply{$FTPCMD};
my $fake = $text;
my $check = 1; # no response yet
# See if there is a custom reply for our command
my $text = $customreply{$FTPCMD};
if($text && ($text ne "")) {
if($customcount{$FTPCMD} && (!--$customcount{$FTPCMD})) {
# used enough number of times, now blank the customreply
$customreply{$FTPCMD}="";
}
sendcontrol "$text\r\n";
$check = 0;
}
else {
# See if there is any display text for our command
$text = $displaytext{$FTPCMD};
}
if($text && ($text ne "")) {
if($proto eq 'imap') {
sendcontrol "$cmdid $text\r\n";
}
else {
sendcontrol "$text\r\n";
}
my $check;
if($text && ($text ne "")) {
if(($cmdid) && ($cmdid ne "") && ($fake) && ($fake ne "")) {
sendcontrol "$cmdid$text\r\n";
$check = 0;
}
else {
sendcontrol "$text\r\n";
}
}
else {
$check=1; # no response yet
}
unless($fake && ($fake ne "")) {
# only perform this if we're not faking a reply
my $func = $commandfunc{$FTPCMD};
if($func) {