* nio-ftp.cc (ftp_line): handle continuations more robustly

diff --git a/ChangeLog b/ChangeLog
index cf84b223420b0a6c2b15e63b8c1f8352db4c4d0f..296c93ef1a59fe944da0d29f1ed97eb620605c36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-28  DJ Delorie  <dj@redhat.com>
+
+       * nio-ftp.cc (ftp_line): handle continuations more robustly
+
 2000-09-14  Brian Keener  <bkeener@thesoftwaresource.com>
 
        * res.rc: increased the size of the site dialog (IDD_SITE) & the

diff --git a/nio-ftp.cc b/nio-ftp.cc
index 917d9f19895e47995116bb74a467bd6e86bfa7cb..c2429b0dc7ab64308fcdffc3406a8ffe1615d900 100644 (file)
--- a/nio-ftp.cc
+++ b/nio-ftp.cc
@@ -22,11 +22,12 @@ static char *cvsid = "\n%%% $Id$\n";
 #include "winsock.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #include "resource.h"
 #include "state.h"
 #include "simpsock.h"
-#include "msg.h"
+#include "log.h"
 
 #include "netio.h"
 #include "nio-ftp.h"
@@ -42,7 +43,8 @@ ftp_line (SimpleSocket *s)
 {
   do {
     last_line = s->gets ();
-  } while (last_line && last_line[3] != ' ');
+    log (LOG_BABBLE, "ftp > %s", last_line);
+  } while (last_line && (!isdigit (last_line[0]) || last_line[3] != ' '));
   return atoi (last_line ?: "0");
 }