Merge remote-tracking branch 'mvo/bugfix/apt-get-source-unauthenticated-warning'...

[apt.git] / apt-pkg / acquire-method.h

diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 18c2cf009b5b93db686f734b755a16c89f35e40e..221ccf2737bbf8fedd173a863d8ddf945496fe40 100644 (file)
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -20,9 +20,18 @@
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 

+#include <apt-pkg/macros.h>
+
+#include <stdarg.h>
+#include <time.h>
+
+#include <string>
+#include <vector>
+
+#ifndef APT_8_CLEANER_HEADERS

 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>

-
+#endif

 
 class Hashes;
 class pkgAcqMethod
 
 class Hashes;
 class pkgAcqMethod


@@ -33,50 +42,54 @@ class pkgAcqMethod
    {
       FetchItem *Next;
 
    {
       FetchItem *Next;
 

-      string Uri;
-      string DestFile;
+      std::string Uri;
+      std::string DestFile;

       time_t LastModified;
       bool IndexFile;
       time_t LastModified;
       bool IndexFile;

+      bool FailIgnore;

    };
    
    struct FetchResult
    {
    };
    
    struct FetchResult
    {

-      string MD5Sum;
-      string SHA1Sum;
-      string SHA256Sum;
-      vector<string> GPGVOutput;
+      std::string MD5Sum;
+      std::string SHA1Sum;
+      std::string SHA256Sum;
+      std::string SHA512Sum;
+      std::vector<std::string> GPGVOutput;

       time_t LastModified;
       bool IMSHit;
       time_t LastModified;
       bool IMSHit;

-      string Filename;
-      unsigned long Size;
-      unsigned long ResumePoint;
+      std::string Filename;
+      unsigned long long Size;
+      unsigned long long ResumePoint;

       
       void TakeHashes(Hashes &Hash);
       FetchResult();
    };
 
    // State
       
       void TakeHashes(Hashes &Hash);
       FetchResult();
    };
 
    // State

-   vector<string> Messages;
+   std::vector<std::string> Messages;

    FetchItem *Queue;
    FetchItem *QueueBack;
    FetchItem *Queue;
    FetchItem *QueueBack;

-   string FailReason;
-   string UsedMirror;
-   string IP;
+   std::string FailReason;
+   std::string UsedMirror;
+   std::string IP;

    
    // Handlers for messages
    
    // Handlers for messages

-   virtual bool Configuration(string Message);
+   virtual bool Configuration(std::string Message);

    virtual bool Fetch(FetchItem * /*Item*/) {return true;};
    
    // Outgoing messages
    void Fail(bool Transient = false);
    virtual bool Fetch(FetchItem * /*Item*/) {return true;};
    
    // Outgoing messages
    void Fail(bool Transient = false);

-   inline void Fail(const char *Why, bool Transient = false) {Fail(string(Why),Transient);};
-   virtual void Fail(string Why, bool Transient = false);
+   inline void Fail(const char *Why, bool Transient = false) {Fail(std::string(Why),Transient);};
+   virtual void Fail(std::string Why, bool Transient = false);

    virtual void URIStart(FetchResult &Res);
    virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
 
    virtual void URIStart(FetchResult &Res);
    virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
 

-   bool MediaFail(string Required,string Drive);
+   bool MediaFail(std::string Required,std::string Drive);

    virtual void Exit() {};
 
    virtual void Exit() {};
 

+   void PrintStatus(char const * const header, const char* Format, va_list &args) const;
+

    public:
    enum CnfFlags {SingleInstance = (1<<0),
                   Pipeline = (1<<1), SendConfig = (1<<2),
    public:
    enum CnfFlags {SingleInstance = (1<<0),
                   Pipeline = (1<<1), SendConfig = (1<<2),


@@ -86,12 +99,17 @@ class pkgAcqMethod
    void Log(const char *Format,...);
    void Status(const char *Format,...);
    
    void Log(const char *Format,...);
    void Status(const char *Format,...);
    

+   void Redirect(const std::string &NewURI);
+ 

    int Run(bool Single = false);
    int Run(bool Single = false);

-   inline void SetFailReason(string Msg) {FailReason = Msg;};
-   inline void SetIP(string aIP) {IP = aIP;};
+   inline void SetFailReason(std::string Msg) {FailReason = Msg;};
+   inline void SetIP(std::string aIP) {IP = aIP;};

    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
    virtual ~pkgAcqMethod() {};
    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
    virtual ~pkgAcqMethod() {};

+
+   private:
+   APT_HIDDEN void Dequeue();

 };
 
 /** @} */
 };
 
 /** @} */