1 files changed, 6 insertions, 2 deletions

diff --git a/noncore/net/ftplib/ftplib.c b/noncore/net/ftplib/ftplib.c
index 421f855..efcd6f0 100644
--- a/noncore/net/ftplib/ftplib.c
+++ b/noncore/net/ftplib/ftplib.c
@@ -937,49 +937,50 @@ GLOBALDEF int FtpRead(void *buf, int max, netbuf *nData)
       {
           nData->xfered1 += i;
           if (nData->xfered1 > nData->cbbytes)
             {
                 if (nData->idlecb(nData, nData->xfered, nData->idlearg) == 0)
                     return 0;
                 nData->xfered1 = 0;
             }
       }
     return i;
 }
 
 /*
  * FtpWrite - write to a data connection
  */
 GLOBALDEF int FtpWrite(void *buf, int len, netbuf *nData)
 {
     int i;
     if (nData->dir != FTPLIB_WRITE)
         return 0;
     if (nData->buf)
         i = writeline(buf, len, nData);
     else
       {
-          socket_wait(nData);
+          if (socket_wait(nData) < 0)
+              fprintf(stderr, "FtpWrite: socket_wait failed with %s\n", nData->ctrl->response);
           i = net_write(nData->handle, buf, len);
       }
     if (i == -1)
         return 0;
     nData->xfered += i;
     if (nData->idlecb && nData->cbbytes)
       {
           nData->xfered1 += i;
           if (nData->xfered1 > nData->cbbytes)
             {
                 nData->idlecb(nData, nData->xfered, nData->idlearg);
                 nData->xfered1 = 0;
             }
       }
     return i;
 }
 
 /*
  * FtpClose - close a data connection
  */
 GLOBALDEF int FtpClose(netbuf *nData)
 {
     netbuf *ctrl;
     switch (nData->dir)
@@ -1318,29 +1319,32 @@ GLOBALDEF int FtpRename(const char *src, const char *dst, netbuf *nControl)
  *
  * return 1 if successful, 0 otherwise
  */
 GLOBALDEF int FtpDelete(const char *fnm, netbuf *nControl)
 {
     char cmd[256];
 
     if ((strlen(fnm) + 7) > sizeof(cmd))
         return 0;
     sprintf(cmd,"DELE %s",fnm);
     if (!FtpSendCmd(cmd,'2', nControl))
         return 0;
     return 1;
 }
 
 /*
  * FtpQuit - disconnect from remote
  *
  * return 1 if successful, 0 otherwise
  */
 GLOBALDEF void FtpQuit(netbuf *nControl)
 {
     if (nControl->dir != FTPLIB_CONTROL)
         return;
-    FtpSendCmd("QUIT",'2',nControl);
+    if (FtpSendCmd("QUIT",'2',nControl) == 1) {
+        if (ftplib_debug > 2)
+            fprintf(stderr, "FtpQuit: FtpSendCmd(QUIT) failed\n");
+    }
     net_close(nControl->handle);
     free(nControl->buf);
     free(nControl);
 }