From a3a03f5d7436c870edac9c0eb92e85e1fcaf6bca Mon Sep 17 00:00:00 2001
From: "martin@piware.de" <>
Date: Wed, 9 Jun 2010 14:08:20 +0200
Subject: * apt-pkg/contrib/fileutl.{h,cc}:   - Add support for transparent
 reading of gzipped files.   - Link against zlib (in apt-pkg/makefile) and add
 zlib build dependency.

---
 apt-pkg/contrib/fileutl.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'apt-pkg/contrib/fileutl.h')

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 85a94898c..9925bbed4 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -25,6 +25,8 @@
 #include <string>
 #include <vector>
 
+#include <zlib.h>
+
 using std::string;
 
 class FileFd
@@ -36,6 +38,7 @@ class FileFd
                     HitEof = (1<<3)};
    unsigned long Flags;
    string FileName;
+   gzFile gz;
    
    public:
    enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp};
@@ -69,12 +72,12 @@ class FileFd
    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);
    };
-   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();
 };
 
-- 
cgit v1.2.3


From c4fc2fd7fa0fc63fd8cd6bc9b73492e6baf0222a Mon Sep 17 00:00:00 2001
From: "martin@piware.de" <>
Date: Thu, 24 Jun 2010 21:27:27 +0200
Subject: Switch FileFd to not transparently gunzip, since that breaks code
 which expects the compressed contents to stay (such as the copy backend, or
 when using file:// repositories. Instead, introduce a new ReadOnlyGzip mode
 and use that where needed

---
 apt-pkg/contrib/fileutl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apt-pkg/contrib/fileutl.h')

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 9925bbed4..c4b282126 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -41,7 +41,7 @@ class FileFd
    gzFile gz;
    
    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)
    {
-- 
cgit v1.2.3