summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/contrib/fileutl.cc21
-rw-r--r--apt-pkg/deb/debindexfile.cc22
-rw-r--r--debian/changelog10
3 files changed, 43 insertions, 10 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index eabaadf90..bf07f6008 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -915,8 +915,27 @@ unsigned long FileFd::Tell()
/* */
unsigned long FileFd::Size()
{
- //TODO: For gz, do we need the actual file size here or the uncompressed length?
struct stat Buf;
+ long size;
+ off_t orig_pos;
+
+ if (gz)
+ {
+ /* 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);
+ 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)
+ return _error->Errno("read","Unable to read original size of gzipped file");
+ size &= 0xFFFFFFFF;
+
+ if (lseek(iFd, orig_pos, SEEK_SET) < 0)
+ return _error->Errno("lseek","Unable to seek in gzipped file");
+ return size;
+ }
+
if (fstat(iFd,&Buf) != 0)
return _error->Errno("fstat","Unable to determine the file size");
return Buf.st_size;
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index ba5b3f266..a89a2574f 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -149,10 +149,11 @@ bool debSourcesIndex::Exists() const
/* */
unsigned long debSourcesIndex::Size() const
{
- struct stat S;
- if (stat(IndexFile("Sources").c_str(),&S) != 0)
+ FileFd f = FileFd (IndexFile("Sources"), FileFd::ReadOnlyGzip);
+
+ if (f.Failed())
return 0;
- return S.st_size;
+ return f.Size();
}
/*}}}*/
@@ -268,10 +269,11 @@ bool debPackagesIndex::Exists() const
/* This is really only used for progress reporting. */
unsigned long debPackagesIndex::Size() const
{
- struct stat S;
- if (stat(IndexFile("Packages").c_str(),&S) != 0)
+ FileFd f = FileFd (IndexFile("Packages"), FileFd::ReadOnlyGzip);
+
+ if (f.Failed())
return 0;
- return S.st_size;
+ return f.Size();
}
/*}}}*/
// PackagesIndex::Merge - Load the index file into a cache /*{{{*/
@@ -458,10 +460,12 @@ bool debTranslationsIndex::Exists() const
/* This is really only used for progress reporting. */
unsigned long debTranslationsIndex::Size() const
{
- struct stat S;
- if (stat(IndexFile(Language).c_str(),&S) != 0)
+ FileFd f = FileFd (IndexFile(Language), FileFd::ReadOnlyGzip);
+
+ if (f.Failed())
return 0;
- return S.st_size;
+
+ return f.Size();
}
/*}}}*/
// TranslationsIndex::Merge - Load the index file into a cache /*{{{*/
diff --git a/debian/changelog b/debian/changelog
index 58e6d28bd..3a552d01e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,16 @@ apt (0.8.7) UNRELEASED; urgency=low
- fix issues with dir::state::status and dir::state::extended_states
when alternative rootdirs are used
+ [ Martin Pitt ]
+ * apt-pkg/deb/debindexfile.cc:
+ - Use FileFd::Size() instead of stat()ing the sources/binary/translations
+ indexes directly, so that we have transparent handling of gzipped
+ indexes.
+ * apt-pkg/contrib/fileutl.cc:
+ - Fix FileFd::Size() for gzipped files to give the size of the
+ uncompressed data. This fixes cache progress building progress going way
+ over 100%.
+
-- Christian Perrier <bubulle@debian.org> Tue, 05 Oct 2010 05:35:58 +0200
apt (0.8.6) unstable; urgency=low