tests: try to support spaces in TMPDIR

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

diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index cdeecc9a73983d602db3e304da750e6bcf9c7d3c..cab2bda4044dbc2de176226881b8b9d9c8753bc6 100644 (file)
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-method.h,v 1.15.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    Acquire Method - Method helper class + functions
 /* ######################################################################
 
    Acquire Method - Method helper class + functions


@@ -44,10 +43,20 @@ class pkgAcqMethod
 
       std::string Uri;
       std::string DestFile;
 
       std::string Uri;
       std::string DestFile;

+      int DestFileFd;

       time_t LastModified;
       bool IndexFile;
       bool FailIgnore;
       HashStringList ExpectedHashes;
       time_t LastModified;
       bool IndexFile;
       bool FailIgnore;
       HashStringList ExpectedHashes;

+      // a maximum size we will download, this can be the exact filesize
+      // for when we know it or a arbitrary limit when we don't know the
+      // filesize (like a InRelease file)
+      unsigned long long MaximumSize;
+
+      FetchItem();
+      virtual ~FetchItem();
+      private:
+      void * const d;

    };
    
    struct FetchResult
    };
    
    struct FetchResult


@@ -62,6 +71,9 @@ class pkgAcqMethod
       
       void TakeHashes(class Hashes &Hash);
       FetchResult();
       
       void TakeHashes(class Hashes &Hash);
       FetchResult();

+      virtual ~FetchResult();
+      private:
+      void * const d;

    };
 
    // State
    };
 
    // State


@@ -71,11 +83,12 @@ class pkgAcqMethod
    std::string FailReason;
    std::string UsedMirror;
    std::string IP;
    std::string FailReason;
    std::string UsedMirror;
    std::string IP;

-   
+

    // Handlers for messages
    virtual bool Configuration(std::string Message);
    virtual bool Fetch(FetchItem * /*Item*/) {return true;};
    // Handlers for messages
    virtual bool Configuration(std::string Message);
    virtual bool Fetch(FetchItem * /*Item*/) {return true;};

-   
+   virtual bool URIAcquire(std::string const &/*Message*/, FetchItem *Itm) { return Fetch(Itm); };
+

    // Outgoing messages
    void Fail(bool Transient = false);
    inline void Fail(const char *Why, bool Transient = false) {Fail(std::string(Why),Transient);};
    // Outgoing messages
    void Fail(bool Transient = false);
    inline void Fail(const char *Why, bool Transient = false) {Fail(std::string(Why),Transient);};


@@ -104,7 +117,7 @@ class pkgAcqMethod
    inline void SetIP(std::string aIP) {IP = aIP;};
    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
    inline void SetIP(std::string aIP) {IP = aIP;};
    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);

-   virtual ~pkgAcqMethod() {};
+   virtual ~pkgAcqMethod();

    void DropPrivsOrDie();
    private:
    APT_HIDDEN void Dequeue();
    void DropPrivsOrDie();
    private:
    APT_HIDDEN void Dequeue();