final build errors

diff --git a/src/errorpage.cc b/src/errorpage.cc
index b3b5c9881c52af1ce0a37b77ba28934667d05265..0ba9f5d0b88300799bbcb2df8130d7bf96e9606d 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -812,7 +812,7 @@ ErrorState::Convert(char token)
         if (dnsserver_msg)
             p = dnsserver_msg;
         else if (ftp.cwd_msg)
-            wordlistCat(ftp.cwd_msg, &mb);
+            p = ftp.cwd_msg;
         else
             p = "[unknown]";
 

diff --git a/src/ftp.cc b/src/ftp.cc
index d1fa22e442c8dfc53cb281aec0a5243c8bec0dfa..106f038a66c8eb629dc25cfb687a82fe60c75cd4 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -53,6 +53,7 @@
 #include "wordlist.h"
 #include "SquidTime.h"
 #include "URLScheme.h"
+#include "SquidString.h"
 
 /**
  \defgroup ServerProtocolFTPInternal Server-Side FTP Internals
@@ -170,7 +171,7 @@ public:
     int64_t restarted_offset;
     char *proxy_host;
     size_t list_width;
-    wordlist *cwd_message;
+    String cwd_message;
     char *old_request;
     char *old_reply;
     char *old_filepath;
@@ -492,8 +493,7 @@ FtpStateData::~FtpStateData()
     if (ctrl.message)
         wordlistDestroy(&ctrl.message);
 
-    if (cwd_message)
-        wordlistDestroy(&cwd_message);
+    cwd_message.clean();
 
     safe_free(ctrl.last_reply);
 
@@ -1241,7 +1241,7 @@ FtpStateData::processReplyBody()
     if (flags.isdir) {
 
         flags.listing = 1;
-        safe_delete(listing);
+        listing.reset();
         parseListing();
         return;
 
@@ -1721,7 +1721,11 @@ FtpStateData::handleControlReply()
     /* Copy the rest of the message to cwd_message to be printed in
      * error messages
      */
-    wordlistAddWl(&cwd_message, ctrl.message);
+    cwd_message.append('\n');
+    for (wordlist *w = ctrl.message; w; w = w->next) {
+        cwd_message.append(' ');
+        cwd_message.append(w->key);
+    }
 
     debugs(9, 3, HERE << "state=" << state << ", code=" << ctrl.replycode);
 
@@ -1990,13 +1994,13 @@ ftpReadCwd(FtpStateData * ftpState)
     if (code >= 200 && code < 300) {
         /* CWD OK */
         ftpState->unhack();
-        /* Reset cwd_message to only include the last message */
-
-        if (ftpState->cwd_message)
-            wordlistDestroy(&ftpState->cwd_message);
-
-        ftpState->cwd_message = ftpState->ctrl.message;
 
+        /* Reset cwd_message to only include the last message */
+        ftpState->cwd_message.reset("");
+        for (wordlist *w = ftpState->ctrl.message; w; w = w->next) {
+            ftpState->cwd_message.append(' ');
+            ftpState->cwd_message.append(w->key);
+        }
         ftpState->ctrl.message = NULL;
 
         /* Continue to traverse the path */
@@ -3378,7 +3382,7 @@ FtpStateData::failedErrorMessage(err_type error, int xerrno)
 
     if(error == ERR_FTP_LISTING) {
         err->ftp.listing = &listing;
-        err->ftp.cwd_msg = cwd_message;
+        err->ftp.cwd_msg = xstrdup(html_quote(cwd_message.buf()));
     }
     else {
         err->ftp.server_msg = ctrl.message;

diff --git a/src/main.cc b/src/main.cc
index cc9343cb52cb48ff4aa9c0e7f0492477deea4748..816d430483a2a4fd96c4cc188e900290ad4b613d 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,3 @@
-#error
 /*
  * $Id: main.cc,v 1.459 2008/02/26 21:49:35 amosjeffries Exp $
  *