More deps

[apt.git] / methods / ftp.cc

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 6f4b0030784bae1edce401cfd2977e9ee13ce429..a7fa8323303bb924608b8f29fe7ff4bff610877c 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: ftp.cc,v 1.15 1999/09/05 05:41:41 jgg Exp $
+// $Id: ftp.cc,v 1.17 1999/12/09 03:45:56 jgg Exp $
 /* ######################################################################
 
    HTTP Aquire Method - This is the FTP aquire method for APT.
@@ -285,8 +285,9 @@ bool FTPConn::ReadLine(string &Text)
       int Res = read(ServerFd,Buffer + Len,sizeof(Buffer) - Len);
       if (Res <= 0)
       {
+        _error->Errno("read","Read error");
         Close();
-        return _error->Errno("read","Read error");
+        return false;
       }      
       Len += Res;
    }
@@ -392,8 +393,9 @@ bool FTPConn::WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...)
       int Res = write(ServerFd,S + Start,Len);
       if (Res <= 0)
       {
+        _error->Errno("write","Write Error");
         Close();
-        return _error->Errno("write","Write Error");
+        return false;
       }
       
       Len -= Res;
@@ -745,7 +747,7 @@ FtpMethod::FtpMethod() : pkgAcqMethod("1.0",SendConfig)
 void FtpMethod::SigTerm(int)
 {
    if (FailFd == -1)
-      exit(100);
+      _exit(100);
    close(FailFd);
    
    // Timestamp
@@ -754,7 +756,7 @@ void FtpMethod::SigTerm(int)
    UBuf.modtime = FailTime;
    utime(FailFile.c_str(),&UBuf);
    
-   exit(100);
+   _exit(100);
 }
                                                                        /*}}}*/
 // FtpMethod::Configuration - Handle a configuration message           /*{{{*/