X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/8877870768f3525ae72dc13a438100e90260f4e2..4f8f5e3d8de21d578c6acd46896fcf62447a7cfd:/methods/gzip.cc diff --git a/methods/gzip.cc b/methods/gzip.cc index 22cae9424..6ab6548ef 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -9,6 +9,8 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include + #include #include #include @@ -39,18 +41,17 @@ class GzipMethod : public pkgAcqMethod bool GzipMethod::Fetch(FetchItem *Itm) { URI Get = Itm->Uri; - string Path = Get.Host + Get.Path; // To account for relative paths + std::string Path = Get.Host + Get.Path; // To account for relative paths FetchResult Res; Res.Filename = Itm->DestFile; URIStart(Res); // Open the source and destination files - FileFd From(Path,FileFd::ReadOnlyGzip); + FileFd From(Path,FileFd::ReadOnly, FileFd::Gzip); - // FIXME add an error message saying that empty files can't be valid archives - if(From.Size() == 0) - return false; + if(From.FileSize() == 0) + return _error->Error(_("Empty files can't be valid archives")); FileFd To(Itm->DestFile,FileFd::WriteAtomic); To.EraseOnFailure(); @@ -63,7 +64,7 @@ bool GzipMethod::Fetch(FetchItem *Itm) while (1) { unsigned char Buffer[4*1024]; - unsigned long Count; + unsigned long long Count = 0; if (!From.Read(Buffer,sizeof(Buffer),&Count)) {