* Swedish translation update. Closes: #592366

[apt.git] / apt-pkg / contrib / fileutl.h

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 003bd9b83f499ab41592f60373d48be9d217b316..62705478def3b8789fe1e291092c90e8a0510cd1 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -26,6 +26,11 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

+#include <zlib.h>
+
+/* Define this for python-apt */
+#define APT_HAS_GZIP 1
+

 using std::string;
 
 class FileFd
 using std::string;
 
 class FileFd


@@ -34,12 +39,14 @@ class FileFd
    int iFd;
  
    enum LocalFlags {AutoClose = (1<<0),Fail = (1<<1),DelOnFail = (1<<2),
    int iFd;
  
    enum LocalFlags {AutoClose = (1<<0),Fail = (1<<1),DelOnFail = (1<<2),

-                    HitEof = (1<<3)};
+                    HitEof = (1<<3), Replace = (1<<4) };

    unsigned long Flags;
    string FileName;
    unsigned long Flags;
    string FileName;

-   
+   string TemporaryFileName;
+   gzFile gz;
+

    public:
    public:

-   enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp};
+   enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp,ReadOnlyGzip};

    
    inline bool Read(void *To,unsigned long Size,bool AllowEof)
    {
    
    inline bool Read(void *To,unsigned long Size,bool AllowEof)
    {


@@ -56,6 +63,7 @@ class FileFd
    unsigned long Tell();
    unsigned long Size();
    bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666);
    unsigned long Tell();
    unsigned long Size();
    bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666);

+   bool OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose=false);

    bool Close();
    bool Sync();
    
    bool Close();
    bool Sync();
    


@@ -70,12 +78,12 @@ class FileFd
    inline string &Name() {return FileName;};
    
    FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1), 
    inline string &Name() {return FileName;};
    
    FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1), 

-            Flags(0) 
+            Flags(0), gz(NULL)

    {
       Open(FileName,Mode,Perms);
    };
    {
       Open(FileName,Mode,Perms);
    };

-   FileFd(int Fd = -1) : iFd(Fd), Flags(AutoClose) {};
-   FileFd(int Fd,bool) : iFd(Fd), Flags(0) {};
+   FileFd(int Fd = -1) : iFd(Fd), Flags(AutoClose), gz(NULL) {};
+   FileFd(int Fd,bool) : iFd(Fd), Flags(0), gz(NULL) {};

    virtual ~FileFd();
 };
 
    virtual ~FileFd();
 };