fix calling style of FileFd (no functional change)

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

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 1808489d7d276cc47c23afdde3589e0301c3fed8..7a24b6bb0f23e31a29284536eb27ea5121c47849 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -44,14 +44,11 @@
 #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 +62,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,7 +78,8 @@ 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) {};
 };
 


@@ -835,7 +838,6 @@ bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress,
    if (Compress == Auto && (Mode & WriteOnly) == WriteOnly)
       return _error->Error("Autodetection on %s only works in ReadOnly openmode!", FileName.c_str());
 
    if (Compress == Auto && (Mode & WriteOnly) == WriteOnly)
       return _error->Error("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)


@@ -903,8 +905,6 @@ bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress,
 bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor, unsigned long const Perms)
 {
    Close();
 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)


@@ -998,8 +998,6 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compre
 bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose)
 {
    Close();
 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;
    iFd = Fd;
    this->FileName = "";
    Flags = (AutoClose) ? FileFd::AutoClose : 0;
    iFd = Fd;
    this->FileName = "";


@@ -1013,32 +1011,69 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration:
 }
 bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor)
 {
 }
 bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor)
 {

-   d->compressor = compressor;
+   if (d == NULL)
+   {
+      d = new FileFdPrivate();
+      d->openmode = Mode;
+      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
+#ifdef HAVE_ZLIB

    else if (compressor.Name == "gzip")
    {
    else 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
+   else 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)

+   {
+      Flags |= Fail;

       return _error->Error("ReadWrite mode is not supported for file %s", FileName.c_str());
       return _error->Error("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)


@@ -1047,13 +1082,19 @@ 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)

+   {
+      Flags |= Fail;

       return _error->Errno("pipe",_("Failed to create subprocess IPC"));
       return _error->Errno("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);
 


@@ -1080,6 +1121,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);


@@ -1109,7 +1156,7 @@ 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)
+   if ((Comp == true || FileName.empty() == true) && d->compressed_fd != -1)

       close(d->compressed_fd);
 
    return true;
       close(d->compressed_fd);
 
    return true;


@@ -1137,9 +1184,14 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
    *((char *)To) = '\0';
    do
    {
    *((char *)To) = '\0';
    do
    {

-#if APT_USE_ZLIB
+#ifdef HAVE_ZLIB

       if (d->gz != NULL)
       if (d->gz != NULL)

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

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


@@ -1149,7 +1201,7 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
         if (errno == EINTR)
            continue;
         Flags |= Fail;
         if (errno == EINTR)
            continue;
         Flags |= Fail;

-#if APT_USE_ZLIB
+#ifdef HAVE_ZLIB

         if (d->gz != NULL)
         {
            int err;
         if (d->gz != NULL)
         {
            int err;


@@ -1157,6 +1209,15 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
            if (err != Z_ERRNO)
               return _error->Error("gzread: %s (%d: %s)", _("Read error"), err, errmsg);
         }
            if (err != Z_ERRNO)
               return _error->Error("gzread: %s (%d: %s)", _("Read error"), err, errmsg);
         }

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

 #endif
         return _error->Errno("read",_("Read error"));
       }
 #endif
         return _error->Errno("read",_("Read error"));
       }


@@ -1190,7 +1251,7 @@ 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
+#ifdef HAVE_ZLIB

    if (d->gz != NULL)
       return gzgets(d->gz, To, Size);
 #endif
    if (d->gz != NULL)
       return gzgets(d->gz, To, Size);
 #endif


@@ -1221,10 +1282,15 @@ bool FileFd::Write(const void *From,unsigned long long Size)
    errno = 0;
    do
    {
    errno = 0;
    do
    {

-#if APT_USE_ZLIB
+#ifdef HAVE_ZLIB

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

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

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


@@ -1232,6 +1298,24 @@ bool FileFd::Write(const void *From,unsigned long long Size)
       if (Res < 0)
       {
         Flags |= Fail;
       if (Res < 0)
       {
         Flags |= Fail;

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

         return _error->Errno("write",_("Write error"));
       }
       
         return _error->Errno("write",_("Write error"));
       }
       


@@ -1246,6 +1330,28 @@ bool FileFd::Write(const void *From,unsigned long long Size)
    
    Flags |= Fail;
    return _error->Error(_("write, still have %llu to write but couldn't"), Size);
    
    Flags |= Fail;
    return _error->Error(_("write, still have %llu to write but couldn't"), Size);

+}
+bool FileFd::Write(int Fd, const void *From, unsigned long long Size)
+{
+   int 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);

 }
                                                                        /*}}}*/
 // FileFd::Seek - Seek in the file                                     /*{{{*/
 }
                                                                        /*}}}*/
 // FileFd::Seek - Seek in the file                                     /*{{{*/


@@ -1253,7 +1359,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->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();


@@ -1263,9 +1373,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)

+      {
+        Flags |= Fail;

         return _error->Error("Reopen is only implemented for read-only files!");
         return _error->Error("Reopen is only implemented for read-only files!");

-      close(iFd);
-      iFd = 0;
+      }
+#ifdef HAVE_BZ2
+      if (d->bz2 != NULL)
+        BZ2_bzclose(d->bz2);
+#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)


@@ -1276,11 +1394,17 @@ bool FileFd::Seek(unsigned long long To)
            if (lseek(d->compressed_fd, 0, SEEK_SET) != 0)
               iFd = d->compressed_fd;
         if (iFd <= 0)
            if (lseek(d->compressed_fd, 0, SEEK_SET) != 0)
               iFd = d->compressed_fd;
         if (iFd <= 0)

+        {
+           Flags |= Fail;

            return _error->Error("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!");
            return _error->Error("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!");

+        }

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

+      {
+        Flags |= Fail;

         return _error->Error("Seek on file %s because it couldn't be reopened", FileName.c_str());
         return _error->Error("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);


@@ -1289,7 +1413,7 @@ bool FileFd::Seek(unsigned long long To)
       return true;
    }
    int res;
       return true;
    }
    int res;

-#if APT_USE_ZLIB
+#ifdef HAVE_ZLIB

    if (d->gz)
       res = gzseek(d->gz,To,SEEK_SET);
    else
    if (d->gz)
       res = gzseek(d->gz,To,SEEK_SET);
    else


@@ -1310,7 +1434,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->pipe == true
+#ifdef HAVE_BZ2
+       || d->bz2 != NULL
+#endif
+       )

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


