move fd duplication closer to the gz/bz2 open calls

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

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 464950abd535874b421d462c66f1a18839c548d3..2188f616a43485871ca8e7549beabedd4cfa2358 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -26,16 +26,22 @@
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>

-
+#include <apt-pkg/macros.h>
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <sys/select.h>
+#include <time.h>
+#include <string>
+#include <vector>

 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>

-

 #include <iostream>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <iostream>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>

-#include <sys/types.h>

 #include <sys/time.h>
 #include <sys/wait.h>
 #include <dirent.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <dirent.h>


@@ -1061,30 +1067,12 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration:
 {
    Close();
    Flags = (AutoClose) ? FileFd::AutoClose : 0;
 {
    Close();
    Flags = (AutoClose) ? FileFd::AutoClose : 0;

-   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;
+   iFd = Fd;

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

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

    {
       if (iFd != -1 && (
    {
       if (iFd != -1 && (

-#ifdef HAVE_ZLIB
-       compressor.Name == "gzip" ||
-#endif
-#ifdef HAVE_BZ2
-       compressor.Name == "bzip2" ||
-#endif
+       (Flags & Compressed) == Compressed ||

        AutoClose == true))
       {
         close (iFd);
        AutoClose == true))
       {
         close (iFd);


@@ -1096,6 +1084,8 @@ 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)
 {

+   if (iFd == -1)
+      return false;

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


@@ -1104,6 +1094,21 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C
       d = new FileFdPrivate();
       d->openmode = Mode;
       d->compressor = compressor;
       d = new FileFdPrivate();
       d->openmode = Mode;
       d->compressor = compressor;

+      if (AutoClose == false && (
+#ifdef HAVE_ZLIB
+              compressor.Name == "gzip" ||
+#endif
+#ifdef HAVE_BZ2
+              compressor.Name == "bzip2" ||
+#endif
+              false))
+      {
+        // Need to duplicate fd here or gz/bz2 close for cleanup will close the fd as well
+        int const internFd = dup(iFd);
+        if (internFd == -1)
+           return FileFdErrno("OpenInternDescriptor", _("Could not open file descriptor %d"), iFd);
+        iFd = internFd;
+      }

    }
 
 #ifdef HAVE_ZLIB
    }
 
 #ifdef HAVE_ZLIB