From 4260fd3972cc0c01e6cbc825063c06311d440f9b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 21 Oct 2010 16:54:28 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - Add a FileFd::FileSize() method to get the size of the underlying file and not the size of the content in the file as FileFd::Size() does - the sizes can differ since the direct gzip integration * methods/{gzip,bzip2}.cc: - use FileSize() to determine if the file is invalid (Closes: #600852) --- methods/bzip2.cc | 2 +- methods/gzip.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'methods') diff --git a/methods/bzip2.cc b/methods/bzip2.cc index c668141a2..ccc3669a2 100644 --- a/methods/bzip2.cc +++ b/methods/bzip2.cc @@ -57,7 +57,7 @@ bool Bzip2Method::Fetch(FetchItem *Itm) FileFd From(Path,FileFd::ReadOnly); // FIXME add an error message saying that empty files can't be valid archives - if(From.Size() == 0) + if(From.FileSize() == 0) return false; int GzOut[2]; diff --git a/methods/gzip.cc b/methods/gzip.cc index 22cae9424..f1c76066e 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -49,7 +49,7 @@ bool GzipMethod::Fetch(FetchItem *Itm) FileFd From(Path,FileFd::ReadOnlyGzip); // FIXME add an error message saying that empty files can't be valid archives - if(From.Size() == 0) + if(From.FileSize() == 0) return false; FileFd To(Itm->DestFile,FileFd::WriteAtomic); -- cgit v1.2.3