improve arch-unqualified dpkg-progress parsing

[apt.git] / methods / ftp.h

diff --git a/methods/ftp.h b/methods/ftp.h
index 7088e09545736132ed0b88c9bfa9c7240779e466..6a12475a08a952e5c206163b118c6cd55bf57b3e 100644 (file)
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -3,13 +3,21 @@
 // $Id: ftp.h,v 1.4 2001/03/06 07:15:29 jgg Exp $
 /* ######################################################################
 
-   FTP Aquire Method - This is the FTP aquire method for APT.
+   FTP Acquire Method - This is the FTP acquire method for APT.
 
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef APT_FTP_H
 #define APT_FTP_H
 
+#include <apt-pkg/strutl.h>
+#include "aptmethod.h"
+
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <time.h>
+#include <string>
+
 class FTPConn
 {
    char Buffer[1024*10];
@@ -56,23 +64,24 @@ class FTPConn
    bool Size(const char *Path,unsigned long long &Size);
    bool ModTime(const char *Path, time_t &Time);
    bool Get(const char *Path,FileFd &To,unsigned long long Resume,
-           Hashes &MD5,bool &Missing);
+           Hashes &MD5,bool &Missing, unsigned long long MaximumSize,
+            pkgAcqMethod *Owner);
    
-   FTPConn(URI Srv);
+   explicit FTPConn(URI Srv);
    ~FTPConn();
 };
 
-class FtpMethod : public pkgAcqMethod
+class FtpMethod : public aptMethod
 {
-   virtual bool Fetch(FetchItem *Itm);
-   virtual bool Configuration(std::string Message);
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+   virtual bool Configuration(std::string Message) APT_OVERRIDE;
    
    FTPConn *Server;
    
    static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
-   static void SigTerm(int);
+   static APT_NORETURN void SigTerm(int);
    
    public: