merged lp:~mvo/apt/apt-get-changelog

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

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index bf07f600838b9a1a95fffde93c037b3812e569c8..f4ab066d744424dcb4bc34d8b465b1947b16670f 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -910,21 +910,34 @@ unsigned long FileFd::Tell()
    return Res;
 }
                                                                        /*}}}*/
-// FileFd::Size - Return the size of the file                          /*{{{*/
+// FileFd::FileSize - Return the size of the file                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-unsigned long FileFd::Size()
+unsigned long FileFd::FileSize()
 {
    struct stat Buf;
-   long size;
-   off_t orig_pos;
 
-   if (gz)
+   if (fstat(iFd,&Buf) != 0)
+      return _error->Errno("fstat","Unable to determine the file size");
+   return Buf.st_size;
+}
+                                                                       /*}}}*/
+// FileFd::Size - Return the size of the content in the file           /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+unsigned long FileFd::Size()
+{
+   unsigned long size = FileSize();
+
+   // only check gzsize if we are actually a gzip file, just checking for
+   // "gz" is not sufficient as uncompressed files will be opened with
+   // gzopen in "direct" mode as well
+   if (gz && !gzdirect(gz) && size > 0)
    {
        /* 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 */
-       orig_pos = lseek(iFd, 0, SEEK_CUR);
+       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");
        if (read(iFd, &size, 4) != 4)
@@ -936,9 +949,7 @@ unsigned long FileFd::Size()
        return size;
    }
 
-   if (fstat(iFd,&Buf) != 0)
-      return _error->Errno("fstat","Unable to determine the file size");
-   return Buf.st_size;
+   return size;
 }
                                                                        /*}}}*/
 // FileFd::Close - Close the file if the close flag is set             /*{{{*/