merge with debian-experimental 0.8.16~exp2 release

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

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 528725f8984a498e4af0e5082afc997a757938e2..cde288ad20e7787dc2993a07844f42a5d918fd92 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


@@ -38,9 +43,11 @@ class FileFd
    unsigned long Flags;
    string FileName;
    string TemporaryFileName;
    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,
+                  WriteAtomic};

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


@@ -56,13 +63,16 @@ class FileFd
    bool Truncate(unsigned long To);
    unsigned long Tell();
    unsigned long Size();
    bool Truncate(unsigned long To);
    unsigned long Tell();
    unsigned long Size();

+   unsigned long FileSize();

    bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666);
    bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666);

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

    bool Close();
    bool Sync();
    
    // Simple manipulators
    inline int Fd() {return iFd;};
    inline void Fd(int fd) {iFd = fd;};
    bool Close();
    bool Sync();
    
    // Simple manipulators
    inline int Fd() {return iFd;};
    inline void Fd(int fd) {iFd = fd;};

+   inline gzFile gzFd() {return gz;};

    inline bool IsOpen() {return iFd >= 0;};
    inline bool Failed() {return (Flags & Fail) == Fail;};
    inline void EraseOnFailure() {Flags |= DelOnFail;};
    inline bool IsOpen() {return iFd >= 0;};
    inline bool Failed() {return (Flags & Fail) == Fail;};
    inline void EraseOnFailure() {Flags |= DelOnFail;};


@@ -71,12 +81,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();
 };
 


@@ -84,8 +94,18 @@ bool RunScripts(const char *Cnf);
 bool CopyFile(FileFd &From,FileFd &To);
 int GetLock(string File,bool Errors = true);
 bool FileExists(string File);
 bool CopyFile(FileFd &From,FileFd &To);
 int GetLock(string File,bool Errors = true);
 bool FileExists(string File);

+bool RealFileExists(string File);

 bool DirectoryExists(string const &Path) __attrib_const;
 bool CreateDirectory(string const &Parent, string const &Path);
 bool DirectoryExists(string const &Path) __attrib_const;
 bool CreateDirectory(string const &Parent, string const &Path);

+
+/** \brief Ensure the existence of the given Path
+ *
+ *  \param Parent directory of the Path directory - a trailing
+ *  /apt/ will be removed before CreateDirectory call.
+ *  \param Path which should exist after (successful) call
+ */
+bool CreateAPTDirectoryIfNeeded(string const &Parent, string const &Path);
+

 std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
                                        bool const &SortList, bool const &AllowNoExt=false);
 std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext,
 std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
                                        bool const &SortList, bool const &AllowNoExt=false);
 std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext,