add new pid_t ExecFork(std::set<int> KeepFDs) to get rid of the super ugly APT::Keep...

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

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 28898fc34820834aaf6f76900021f6a680e657ba..2347ef14034b38417e81b3e8cab4b40b804c3c3c 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -41,17 +41,16 @@
 #include <dirent.h>
 #include <signal.h>
 #include <errno.h>
 #include <dirent.h>
 #include <signal.h>
 #include <errno.h>

+#include <glob.h>
+

 #include <set>
 #include <algorithm>
 
 #include <set>
 #include <algorithm>
 

-// FIXME: Compressor Fds have some speed disadvantages and are a bit buggy currently,
-// so while the current implementation satisfies the testcases it is not a real option
-// to disable it for now
-#define APT_USE_ZLIB 1
-#if APT_USE_ZLIB
-#include <zlib.h>
-#else
-#pragma message "Usage of zlib is DISABLED!"
+#ifdef HAVE_ZLIB
+       #include <zlib.h>
+#endif
+#ifdef HAVE_BZ2
+       #include <bzlib.h>

 #endif
 
 #ifdef WORDS_BIGENDIAN
 #endif
 
 #ifdef WORDS_BIGENDIAN


@@ -65,10 +64,15 @@ using namespace std;
 
 class FileFdPrivate {
        public:
 
 class FileFdPrivate {
        public:

-#if APT_USE_ZLIB
+#ifdef HAVE_ZLIB

        gzFile gz;
 #else
        void* gz;
        gzFile gz;
 #else
        void* gz;

+#endif
+#ifdef HAVE_BZ2
+       BZFILE* bz2;
+#else
+       void* bz2;

 #endif
        int compressed_fd;
        pid_t compressor_pid;
 #endif
        int compressed_fd;
        pid_t compressor_pid;


@@ -76,8 +80,34 @@ class FileFdPrivate {
        APT::Configuration::Compressor compressor;
        unsigned int openmode;
        unsigned long long seekpos;
        APT::Configuration::Compressor compressor;
        unsigned int openmode;
        unsigned long long seekpos;

-       FileFdPrivate() : gz(NULL), compressed_fd(-1), compressor_pid(-1), pipe(false),
+       FileFdPrivate() : gz(NULL), bz2(NULL),
+                         compressed_fd(-1), compressor_pid(-1), pipe(false),

                          openmode(0), seekpos(0) {};
                          openmode(0), seekpos(0) {};

+       bool CloseDown(std::string const &FileName)
+       {
+          bool Res = true;
+#ifdef HAVE_ZLIB
+          if (gz != NULL) {
+             int const e = gzclose(gz);
+             gz = NULL;
+             // gzdclose() on empty files always fails with "buffer error" here, ignore that
+             if (e != 0 && e != Z_BUF_ERROR)
+                Res &= _error->Errno("close",_("Problem closing the gzip file %s"), FileName.c_str());
+          }
+#endif
+#ifdef HAVE_BZ2
+          if (bz2 != NULL) {
+             BZ2_bzclose(bz2);
+             bz2 = NULL;
+          }
+#endif
+          if (compressor_pid > 0)
+             ExecWait(compressor_pid, "FileFdCompressor", true);
+          compressor_pid = -1;
+
+          return Res;
+       }
+       ~FileFdPrivate() { CloseDown(""); }

 };
 
 // RunScripts - Run a set of scripts from a configuration subtree      /*{{{*/
 };
 
 // RunScripts - Run a set of scripts from a configuration subtree      /*{{{*/


@@ -156,7 +186,8 @@ bool RunScripts(const char *Cnf)
 /* The caller is expected to set things so that failure causes erasure */
 bool CopyFile(FileFd &From,FileFd &To)
 {
 /* The caller is expected to set things so that failure causes erasure */
 bool CopyFile(FileFd &From,FileFd &To)
 {

-   if (From.IsOpen() == false || To.IsOpen() == false)
+   if (From.IsOpen() == false || To.IsOpen() == false ||
+        From.Failed() == true || To.Failed() == true)

       return false;
    
    // Buffered copy between fds
       return false;
    
    // Buffered copy between fds


@@ -215,17 +246,20 @@ int GetLock(string File,bool Errors)
    fl.l_len = 0;
    if (fcntl(FD,F_SETLK,&fl) == -1)
    {
    fl.l_len = 0;
    if (fcntl(FD,F_SETLK,&fl) == -1)
    {

+      // always close to not leak resources
+      int Tmp = errno;
+      close(FD);
+      errno = Tmp;
+

       if (errno == ENOLCK)
       {
         _error->Warning(_("Not using locking for nfs mounted lock file %s"),File.c_str());
         return dup(0);       // Need something for the caller to close  
       if (errno == ENOLCK)
       {
         _error->Warning(_("Not using locking for nfs mounted lock file %s"),File.c_str());
         return dup(0);       // Need something for the caller to close  

-      }      
+      }
+  

       if (Errors == true)
         _error->Errno("open",_("Could not get lock %s"),File.c_str());
       
       if (Errors == true)
         _error->Errno("open",_("Could not get lock %s"),File.c_str());
       

-      int Tmp = errno;
-      close(FD);
-      errno = Tmp;

       return -1;
    }
 
       return -1;
    }
 


@@ -359,7 +393,7 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c
 
    std::vector<string> List;
 
 
    std::vector<string> List;
 

-   if (DirectoryExists(Dir.c_str()) == false)
+   if (DirectoryExists(Dir) == false)

    {
       _error->Error(_("List of files can't be created as '%s' is not a directory"), Dir.c_str());
       return List;
    {
       _error->Error(_("List of files can't be created as '%s' is not a directory"), Dir.c_str());
       return List;


@@ -385,8 +419,15 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c
       if (Ent->d_type != DT_REG)
 #endif
       {
       if (Ent->d_type != DT_REG)
 #endif
       {

-        if (RealFileExists(File.c_str()) == false)
+        if (RealFileExists(File) == false)

         {
         {

+           // do not show ignoration warnings for directories
+           if (
+#ifdef _DIRENT_HAVE_D_TYPE
+               Ent->d_type == DT_DIR ||
+#endif
+               DirectoryExists(File) == true)
+              continue;

            if (SilentIgnore.Match(Ent->d_name) == false)
               _error->Notice(_("Ignoring '%s' in directory '%s' as it is not a regular file"), Ent->d_name, Dir.c_str());
            continue;
            if (SilentIgnore.Match(Ent->d_name) == false)
               _error->Notice(_("Ignoring '%s' in directory '%s' as it is not a regular file"), Ent->d_name, Dir.c_str());
            continue;


@@ -454,6 +495,80 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c
    }
    closedir(D);
 
    }
    closedir(D);
 

+   if (SortList == true)
+      std::sort(List.begin(),List.end());
+   return List;
+}
+std::vector<string> GetListOfFilesInDir(string const &Dir, bool SortList)
+{
+   bool const Debug = _config->FindB("Debug::GetListOfFilesInDir", false);
+   if (Debug == true)
+      std::clog << "Accept in " << Dir << " all regular files" << std::endl;
+
+   std::vector<string> List;
+
+   if (DirectoryExists(Dir) == false)
+   {
+      _error->Error(_("List of files can't be created as '%s' is not a directory"), Dir.c_str());
+      return List;
+   }
+
+   DIR *D = opendir(Dir.c_str());
+   if (D == 0)
+   {
+      _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
+      return List;
+   }
+
+   for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) 
+   {
+      // skip "hidden" files
+      if (Ent->d_name[0] == '.')
+        continue;
+
+      // Make sure it is a file and not something else
+      string const File = flCombine(Dir,Ent->d_name);
+#ifdef _DIRENT_HAVE_D_TYPE
+      if (Ent->d_type != DT_REG)
+#endif
+      {
+        if (RealFileExists(File) == false)
+        {
+           if (Debug == true)
+              std::clog << "Bad file: " << Ent->d_name << " → it is not a real file" << std::endl;
+           continue;
+        }
+      }
+
+      // Skip bad filenames ala run-parts
+      const char *C = Ent->d_name;
+      for (; *C != 0; ++C)
+        if (isalpha(*C) == 0 && isdigit(*C) == 0
+            && *C != '_' && *C != '-' && *C != '.')
+           break;
+
+      // we don't reach the end of the name -> bad character included
+      if (*C != 0)
+      {
+        if (Debug == true)
+           std::clog << "Bad file: " << Ent->d_name << " → bad character »" << *C << "« in filename" << std::endl;
+        continue;
+      }
+
+      // skip filenames which end with a period. These are never valid
+      if (*(C - 1) == '.')
+      {
+        if (Debug == true)
+           std::clog << "Bad file: " << Ent->d_name << " → Period as last character" << std::endl;
+        continue;
+      }
+
+      if (Debug == true)
+        std::clog << "Accept file: " << Ent->d_name << " in " << Dir << std::endl;
+      List.push_back(File);
+   }
+   closedir(D);
+

    if (SortList == true)
       std::sort(List.begin(),List.end());
    return List;
    if (SortList == true)
       std::sort(List.begin(),List.end());
    return List;


@@ -541,9 +656,9 @@ string flNoLink(string File)
    while (1)
    {
       // Read the link
    while (1)
    {
       // Read the link

-      int Res;
+      ssize_t Res;

       if ((Res = readlink(NFile.c_str(),Buffer,sizeof(Buffer))) <= 0 || 
       if ((Res = readlink(NFile.c_str(),Buffer,sizeof(Buffer))) <= 0 || 

-         (unsigned)Res >= sizeof(Buffer))
+         (size_t)Res >= sizeof(Buffer))

          return File;
       
       // Append or replace the previous path
          return File;
       
       // Append or replace the previous path


@@ -651,6 +766,25 @@ bool WaitFd(int Fd,bool write,unsigned long timeout)
    child, it fixes up the important signals and nukes all of the fds,
    otherwise acts like normal fork. */
 pid_t ExecFork()
    child, it fixes up the important signals and nukes all of the fds,
    otherwise acts like normal fork. */
 pid_t ExecFork()

+{
+      set<int> KeepFDs;
+
+      Configuration::Item const *Opts = _config->Tree("APT::Keep-Fds");
+      if (Opts != 0 && Opts->Child != 0)
+      {
+        Opts = Opts->Child;
+        for (; Opts != 0; Opts = Opts->Next)
+        {
+           if (Opts->Value.empty() == true)
+              continue;
+           int fd = atoi(Opts->Value.c_str());
+           KeepFDs.insert(fd);
+        }
+      }
+      return ExecFork(KeepFDs);
+}
+
+pid_t ExecFork(std::set<int> KeepFDs)

 {
    // Fork off the process
    pid_t Process = fork();
 {
    // Fork off the process
    pid_t Process = fork();


@@ -671,20 +805,6 @@ pid_t ExecFork()
       signal(SIGCONT,SIG_DFL);
       signal(SIGTSTP,SIG_DFL);
 
       signal(SIGCONT,SIG_DFL);
       signal(SIGTSTP,SIG_DFL);
 

-      set<int> KeepFDs;
-      Configuration::Item const *Opts = _config->Tree("APT::Keep-Fds");
-      if (Opts != 0 && Opts->Child != 0)
-      {
-        Opts = Opts->Child;
-        for (; Opts != 0; Opts = Opts->Next)
-        {
-           if (Opts->Value.empty() == true)
-              continue;
-           int fd = atoi(Opts->Value.c_str());
-           KeepFDs.insert(fd);
-        }
-      }
-

       // Close all of our FDs - just in case
       for (int K = 3; K != 40; K++)
       {
       // Close all of our FDs - just in case
       for (int K = 3; K != 40; K++)
       {


@@ -752,9 +872,8 @@ bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress,
       return Open(FileName, ReadOnly, Gzip, Perms);
 
    if (Compress == Auto && (Mode & WriteOnly) == WriteOnly)
       return Open(FileName, ReadOnly, Gzip, Perms);
 
    if (Compress == Auto && (Mode & WriteOnly) == WriteOnly)

-      return _error->Error("Autodetection on %s only works in ReadOnly openmode!", FileName.c_str());
+      return FileFdError("Autodetection on %s only works in ReadOnly openmode!", FileName.c_str());

 
 

-   // FIXME: Denote inbuilt compressors somehow - as we don't need to have the binaries for them

    std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
    std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();
    if (Compress == Auto)
    std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
    std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();
    if (Compress == Auto)


@@ -806,37 +925,32 @@ bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress,
       case Auto:
       case Extension:
         // Unreachable
       case Auto:
       case Extension:
         // Unreachable

-        return _error->Error("Opening File %s in None, Auto or Extension should be already handled?!?", FileName.c_str());
+        return FileFdError("Opening File %s in None, Auto or Extension should be already handled?!?", FileName.c_str());

       }
       for (; compressor != compressors.end(); ++compressor)
         if (compressor->Name == name)
            break;
       if (compressor == compressors.end())
       }
       for (; compressor != compressors.end(); ++compressor)
         if (compressor->Name == name)
            break;
       if (compressor == compressors.end())

-        return _error->Error("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str());
+        return FileFdError("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str());

    }
 
    if (compressor == compressors.end())
    }
 
    if (compressor == compressors.end())

-      return _error->Error("Can't find a match for specified compressor mode for file %s", FileName.c_str());
+      return FileFdError("Can't find a match for specified compressor mode for file %s", FileName.c_str());

    return Open(FileName, Mode, *compressor, Perms);
 }
 bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor, unsigned long const Perms)
 {
    Close();
    return Open(FileName, Mode, *compressor, Perms);
 }
 bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor, unsigned long const Perms)
 {
    Close();

-   d = new FileFdPrivate;
-   d->openmode = Mode;

    Flags = AutoClose;
 
    if ((Mode & WriteOnly) != WriteOnly && (Mode & (Atomic | Create | Empty | Exclusive)) != 0)
    Flags = AutoClose;
 
    if ((Mode & WriteOnly) != WriteOnly && (Mode & (Atomic | Create | Empty | Exclusive)) != 0)

-      return _error->Error("ReadOnly mode for %s doesn't accept additional flags!", FileName.c_str());
+      return FileFdError("ReadOnly mode for %s doesn't accept additional flags!", FileName.c_str());

    if ((Mode & ReadWrite) == 0)
    if ((Mode & ReadWrite) == 0)

-      return _error->Error("No openmode provided in FileFd::Open for %s", FileName.c_str());
+      return FileFdError("No openmode provided in FileFd::Open for %s", FileName.c_str());

 
    if ((Mode & Atomic) == Atomic)
    {
       Flags |= Replace;
 
    if ((Mode & Atomic) == Atomic)
    {
       Flags |= Replace;

-      char *name = strdup((FileName + ".XXXXXX").c_str());
-      TemporaryFileName = string(mktemp(name));
-      free(name);

    }
    else if ((Mode & (Exclusive | Create)) == (Exclusive | Create))
    {
    }
    else if ((Mode & (Exclusive | Create)) == (Exclusive | Create))
    {


@@ -859,11 +973,24 @@ bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Co
    if_FLAGGED_SET(Create, O_CREAT);
    if_FLAGGED_SET(Empty, O_TRUNC);
    if_FLAGGED_SET(Exclusive, O_EXCL);
    if_FLAGGED_SET(Create, O_CREAT);
    if_FLAGGED_SET(Empty, O_TRUNC);
    if_FLAGGED_SET(Exclusive, O_EXCL);

-   else if_FLAGGED_SET(Atomic, O_EXCL);

    #undef if_FLAGGED_SET
 
    #undef if_FLAGGED_SET
 

-   if (TemporaryFileName.empty() == false)
-      iFd = open(TemporaryFileName.c_str(), fileflags, Perms);
+   if ((Mode & Atomic) == Atomic)
+   {
+      char *name = strdup((FileName + ".XXXXXX").c_str());
+
+      if((iFd = mkstemp(name)) == -1)
+      {
+          free(name);
+          return FileFdErrno("mkstemp", "Could not create temporary file for %s", FileName.c_str());
+      }
+
+      TemporaryFileName = string(name);
+      free(name);
+
+      if(Perms != 600 && fchmod(iFd, Perms) == -1)
+          return FileFdErrno("fchmod", "Could not change permissions for temporary file %s", TemporaryFileName.c_str());
+   }

    else
       iFd = open(FileName.c_str(), fileflags, Perms);
 
    else
       iFd = open(FileName.c_str(), fileflags, Perms);
 


@@ -875,7 +1002,7 @@ bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Co
         close (iFd);
         iFd = -1;
       }
         close (iFd);
         iFd = -1;
       }

-      return _error->Errno("open",_("Could not open file %s"), FileName.c_str());
+      return FileFdErrno("open",_("Could not open file %s"), FileName.c_str());

    }
 
    SetCloseExec(iFd,true);
    }
 
    SetCloseExec(iFd,true);


@@ -890,6 +1017,11 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compre
    std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
    std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();
    std::string name;
    std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
    std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();
    std::string name;

+
+   // compat with the old API
+   if (Mode == ReadOnlyGzip && Compress == None)
+      Compress = Gzip;
+

    switch (Compress)
    {
    case None: name = "."; break;
    switch (Compress)
    {
    case None: name = "."; break;


@@ -899,60 +1031,122 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compre
    case Xz: name = "xz"; break;
    case Auto:
    case Extension:
    case Xz: name = "xz"; break;
    case Auto:
    case Extension:

-      return _error->Error("Opening Fd %d in Auto or Extension compression mode is not supported", Fd);
+      if (AutoClose == true && Fd != -1)
+        close(Fd);
+      return FileFdError("Opening Fd %d in Auto or Extension compression mode is not supported", Fd);

    }
    for (; compressor != compressors.end(); ++compressor)
       if (compressor->Name == name)
         break;
    if (compressor == compressors.end())
    }
    for (; compressor != compressors.end(); ++compressor)
       if (compressor->Name == name)
         break;
    if (compressor == compressors.end())

-      return _error->Error("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str());
-
+   {
+      if (AutoClose == true && Fd != -1)
+        close(Fd);
+      return FileFdError("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str());
+   }

    return OpenDescriptor(Fd, Mode, *compressor, AutoClose);
 }
 bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose)
 {
    Close();
    return OpenDescriptor(Fd, Mode, *compressor, AutoClose);
 }
 bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose)
 {
    Close();

-   d = new FileFdPrivate;
-   d->openmode = Mode;

    Flags = (AutoClose) ? FileFd::AutoClose : 0;
    Flags = (AutoClose) ? FileFd::AutoClose : 0;

-   iFd = Fd;
+   if (AutoClose == false && (
+#ifdef HAVE_ZLIB
+       compressor.Name == "gzip" ||
+#endif
+#ifdef HAVE_BZ2
+       compressor.Name == "bzip2" ||
+#endif
+       false))
+   {
+      // Need to duplicate fd here or gzclose for cleanup will close the fd as well
+      iFd = dup(Fd);
+   }
+   else
+      iFd = Fd;

    this->FileName = "";
    this->FileName = "";

-   if (OpenInternDescriptor(Mode, compressor) == false)
+   if (Fd == -1 || OpenInternDescriptor(Mode, compressor) == false)

    {
    {

-      if (AutoClose)
+      if (iFd != -1 && (
+#ifdef HAVE_ZLIB
+       compressor.Name == "gzip" ||
+#endif
+#ifdef HAVE_BZ2
+       compressor.Name == "bzip2" ||
+#endif
+       AutoClose == true))
+      {

         close (iFd);
         close (iFd);

-      return _error->Errno("gzdopen",_("Could not open file descriptor %d"), Fd);
+        iFd = -1;
+      }
+      return FileFdError(_("Could not open file descriptor %d"), Fd);

    }
    return true;
 }
 bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor)
 {
    }
    return true;
 }
 bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor)
 {

-   d->compressor = compressor;

    if (compressor.Name == "." || compressor.Binary.empty() == true)
       return true;
    if (compressor.Name == "." || compressor.Binary.empty() == true)
       return true;

-#if APT_USE_ZLIB
-   else if (compressor.Name == "gzip")
+
+   if (d == NULL)

    {
    {

+      d = new FileFdPrivate();
+      d->openmode = Mode;
+      d->compressor = compressor;
+   }
+
+#ifdef HAVE_ZLIB
+   if (compressor.Name == "gzip")
+   {
+      if (d->gz != NULL)
+      {
+        gzclose(d->gz);
+        d->gz = NULL;
+      }

       if ((Mode & ReadWrite) == ReadWrite)
         d->gz = gzdopen(iFd, "r+");
       else if ((Mode & WriteOnly) == WriteOnly)
         d->gz = gzdopen(iFd, "w");
       else
       if ((Mode & ReadWrite) == ReadWrite)
         d->gz = gzdopen(iFd, "r+");
       else if ((Mode & WriteOnly) == WriteOnly)
         d->gz = gzdopen(iFd, "w");
       else

-        d->gz = gzdopen (iFd, "r");
+        d->gz = gzdopen(iFd, "r");

       if (d->gz == NULL)
         return false;
       Flags |= Compressed;
       return true;
    }
 #endif
       if (d->gz == NULL)
         return false;
       Flags |= Compressed;
       return true;
    }
 #endif

+#ifdef HAVE_BZ2
+   if (compressor.Name == "bzip2")
+   {
+      if (d->bz2 != NULL)
+      {
+        BZ2_bzclose(d->bz2);
+        d->bz2 = NULL;
+      }
+      if ((Mode & ReadWrite) == ReadWrite)
+        d->bz2 = BZ2_bzdopen(iFd, "r+");
+      else if ((Mode & WriteOnly) == WriteOnly)
+        d->bz2 = BZ2_bzdopen(iFd, "w");
+      else
+        d->bz2 = BZ2_bzdopen(iFd, "r");
+      if (d->bz2 == NULL)
+        return false;
+      Flags |= Compressed;
+      return true;
+   }
+#endif
+
+   // collect zombies here in case we reopen
+   if (d->compressor_pid > 0)
+      ExecWait(d->compressor_pid, "FileFdCompressor", true);

 
    if ((Mode & ReadWrite) == ReadWrite)
 
    if ((Mode & ReadWrite) == ReadWrite)

-      return _error->Error("ReadWrite mode is not supported for file %s", FileName.c_str());
+      return FileFdError("ReadWrite mode is not supported for file %s", FileName.c_str());

 
    bool const Comp = (Mode & WriteOnly) == WriteOnly;
 
    bool const Comp = (Mode & WriteOnly) == WriteOnly;

-   // Handle 'decompression' of empty files

    if (Comp == false)
    {
    if (Comp == false)
    {

+      // Handle 'decompression' of empty files

       struct stat Buf;
       fstat(iFd, &Buf);
       if (Buf.st_size == 0 && S_ISFIFO(Buf.st_mode) == false)
       struct stat Buf;
       fstat(iFd, &Buf);
       if (Buf.st_size == 0 && S_ISFIFO(Buf.st_mode) == false)


@@ -961,13 +1155,16 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C
       // We don't need the file open - instead let the compressor open it
       // as he properly knows better how to efficiently read from 'his' file
       if (FileName.empty() == false)
       // We don't need the file open - instead let the compressor open it
       // as he properly knows better how to efficiently read from 'his' file
       if (FileName.empty() == false)

+      {

         close(iFd);
         close(iFd);

+        iFd = -1;
+      }

    }
 
    // Create a data pipe
    int Pipe[2] = {-1,-1};
    if (pipe(Pipe) != 0)
    }
 
    // Create a data pipe
    int Pipe[2] = {-1,-1};
    if (pipe(Pipe) != 0)

-      return _error->Errno("pipe",_("Failed to create subprocess IPC"));
+      return FileFdErrno("pipe",_("Failed to create subprocess IPC"));

    for (int J = 0; J != 2; J++)
       SetCloseExec(Pipe[J],true);
 
    for (int J = 0; J != 2; J++)
       SetCloseExec(Pipe[J],true);
 


@@ -994,6 +1191,12 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C
            dup2(d->compressed_fd,STDIN_FILENO);
         dup2(Pipe[1],STDOUT_FILENO);
       }
            dup2(d->compressed_fd,STDIN_FILENO);
         dup2(Pipe[1],STDOUT_FILENO);
       }

+      int const nullfd = open("/dev/null", O_WRONLY);
+      if (nullfd != -1)
+      {
+        dup2(nullfd,STDERR_FILENO);
+        close(nullfd);
+      }

 
       SetCloseExec(STDOUT_FILENO,false);
       SetCloseExec(STDIN_FILENO,false);
 
       SetCloseExec(STDOUT_FILENO,false);
       SetCloseExec(STDIN_FILENO,false);


@@ -1023,8 +1226,6 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C
       close(Pipe[0]);
    else
       close(Pipe[1]);
       close(Pipe[0]);
    else
       close(Pipe[1]);

-   if (Comp == true || FileName.empty() == true)
-      close(d->compressed_fd);

 
    return true;
 }
 
    return true;
 }


@@ -1036,6 +1237,10 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C
 FileFd::~FileFd()
 {
    Close();
 FileFd::~FileFd()
 {
    Close();

+   if (d != NULL)
+      d->CloseDown(FileName);
+   delete d;
+   d = NULL;

 }
                                                                        /*}}}*/
 // FileFd::Read - Read a bit of the file                               /*{{{*/
 }
                                                                        /*}}}*/
 // FileFd::Read - Read a bit of the file                               /*{{{*/


@@ -1044,16 +1249,21 @@ FileFd::~FileFd()
    gracefully. */
 bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 {
    gracefully. */
 bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 {

-   int Res;
+   ssize_t Res;

    errno = 0;
    if (Actual != 0)
       *Actual = 0;
    *((char *)To) = '\0';
    do
    {
    errno = 0;
    if (Actual != 0)
       *Actual = 0;
    *((char *)To) = '\0';
    do
    {

-#if APT_USE_ZLIB
-      if (d->gz != NULL)
-         Res = gzread(d->gz,To,Size);
+#ifdef HAVE_ZLIB
+      if (d != NULL && d->gz != NULL)
+        Res = gzread(d->gz,To,Size);
+      else
+#endif
+#ifdef HAVE_BZ2
+      if (d != NULL && d->bz2 != NULL)
+        Res = BZ2_bzread(d->bz2,To,Size);

       else
 #endif
          Res = read(iFd,To,Size);
       else
 #endif
          Res = read(iFd,To,Size);


@@ -1062,22 +1272,31 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
       {
         if (errno == EINTR)
            continue;
       {
         if (errno == EINTR)
            continue;

-        Flags |= Fail;
-#if APT_USE_ZLIB
-        if (d->gz != NULL)
+#ifdef HAVE_ZLIB
+        if (d != NULL && d->gz != NULL)

         {
            int err;
            char const * const errmsg = gzerror(d->gz, &err);
            if (err != Z_ERRNO)
         {
            int err;
            char const * const errmsg = gzerror(d->gz, &err);
            if (err != Z_ERRNO)

-              return _error->Error("gzread: %s (%d: %s)", _("Read error"), err, errmsg);
+              return FileFdError("gzread: %s (%d: %s)", _("Read error"), err, errmsg);
+        }
+#endif
+#ifdef HAVE_BZ2
+        if (d != NULL && d->bz2 != NULL)
+        {
+           int err;
+           char const * const errmsg = BZ2_bzerror(d->bz2, &err);
+           if (err != BZ_IO_ERROR)
+              return FileFdError("BZ2_bzread: %s (%d: %s)", _("Read error"), err, errmsg);

         }
 #endif
         }
 #endif

-        return _error->Errno("read",_("Read error"));
+        return FileFdErrno("read",_("Read error"));

       }
       
       To = (char *)To + Res;
       Size -= Res;
       }
       
       To = (char *)To + Res;
       Size -= Res;

-      d->seekpos += Res;
+      if (d != NULL)
+        d->seekpos += Res;

       if (Actual != 0)
         *Actual += Res;
    }
       if (Actual != 0)
         *Actual += Res;
    }


@@ -1092,9 +1311,8 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
       Flags |= HitEof;
       return true;
    }
       Flags |= HitEof;
       return true;
    }