@@ -1318,14 +1446,17 @@ 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)

+        {
+           Flags |= Fail;

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

+        }

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

-#if APT_USE_ZLIB
+#ifdef HAVE_ZLIB

    if (d->gz != NULL)
       res = gzseek(d->gz,Over,SEEK_CUR);
    else
    if (d->gz != NULL)
       res = gzseek(d->gz,Over,SEEK_CUR);
    else


@@ -1346,11 +1477,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)
+#if defined HAVE_ZLIB || defined HAVE_BZ2
+   if (d->gz != NULL || d->bz2 != NULL)

    {
       Flags |= Fail;
    {
       Flags |= Fail;

-      return _error->Error("Truncating gzipped files is not implemented (%s)", FileName.c_str());
+      return _error->Error("Truncating compressed files is not implemented (%s)", FileName.c_str());

    }
    }

+#endif

    if (ftruncate(iFd,To) != 0)
    {
       Flags |= Fail;
    if (ftruncate(iFd,To) != 0)
    {
       Flags |= Fail;


@@ -1369,18 +1502,25 @@ 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->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
+#ifdef HAVE_ZLIB

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

+   {
+      Flags |= Fail;

       _error->Errno("lseek","Failed to determine the current file position");
       _error->Errno("lseek","Failed to determine the current file position");

+   }

    d->seekpos = Res;
    return Res;
 }
    d->seekpos = Res;
    return Res;
 }


