* apt-pkg/contrib/fileutl.h:

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

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 44486905f8a204a9012c9c8b9435e5318031acd3..28898fc34820834aaf6f76900021f6a680e657ba 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -75,7 +75,9 @@ class FileFdPrivate {
        bool pipe;
        APT::Configuration::Compressor compressor;
        unsigned int openmode;
        bool pipe;
        APT::Configuration::Compressor compressor;
        unsigned int openmode;

-       FileFdPrivate() : gz(NULL), compressed_fd(-1), compressor_pid(-1), pipe(false) {};
+       unsigned long long seekpos;
+       FileFdPrivate() : gz(NULL), compressed_fd(-1), compressor_pid(-1), pipe(false),
+                         openmode(0), seekpos(0) {};

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


@@ -865,6 +867,7 @@ bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Co
    else
       iFd = open(FileName.c_str(), fileflags, Perms);
 
    else
       iFd = open(FileName.c_str(), fileflags, Perms);
 

+   this->FileName = FileName;

    if (iFd == -1 || OpenInternDescriptor(Mode, compressor) == false)
    {
       if (iFd != -1)
    if (iFd == -1 || OpenInternDescriptor(Mode, compressor) == false)
    {
       if (iFd != -1)


@@ -875,7 +878,6 @@ bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Co
       return _error->Errno("open",_("Could not open file %s"), FileName.c_str());
    }
 
       return _error->Errno("open",_("Could not open file %s"), FileName.c_str());
    }
 

-   this->FileName = FileName;

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


@@ -914,13 +916,13 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration:
    d->openmode = Mode;
    Flags = (AutoClose) ? FileFd::AutoClose : 0;
    iFd = Fd;
    d->openmode = Mode;
    Flags = (AutoClose) ? FileFd::AutoClose : 0;
    iFd = Fd;

+   this->FileName = "";

    if (OpenInternDescriptor(Mode, compressor) == false)
    {
       if (AutoClose)
         close (iFd);
       return _error->Errno("gzdopen",_("Could not open file descriptor %d"), Fd);
    }
    if (OpenInternDescriptor(Mode, compressor) == false)
    {
       if (AutoClose)
         close (iFd);
       return _error->Errno("gzdopen",_("Could not open file descriptor %d"), Fd);
    }

-   this->FileName = "";

    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)


@@ -1055,16 +1057,27 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
       else
 #endif
          Res = read(iFd,To,Size);
       else
 #endif
          Res = read(iFd,To,Size);

-      if (Res < 0 && errno == EINTR)
-        continue;
+

       if (Res < 0)
       {
       if (Res < 0)
       {

+        if (errno == EINTR)
+           continue;

         Flags |= Fail;
         Flags |= Fail;

+#if APT_USE_ZLIB
+        if (d->gz != NULL)
+        {
+           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);
+        }
+#endif

         return _error->Errno("read",_("Read error"));
       }
       
       To = (char *)To + Res;
       Size -= Res;
         return _error->Errno("read",_("Read error"));
       }
       
       To = (char *)To + Res;
       Size -= Res;

+      d->seekpos += Res;

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


@@ -1097,15 +1110,19 @@ char* FileFd::ReadLine(char *To, unsigned long long const Size)
 #endif
 
    unsigned long long read = 0;
 #endif
 
    unsigned long long read = 0;

-   if (Read(To, Size, &read) == false)
+   while ((Size - 1) != read)
+   {
+      unsigned long long done = 0;
+      if (Read(To + read, 1, &done) == false)
+        return NULL;
+      if (done == 0)
+        break;
+      if (To[read++] == '\n')
+        break;
+   }
+   if (read == 0)

       return NULL;
       return NULL;

-   char* c = To;
-   for (; *c != '\n' && *c != '\0' && read != 0; --read, ++c)
-      ; // find the end of the line
-   if (*c != '\0')
-      *c = '\0';
-   if (read != 0)
-      Seek(Tell() - read);
+   To[read] = '\0';

    return To;
 }
                                                                        /*}}}*/
    return To;
 }
                                                                        /*}}}*/


@@ -1134,6 +1151,7 @@ bool FileFd::Write(const void *From,unsigned long long Size)
       
       From = (char *)From + Res;
       Size -= Res;
       
       From = (char *)From + Res;
       Size -= Res;

+      d->seekpos += Res;

    }
    while (Res > 0 && Size > 0);
    
    }
    while (Res > 0 && Size > 0);
    


@@ -1151,21 +1169,37 @@ bool FileFd::Seek(unsigned long long To)
 {
    if (d->pipe == true)
    {
 {
    if (d->pipe == true)
    {

+      // Our poor man seeking in pipes is costly, so try to avoid it
+      unsigned long long seekpos = Tell();
+      if (seekpos == To)
+        return true;
+      else if (seekpos < To)
+        return Skip(To - seekpos);
+

       if ((d->openmode & ReadOnly) != ReadOnly)
         return _error->Error("Reopen is only implemented for read-only files!");
       close(iFd);
       if ((d->openmode & ReadOnly) != ReadOnly)
         return _error->Error("Reopen is only implemented for read-only files!");
       close(iFd);

+      iFd = 0;

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

-        return _error->Error("Reopen is not implemented for OpenDescriptor()-FileFd!");
+      {
+        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 (OpenInternDescriptor(d->openmode, d->compressor) == false)
         return _error->Error("Seek on file %s because it couldn't be reopened", FileName.c_str());
 
       if (To != 0)
         return Skip(To);
 
       if (OpenInternDescriptor(d->openmode, d->compressor) == false)
         return _error->Error("Seek on file %s because it couldn't be reopened", FileName.c_str());
 
       if (To != 0)
         return Skip(To);

+
+      d->seekpos = To;

       return true;
    }
    int res;
       return true;
    }
    int res;


@@ -1180,7 +1214,8 @@ bool FileFd::Seek(unsigned long long To)
       Flags |= Fail;
       return _error->Error("Unable to seek to %llu", To);
    }
       Flags |= Fail;
       return _error->Error("Unable to seek to %llu", To);
    }

-   
+
+   d->seekpos = To;

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


@@ -1189,6 +1224,20 @@ 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)
+   {
+      d->seekpos += Over;
+      char buffer[1024];
+      while (Over != 0)
+      {
+        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);
+        Over -= toread;
+      }
+      return true;
+   }
+

    int res;
 #if APT_USE_ZLIB
    if (d->gz != NULL)
    int res;
 #if APT_USE_ZLIB
    if (d->gz != NULL)


