correct various errors, typos and oddities in the manpages

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

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

-// $Id: acquire-method.h,v 1.7 1998/12/05 04:19:02 jgg Exp $
+// $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


@@ -10,16 +10,21 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

+
+/** \addtogroup acquire
+ *  @{
+ *
+ *  \file acquire-method.h
+ */
+

 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
 #include <apt-pkg/configuration.h>
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
 #include <apt-pkg/configuration.h>

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

 
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/acquire-method.h"
-#endif 

 
 

+class Hashes;

 class pkgAcqMethod
 {
    protected:
 class pkgAcqMethod
 {
    protected:


@@ -37,11 +42,16 @@ class pkgAcqMethod
    struct FetchResult
    {
       string MD5Sum;
    struct FetchResult
    {
       string MD5Sum;

+      string SHA1Sum;
+      string SHA256Sum;
+      vector<string> GPGVOutput;

       time_t LastModified;
       bool IMSHit;
       string Filename;
       unsigned long Size;
       time_t LastModified;
       bool IMSHit;
       string Filename;
       unsigned long Size;

-      unsigned long ResumePoint;      
+      unsigned long ResumePoint;
+      
+      void TakeHashes(Hashes &Hash);

       FetchResult();
    };
 
       FetchResult();
    };
 


@@ -49,31 +59,40 @@ class pkgAcqMethod
    vector<string> Messages;
    FetchItem *Queue;
    FetchItem *QueueBack;
    vector<string> Messages;
    FetchItem *Queue;
    FetchItem *QueueBack;

-      
+   string FailExtra;
+   

    // Handlers for messages
    virtual bool Configuration(string Message);
    // Handlers for messages
    virtual bool Configuration(string Message);

-   virtual bool Fetch(FetchItem *Item) {return true;};
+   virtual bool Fetch(FetchItem * /*Item*/) {return true;};

    
    // Outgoing messages
    void Fail(bool Transient = false);
    
    // Outgoing messages
    void Fail(bool Transient = false);

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

    void Fail(string Why, bool Transient = false);
    void URIStart(FetchResult &Res);
    void URIDone(FetchResult &Res,FetchResult *Alt = 0);
    bool MediaFail(string Required,string Drive);
    void Fail(string Why, bool Transient = false);
    void URIStart(FetchResult &Res);
    void URIDone(FetchResult &Res,FetchResult *Alt = 0);
    bool MediaFail(string Required,string Drive);

-   
+   virtual void Exit() {};
+

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

-                  LocalOnly = (1<<3)};
+                  LocalOnly = (1<<3), NeedsCleanup = (1<<4), 
+                  Removable = (1<<5)};

 
    void Log(const char *Format,...);
    void Status(const char *Format,...);
    
 
    void Log(const char *Format,...);
    void Status(const char *Format,...);
    

+   void Redirect(const string &NewURI);
+ 

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

+   inline void SetFailExtraMsg(string Msg) {FailExtra = Msg;};

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

+/** @} */
+

 #endif
 #endif