From 460adfef937a345944e8963e84101856baa04337 Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Thu, 7 Nov 2013 20:12:51 +0000
Subject: [PATCH] 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
---
 tests/ftpserver.pl | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 4f0e9f20c..96cfdfe98 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -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) {