diff options
| author | Martin Pitt <martin@piware.de> | 2010-10-13 13:00:49 +0200 |
|---|---|---|
| committer | Martin Pitt <martin@piware.de> | 2010-10-13 13:00:49 +0200 |
| commit | 9c182afa045dc889a5025d166328c6115924d706 (patch) | |
| tree | 87dcb5dce121c3dc09c60684b1247b29b82cc632 | |
| parent | 5473df3fec08eaea6e84b98551cc247e87f4b6df (diff) | |
| download | apt-9c182afa045dc889a5025d166328c6115924d706.tar.gz | |
* 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%.
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 21 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 24 insertions, 1 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index eabaadf9..bf07f600 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/debian/changelog b/debian/changelog index ad6d05cf..f1737a5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ apt (0.8.7) UNRELEASED; urgency=low - 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 |