-   
-   Flags |= Fail;
-   return _error->Error(_("read, still have %llu to read but none left"), Size);
+
+   return FileFdError(_("read, still have %llu to read but none left"), Size);

 }
                                                                        /*}}}*/
 // FileFd::ReadLine - Read a complete line from the file               /*{{{*/
 }
                                                                        /*}}}*/
 // FileFd::ReadLine - Read a complete line from the file               /*{{{*/


@@ -1104,8 +1322,8 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 char* FileFd::ReadLine(char *To, unsigned long long const Size)
 {
    *To = '\0';
 char* FileFd::ReadLine(char *To, unsigned long long const Size)
 {
    *To = '\0';

-#if APT_USE_ZLIB
-   if (d->gz != NULL)
+#ifdef HAVE_ZLIB
+   if (d != NULL && d->gz != NULL)

       return gzgets(d->gz, To, Size);
 #endif
 
       return gzgets(d->gz, To, Size);
 #endif
 


@@ -1131,34 +1349,78 @@ char* FileFd::ReadLine(char *To, unsigned long long const Size)
 /* */
 bool FileFd::Write(const void *From,unsigned long long Size)
 {
 /* */
 bool FileFd::Write(const void *From,unsigned long long Size)
 {

-   int Res;
+   ssize_t Res;

    errno = 0;
    do
    {
    errno = 0;
    do
    {

-#if APT_USE_ZLIB
-      if (d->gz != NULL)
+#ifdef HAVE_ZLIB
+      if (d != NULL && d->gz != NULL)

          Res = gzwrite(d->gz,From,Size);
       else
          Res = gzwrite(d->gz,From,Size);
       else

+#endif
+#ifdef HAVE_BZ2
+      if (d != NULL && d->bz2 != NULL)
+         Res = BZ2_bzwrite(d->bz2,(void*)From,Size);
+      else

 #endif
          Res = write(iFd,From,Size);
       if (Res < 0 && errno == EINTR)
         continue;
       if (Res < 0)
       {
 #endif
          Res = write(iFd,From,Size);
       if (Res < 0 && errno == EINTR)
         continue;
       if (Res < 0)
       {

-        Flags |= Fail;
-        return _error->Errno("write",_("Write error"));
+#ifdef HAVE_ZLIB
+        if (d != NULL && d->gz != NULL)
+        {
+           int err;
+           char const * const errmsg = gzerror(d->gz, &err);
+           if (err != Z_ERRNO)
+              return FileFdError("gzwrite: %s (%d: %s)", _("Write error"), err, errmsg);
+        }
+#endif
+#ifdef HAVE_BZ2
+        if (d != NULL && d->bz2 != NULL)
+        {
+           int err;
+           char const * const errmsg = BZ2_bzerror(d->bz2, &err);
+           if (err != BZ_IO_ERROR)
+              return FileFdError("BZ2_bzwrite: %s (%d: %s)", _("Write error"), err, errmsg);
+        }
+#endif
+        return FileFdErrno("write",_("Write error"));

       }
       
       From = (char *)From + Res;
       Size -= Res;
       }
       
       From = (char *)From + Res;
       Size -= Res;

-      d->seekpos += Res;
+      if (d != NULL)
+        d->seekpos += Res;

    }
    while (Res > 0 && Size > 0);
    
    if (Size == 0)
       return true;
    }
    while (Res > 0 && Size > 0);
    
    if (Size == 0)
       return true;

-   
-   Flags |= Fail;
+
+   return FileFdError(_("write, still have %llu to write but couldn't"), Size);
+}
+bool FileFd::Write(int Fd, const void *From, unsigned long long Size)
+{
+   ssize_t Res;
+   errno = 0;
+   do
+   {
+      Res = write(Fd,From,Size);
+      if (Res < 0 && errno == EINTR)
+        continue;
+      if (Res < 0)
+        return _error->Errno("write",_("Write error"));
+
+      From = (char *)From + Res;
+      Size -= Res;
+   }
+   while (Res > 0 && Size > 0);
+
+   if (Size == 0)
+      return true;
+

    return _error->Error(_("write, still have %llu to write but couldn't"), Size);
 }
                                                                        /*}}}*/
    return _error->Error(_("write, still have %llu to write but couldn't"), Size);
 }
                                                                        /*}}}*/


@@ -1167,7 +1429,11 @@ bool FileFd::Write(const void *From,unsigned long long Size)
 /* */
 bool FileFd::Seek(unsigned long long To)
 {
 /* */
 bool FileFd::Seek(unsigned long long To)
 {

-   if (d->pipe == true)
+   if (d != NULL && (d->pipe == true
+#ifdef HAVE_BZ2
+                       || d->bz2 != NULL
+#endif
+       ))

    {
       // Our poor man seeking in pipes is costly, so try to avoid it
       unsigned long long seekpos = Tell();
    {
       // Our poor man seeking in pipes is costly, so try to avoid it
       unsigned long long seekpos = Tell();


@@ -1177,9 +1443,17 @@ bool FileFd::Seek(unsigned long long To)
         return Skip(To - seekpos);
 
       if ((d->openmode & ReadOnly) != ReadOnly)
         return Skip(To - seekpos);
 
       if ((d->openmode & ReadOnly) != ReadOnly)

-        return _error->Error("Reopen is only implemented for read-only files!");
-      close(iFd);
-      iFd = 0;
+        return FileFdError("Reopen is only implemented for read-only files!");
+#ifdef HAVE_BZ2
+     if (d->bz2 != NULL) 
+     {
+       BZ2_bzclose(d->bz2);
+       d->bz2 = NULL;
+     }
+#endif
+      if (iFd != -1)
+        close(iFd);
+      iFd = -1;

       if (TemporaryFileName.empty() == false)
         iFd = open(TemporaryFileName.c_str(), O_RDONLY);
       else if (FileName.empty() == false)
       if (TemporaryFileName.empty() == false)
         iFd = open(TemporaryFileName.c_str(), O_RDONLY);
       else if (FileName.empty() == false)


@@ -1189,12 +1463,12 @@ bool FileFd::Seek(unsigned long long To)
         if (d->compressed_fd > 0)
            if (lseek(d->compressed_fd, 0, SEEK_SET) != 0)
               iFd = d->compressed_fd;
         if (d->compressed_fd > 0)
            if (lseek(d->compressed_fd, 0, SEEK_SET) != 0)
               iFd = d->compressed_fd;

-        if (iFd <= 0)
-           return _error->Error("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!");
+        if (iFd < 0)
+           return FileFdError("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!");

       }
 
       if (OpenInternDescriptor(d->openmode, d->compressor) == false)
       }
 
       if (OpenInternDescriptor(d->openmode, d->compressor) == false)

-        return _error->Error("Seek on file %s because it couldn't be reopened", FileName.c_str());
+        return FileFdError("Seek on file %s because it couldn't be reopened", FileName.c_str());

 
       if (To != 0)
         return Skip(To);
 
       if (To != 0)
         return Skip(To);


@@ -1202,20 +1476,18 @@ bool FileFd::Seek(unsigned long long To)
       d->seekpos = To;
       return true;
    }
       d->seekpos = To;
       return true;
    }

-   int res;
-#if APT_USE_ZLIB
-   if (d->gz)
+   off_t res;
+#ifdef HAVE_ZLIB
+   if (d != NULL && d->gz)

       res = gzseek(d->gz,To,SEEK_SET);
    else
 #endif
       res = lseek(iFd,To,SEEK_SET);
       res = gzseek(d->gz,To,SEEK_SET);
    else
 #endif
       res = lseek(iFd,To,SEEK_SET);

-   if (res != (signed)To)
-   {
-      Flags |= Fail;
-      return _error->Error("Unable to seek to %llu", To);
-   }
+   if (res != (off_t)To)
+      return FileFdError("Unable to seek to %llu", To);

 
 

-   d->seekpos = To;
+   if (d != NULL)
+      d->seekpos = To;

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -1224,7 +1496,11 @@ bool FileFd::Seek(unsigned long long To)
 /* */
 bool FileFd::Skip(unsigned long long Over)
 {
 /* */
 bool FileFd::Skip(unsigned long long Over)
 {

-   if (d->pipe == true)
+   if (d != NULL && (d->pipe == true
+#ifdef HAVE_BZ2
+                       || d->bz2 != NULL
+#endif
+       ))

    {
       d->seekpos += Over;
       char buffer[1024];
    {
       d->seekpos += Over;
       char buffer[1024];


@@ -1232,25 +1508,23 @@ bool FileFd::Skip(unsigned long long Over)
       {
         unsigned long long toread = std::min((unsigned long long) sizeof(buffer), Over);
         if (Read(buffer, toread) == false)
       {
         unsigned long long toread = std::min((unsigned long long) sizeof(buffer), Over);
         if (Read(buffer, toread) == false)

-           return _error->Error("Unable to seek ahead %llu",Over);
+           return FileFdError("Unable to seek ahead %llu",Over);

         Over -= toread;
       }
       return true;
    }
 
         Over -= toread;
       }
       return true;
    }
 

-   int res;
-#if APT_USE_ZLIB
-   if (d->gz != NULL)
+   off_t res;
+#ifdef HAVE_ZLIB
+   if (d != NULL && d->gz != NULL)

       res = gzseek(d->gz,Over,SEEK_CUR);
    else
 #endif
       res = lseek(iFd,Over,SEEK_CUR);
    if (res < 0)
       res = gzseek(d->gz,Over,SEEK_CUR);
    else
 #endif
       res = lseek(iFd,Over,SEEK_CUR);
    if (res < 0)

-   {
-      Flags |= Fail;
-      return _error->Error("Unable to seek ahead %llu",Over);
-   }
-   d->seekpos = res;
+      return FileFdError("Unable to seek ahead %llu",Over);
+   if (d != NULL)
+      d->seekpos = res;

 
    return true;
 }
 
    return true;
 }


@@ -1260,17 +1534,13 @@ bool FileFd::Skip(unsigned long long Over)
 /* */
 bool FileFd::Truncate(unsigned long long To)
 {
 /* */
 bool FileFd::Truncate(unsigned long long To)
 {

-   if (d->gz != NULL)
-   {
-      Flags |= Fail;
-      return _error->Error("Truncating gzipped files is not implemented (%s)", FileName.c_str());
-   }
+#if defined HAVE_ZLIB || defined HAVE_BZ2
+   if (d != NULL && (d->gz != NULL || d->bz2 != NULL))
+      return FileFdError("Truncating compressed files is not implemented (%s)", FileName.c_str());
+#endif

    if (ftruncate(iFd,To) != 0)
    if (ftruncate(iFd,To) != 0)

-   {
-      Flags |= Fail;
-      return _error->Error("Unable to truncate to %llu",To);
-   }
-   
+      return FileFdError("Unable to truncate to %llu",To);
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -1283,19 +1553,24 @@ unsigned long long FileFd::Tell()
    // seeking around, but not all users of FileFd use always Seek() and co
    // so d->seekpos isn't always true and we can just use it as a hint if
    // we have nothing else, but not always as an authority…
    // seeking around, but not all users of FileFd use always Seek() and co
    // so d->seekpos isn't always true and we can just use it as a hint if
    // we have nothing else, but not always as an authority…

-   if (d->pipe == true)
+   if (d != NULL && (d->pipe == true
+#ifdef HAVE_BZ2
+                       || d->bz2 != NULL
+#endif
+       ))

       return d->seekpos;
 
    off_t Res;
       return d->seekpos;
 
    off_t Res;

-#if APT_USE_ZLIB
-   if (d->gz != NULL)
+#ifdef HAVE_ZLIB
+   if (d != NULL && d->gz != NULL)

      Res = gztell(d->gz);
    else
 #endif
      Res = lseek(iFd,0,SEEK_CUR);
    if (Res == (off_t)-1)
      Res = gztell(d->gz);
    else
 #endif
      Res = lseek(iFd,0,SEEK_CUR);
    if (Res == (off_t)-1)

-      _error->Errno("lseek","Failed to determine the current file position");
-   d->seekpos = Res;
+      FileFdErrno("lseek","Failed to determine the current file position");
+   if (d != NULL)
+      d->seekpos = Res;

    return Res;
 }
                                                                        /*}}}*/
    return Res;
 }
                                                                        /*}}}*/


@@ -1305,17 +1580,18 @@ unsigned long long FileFd::Tell()
 unsigned long long FileFd::FileSize()
 {
    struct stat Buf;
 unsigned long long FileFd::FileSize()
 {
    struct stat Buf;

-   if (d->pipe == false && fstat(iFd,&Buf) != 0)
-      return _error->Errno("fstat","Unable to determine the file size");
+   if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0)
+      return FileFdErrno("fstat","Unable to determine the file size");

 
    // for compressor pipes st_size is undefined and at 'best' zero
 
    // for compressor pipes st_size is undefined and at 'best' zero

-   if (d->pipe == true || S_ISFIFO(Buf.st_mode))
+   if ((d != NULL && d->pipe == true) || S_ISFIFO(Buf.st_mode))

    {
       // we set it here, too, as we get the info here for free
       // in theory the Open-methods should take care of it already
    {
       // we set it here, too, as we get the info here for free
       // in theory the Open-methods should take care of it already

-      d->pipe = true;
+      if (d != NULL)
+        d->pipe = true;

       if (stat(FileName.c_str(), &Buf) != 0)
       if (stat(FileName.c_str(), &Buf) != 0)

-        return _error->Errno("stat","Unable to determine the file size");
+        return FileFdErrno("stat","Unable to determine the file size");

    }
 
    return Buf.st_size;
    }
 
    return Buf.st_size;


@@ -1330,22 +1606,30 @@ unsigned long long FileFd::Size()
 
    // for compressor pipes st_size is undefined and at 'best' zero,
    // so we 'read' the content and 'seek' back - see there
 
    // for compressor pipes st_size is undefined and at 'best' zero,
    // so we 'read' the content and 'seek' back - see there

-   if (d->pipe == true)
+   if (d != NULL && (d->pipe == true
+#ifdef HAVE_BZ2
+                       || (d->bz2 && size > 0)
+#endif
+       ))

    {
       unsigned long long const oldSeek = Tell();
       char ignore[1000];
       unsigned long long read = 0;
       do {
    {
       unsigned long long const oldSeek = Tell();
       char ignore[1000];
       unsigned long long read = 0;
       do {

-        Read(ignore, sizeof(ignore), &read);
+        if (Read(ignore, sizeof(ignore), &read) == false)
+        {
+           Seek(oldSeek);
+           return 0;
+        }

       } while(read != 0);
       size = Tell();
       Seek(oldSeek);
    }
       } while(read != 0);
       size = Tell();
       Seek(oldSeek);
    }

-#if APT_USE_ZLIB
+#ifdef HAVE_ZLIB

    // only check gzsize if we are actually a gzip file, just checking for
    // "gz" is not sufficient as uncompressed files could be opened with
    // gzopen in "direct" mode as well
    // only check gzsize if we are actually a gzip file, just checking for
    // "gz" is not sufficient as uncompressed files could be opened with
    // gzopen in "direct" mode as well

-   else if (d->gz && !gzdirect(d->gz) && size > 0)
+   else if (d != NULL && d->gz && !gzdirect(d->gz) && size > 0)

    {
        off_t const oldPos = lseek(iFd,0,SEEK_CUR);
        /* unfortunately zlib.h doesn't provide a gzsize(), so we have to do
    {
        off_t const oldPos = lseek(iFd,0,SEEK_CUR);
        /* unfortunately zlib.h doesn't provide a gzsize(), so we have to do


@@ -1353,10 +1637,16 @@ unsigned long long FileFd::Size()
        * bits of the file */
        // FIXME: Size for gz-files is limited by 32bit… no largefile support
        if (lseek(iFd, -4, SEEK_END) < 0)
        * bits of the file */
        // FIXME: Size for gz-files is limited by 32bit… no largefile support
        if (lseek(iFd, -4, SEEK_END) < 0)

-          return _error->Errno("lseek","Unable to seek to end of gzipped file");
-       size = 0L;
+       {
+         FileFdErrno("lseek","Unable to seek to end of gzipped file");
+         return 0;
+       }
+       size = 0;

        if (read(iFd, &size, 4) != 4)
        if (read(iFd, &size, 4) != 4)

-          return _error->Errno("read","Unable to read original size of gzipped file");
+       {
+         FileFdErrno("read","Unable to read original size of gzipped file");
+         return 0;
+       }

 
 #ifdef WORDS_BIGENDIAN
        uint32_t tmp_size = size;
 
 #ifdef WORDS_BIGENDIAN
        uint32_t tmp_size = size;


@@ -1366,7 +1656,10 @@ unsigned long long FileFd::Size()
 #endif
 
        if (lseek(iFd, oldPos, SEEK_SET) < 0)
 #endif
 
        if (lseek(iFd, oldPos, SEEK_SET) < 0)

-          return _error->Errno("lseek","Unable to seek in gzipped file");
+       {
+         FileFdErrno("lseek","Unable to seek in gzipped file");
+         return 0;
+       }

 
        return size;
    }
 
        return size;
    }


@@ -1381,21 +1674,22 @@ unsigned long long FileFd::Size()
 time_t FileFd::ModificationTime()
 {
    struct stat Buf;
 time_t FileFd::ModificationTime()
 {
    struct stat Buf;

-   if (d->pipe == false && fstat(iFd,&Buf) != 0)
+   if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0)

    {
    {

-      _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str());
+      FileFdErrno("fstat","Unable to determine the modification time of file %s", FileName.c_str());

       return 0;
    }
 
    // for compressor pipes st_size is undefined and at 'best' zero
       return 0;
    }
 
    // for compressor pipes st_size is undefined and at 'best' zero

-   if (d->pipe == true || S_ISFIFO(Buf.st_mode))
+   if ((d != NULL && d->pipe == true) || S_ISFIFO(Buf.st_mode))

    {
       // we set it here, too, as we get the info here for free
       // in theory the Open-methods should take care of it already
    {
       // we set it here, too, as we get the info here for free
       // in theory the Open-methods should take care of it already

-      d->pipe = true;
+      if (d != NULL)
+        d->pipe = true;

       if (stat(FileName.c_str(), &Buf) != 0)
       {
       if (stat(FileName.c_str(), &Buf) != 0)
       {

-        _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str());
+        FileFdErrno("fstat","Unable to determine the modification time of file %s", FileName.c_str());

         return 0;
       }
    }
         return 0;
       }
    }


@@ -1414,19 +1708,18 @@ bool FileFd::Close()
    bool Res = true;
    if ((Flags & AutoClose) == AutoClose)
    {
    bool Res = true;
    if ((Flags & AutoClose) == AutoClose)
    {

-#if APT_USE_ZLIB
-      if (d != NULL && d->gz != NULL) {
-        int const e = gzclose(d->gz);
-        // gzdclose() on empty files always fails with "buffer error" here, ignore that
-        if (e != 0 && e != Z_BUF_ERROR)
-           Res &= _error->Errno("close",_("Problem closing the gzip file %s"), FileName.c_str());
-      } else
-#endif
-        if (iFd > 0 && close(iFd) != 0)
-           Res &= _error->Errno("close",_("Problem closing the file %s"), FileName.c_str());
+      if ((Flags & Compressed) != Compressed && iFd > 0 && close(iFd) != 0)
+        Res &= _error->Errno("close",_("Problem closing the file %s"), FileName.c_str());
+
+      if (d != NULL)
+      {
+        Res &= d->CloseDown(FileName);
+        delete d;
+        d = NULL;
+      }

    }
 
    }
 

-   if ((Flags & Replace) == Replace && iFd >= 0) {
+   if ((Flags & Replace) == Replace) {

       if (rename(TemporaryFileName.c_str(), FileName.c_str()) != 0)
         Res &= _error->Errno("rename",_("Problem renaming the file %s to %s"), TemporaryFileName.c_str(), FileName.c_str());
 
       if (rename(TemporaryFileName.c_str(), FileName.c_str()) != 0)
         Res &= _error->Errno("rename",_("Problem renaming the file %s to %s"), TemporaryFileName.c_str(), FileName.c_str());
 


@@ -1441,14 +1734,8 @@ bool FileFd::Close()
       if (unlink(FileName.c_str()) != 0)
         Res &= _error->WarningE("unlnk",_("Problem unlinking the file %s"), FileName.c_str());
 
       if (unlink(FileName.c_str()) != 0)
         Res &= _error->WarningE("unlnk",_("Problem unlinking the file %s"), FileName.c_str());
 

-   if (d != NULL)
-   {
-      if (d->compressor_pid > 0)
-        ExecWait(d->compressor_pid, "FileFdCompressor", true);
-      delete d;
-      d = NULL;
-   }
-
+   if (Res == false)
+      Flags |= Fail;

    return Res;
 }
                                                                        /*}}}*/
    return Res;
 }
                                                                        /*}}}*/


@@ -1457,12 +1744,72 @@ bool FileFd::Close()
 /* */
 bool FileFd::Sync()
 {
 /* */
 bool FileFd::Sync()
 {

-#ifdef _POSIX_SYNCHRONIZED_IO

    if (fsync(iFd) != 0)
    if (fsync(iFd) != 0)

-      return _error->Errno("sync",_("Problem syncing the file"));
-#endif
+      return FileFdErrno("sync",_("Problem syncing the file"));

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+// FileFd::FileFdErrno - set Fail and call _error->Errno               *{{{*/
+bool FileFd::FileFdErrno(const char *Function, const char *Description,...)
+{
+   Flags |= Fail;
+   va_list args;
+   size_t msgSize = 400;
+   int const errsv = errno;
+   while (true)
+   {
+      va_start(args,Description);
+      if (_error->InsertErrno(GlobalError::ERROR, Function, Description, args, errsv, msgSize) == false)
+        break;
+      va_end(args);
+   }
+   return false;
+}
+                                                                       /*}}}*/
+// FileFd::FileFdError - set Fail and call _error->Error               *{{{*/
+bool FileFd::FileFdError(const char *Description,...) {
+   Flags |= Fail;
+   va_list args;
+   size_t msgSize = 400;
+   while (true)
+   {
+      va_start(args,Description);
+      if (_error->Insert(GlobalError::ERROR, Description, args, msgSize) == false)
+        break;
+      va_end(args);
+   }
+   return false;
+}
+                                                                       /*}}}*/

 
 gzFile FileFd::gzFd() { return (gzFile) d->gz; }
 
 gzFile FileFd::gzFd() { return (gzFile) d->gz; }

+
+
+// Glob - wrapper around "glob()"                                      /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+std::vector<std::string> Glob(std::string const &pattern, int flags)
+{
+   std::vector<std::string> result;
+   glob_t globbuf;
+   int glob_res;
+   unsigned int i;
+
+   glob_res = glob(pattern.c_str(),  flags, NULL, &globbuf);
+
+   if (glob_res != 0)
+   {
+      if(glob_res != GLOB_NOMATCH) {
+         _error->Errno("glob", "Problem with glob");
+         return result;
+      }
+   }
+
+   // append results
+   for(i=0;i<globbuf.gl_pathc;i++)
+      result.push_back(string(globbuf.gl_pathv[i]));
+
+   globfree(&globbuf);
+   return result;
+}
+                                                                       /*}}}*/