@@ -1392,7 +1532,10 @@ unsigned long long FileFd::FileSize()
 {
    struct stat Buf;
    if (d->pipe == false && fstat(iFd,&Buf) != 0)
 {
    struct stat Buf;
    if (d->pipe == false && fstat(iFd,&Buf) != 0)

+   {
+      Flags |= Fail;

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

+   }

 
    // for compressor pipes st_size is undefined and at 'best' zero
    if (d->pipe == true || S_ISFIFO(Buf.st_mode))
 
    // for compressor pipes st_size is undefined and at 'best' zero
    if (d->pipe == true || S_ISFIFO(Buf.st_mode))


@@ -1401,7 +1544,10 @@ unsigned long long FileFd::FileSize()
       // in theory the Open-methods should take care of it already
       d->pipe = true;
       if (stat(FileName.c_str(), &Buf) != 0)
       // in theory the Open-methods should take care of it already
       d->pipe = true;
       if (stat(FileName.c_str(), &Buf) != 0)

+      {
+        Flags |= Fail;

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

+      }

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


@@ -1416,7 +1562,11 @@ 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->pipe == true
+#ifdef HAVE_BZ2
+       || (d->bz2 && size > 0)
+#endif
+       )

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


@@ -1427,7 +1577,7 @@ unsigned long long FileFd::Size()
       size = Tell();
       Seek(oldSeek);
    }
       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


@@ -1439,10 +1589,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");
+       {
+         Flags |= Fail;
+         return _error->Errno("lseek","Unable to seek to end of gzipped file");
+       }

        size = 0L;
        if (read(iFd, &size, 4) != 4)
        size = 0L;
        if (read(iFd, &size, 4) != 4)

-          return _error->Errno("read","Unable to read original size of gzipped file");
+       {
+         Flags |= Fail;
+         return _error->Errno("read","Unable to read original size of gzipped file");
+       }

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


@@ -1452,7 +1608,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");
+       {
+         Flags |= Fail;
+         return _error->Errno("lseek","Unable to seek in gzipped file");
+       }

 
        return size;
    }
 
        return size;
    }


@@ -1469,6 +1628,7 @@ time_t FileFd::ModificationTime()
    struct stat Buf;
    if (d->pipe == false && fstat(iFd,&Buf) != 0)
    {
    struct stat Buf;
    if (d->pipe == false && fstat(iFd,&Buf) != 0)
    {

+      Flags |= Fail;

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


@@ -1481,6 +1641,7 @@ time_t FileFd::ModificationTime()
       d->pipe = true;
       if (stat(FileName.c_str(), &Buf) != 0)
       {
       d->pipe = true;
       if (stat(FileName.c_str(), &Buf) != 0)
       {

+        Flags |= Fail;

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


@@ -1500,13 +1661,18 @@ bool FileFd::Close()
    bool Res = true;
    if ((Flags & AutoClose) == AutoClose)
    {
    bool Res = true;
    if ((Flags & AutoClose) == AutoClose)
    {

-#if APT_USE_ZLIB
+#ifdef HAVE_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
       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
+#ifdef HAVE_BZ2
+      if (d != NULL && d->bz2 != NULL)
+        BZ2_bzclose(d->bz2);
+      else

 #endif
         if (iFd > 0 && close(iFd) != 0)
            Res &= _error->Errno("close",_("Problem closing the file %s"), FileName.c_str());
 #endif
         if (iFd > 0 && close(iFd) != 0)
            Res &= _error->Errno("close",_("Problem closing the file %s"), FileName.c_str());


@@ -1535,6 +1701,8 @@ bool FileFd::Close()
       d = NULL;
    }
 
       d = NULL;
    }
 

+   if (Res == false)
+      Flags |= Fail;

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


@@ -1545,7 +1713,10 @@ bool FileFd::Sync()
 {
 #ifdef _POSIX_SYNCHRONIZED_IO
    if (fsync(iFd) != 0)
 {
 #ifdef _POSIX_SYNCHRONIZED_IO
    if (fsync(iFd) != 0)

+   {
+      Flags |= Fail;

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

+   }

 #endif
    return true;
 }
 #endif
    return true;
 }