@@ -1201,7 +1250,8 @@ bool FileFd::Skip(unsigned long long Over)
       Flags |= Fail;
       return _error->Error("Unable to seek ahead %llu",Over);
    }
       Flags |= Fail;
       return _error->Error("Unable to seek ahead %llu",Over);
    }

-   
+   d->seekpos = res;
+

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


@@ -1229,6 +1279,13 @@ bool FileFd::Truncate(unsigned long long To)
 /* */
 unsigned long long FileFd::Tell()
 {
 /* */
 unsigned long long FileFd::Tell()
 {

+   // In theory, we could just return seekpos here always instead of
+   // 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)
+      return d->seekpos;
+

    off_t Res;
 #if APT_USE_ZLIB
    if (d->gz != NULL)
    off_t Res;
 #if APT_USE_ZLIB
    if (d->gz != NULL)


@@ -1238,6 +1295,7 @@ unsigned long long FileFd::Tell()
      Res = lseek(iFd,0,SEEK_CUR);
    if (Res == (off_t)-1)
       _error->Errno("lseek","Failed to determine the current file position");
      Res = lseek(iFd,0,SEEK_CUR);
    if (Res == (off_t)-1)
       _error->Errno("lseek","Failed to determine the current file position");

+   d->seekpos = Res;

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


@@ -1274,15 +1332,14 @@ unsigned long long FileFd::Size()
    // so we 'read' the content and 'seek' back - see there
    if (d->pipe == true)
    {
    // so we 'read' the content and 'seek' back - see there
    if (d->pipe == true)
    {

-      // FIXME: If we have read first and then FileSize() the report is wrong
-      size = 0;
+      unsigned long long const oldSeek = Tell();

       char ignore[1000];
       unsigned long long read = 0;
       do {
         Read(ignore, sizeof(ignore), &read);
       char ignore[1000];
       unsigned long long read = 0;
       do {
         Read(ignore, sizeof(ignore), &read);

-        size += read;

       } while(read != 0);
       } while(read != 0);

-      Seek(0);
+      size = Tell();
+      Seek(oldSeek);

    }
 #if APT_USE_ZLIB
    // only check gzsize if we are actually a gzip file, just checking for
    }
 #if APT_USE_ZLIB
    // only check gzsize if we are actually a gzip file, just checking for


@@ -1290,11 +1347,11 @@ unsigned long long FileFd::Size()
    // gzopen in "direct" mode as well
    else if (d->gz && !gzdirect(d->gz) && size > 0)
    {
    // gzopen in "direct" mode as well
    else if (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
        * this ourselves; the original (uncompressed) file size is the last 32
        * bits of the file */
        // FIXME: Size for gz-files is limited by 32bit… no largefile support
        /* unfortunately zlib.h doesn't provide a gzsize(), so we have to do
        * this ourselves; the original (uncompressed) file size is the last 32
        * bits of the file */
        // FIXME: Size for gz-files is limited by 32bit… no largefile support

-       off_t orig_pos = lseek(iFd, 0, SEEK_CUR);

        if (lseek(iFd, -4, SEEK_END) < 0)
           return _error->Errno("lseek","Unable to seek to end of gzipped file");
        size = 0L;
        if (lseek(iFd, -4, SEEK_END) < 0)
           return _error->Errno("lseek","Unable to seek to end of gzipped file");
        size = 0L;


@@ -1308,8 +1365,9 @@ unsigned long long FileFd::Size()
        size = tmp_size;
 #endif
 
        size = tmp_size;
 #endif
 

-       if (lseek(iFd, orig_pos, SEEK_SET) < 0)
+       if (lseek(iFd, oldPos, SEEK_SET) < 0)

           return _error->Errno("lseek","Unable to seek in gzipped file");
           return _error->Errno("lseek","Unable to seek in gzipped file");

+

        return size;
    }
 #endif
        return size;
    }
 #endif


@@ -1359,7 +1417,7 @@ bool FileFd::Close()
 #if APT_USE_ZLIB
       if (d != NULL && d->gz != NULL) {
         int const e = gzclose(d->gz);
 #if APT_USE_ZLIB
       if (d != NULL && d->gz != NULL) {
         int const e = gzclose(d->gz);

-        // gzdopen() on empty files always fails with "buffer error" here, ignore that
+        // 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 (e != 0 && e != Z_BUF_ERROR)
            Res &= _error->Errno("close",_("Problem closing the gzip file %s"), FileName.c_str());
       } else