X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/18ef0a788491295e833962feb518c276923a0e43..0a64ecd792b4caca519d597a69b8baeda6a1bf77:/methods/gzip.cc?ds=sidebyside diff --git a/methods/gzip.cc b/methods/gzip.cc index f1bf60ce6..fc4e1ecfd 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: gzip.cc,v 1.8 1999/07/30 05:37:00 jgg Exp $ +// $Id: gzip.cc,v 1.17.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### GZip method - Take a file URI in and decompress it into the target @@ -13,12 +13,14 @@ #include #include #include +#include #include #include #include -#include #include +#include +#include /*}}}*/ class GzipMethod : public pkgAcqMethod @@ -27,92 +29,92 @@ class GzipMethod : public pkgAcqMethod public: - GzipMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {}; + GzipMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; }; + // GzipMethod::Fetch - Decompress the passed URI /*{{{*/ // --------------------------------------------------------------------- /* */ bool GzipMethod::Fetch(FetchItem *Itm) { URI Get = Itm->Uri; - + string Path = Get.Host + Get.Path; // To account for relative paths + FetchResult Res; Res.Filename = Itm->DestFile; URIStart(Res); - // Open the source and destintation files - FileFd From(Get.Path,FileFd::ReadOnly); - FileFd To(Itm->DestFile,FileFd::WriteEmpty); + // Open the source and destination files + FileFd From(Path,FileFd::ReadOnlyGzip); + + if(From.FileSize() == 0) + return _error->Error(_("Empty files can't be valid archives")); + + FileFd To(Itm->DestFile,FileFd::WriteAtomic); To.EraseOnFailure(); if (_error->PendingError() == true) return false; - // Fork gzip - int Process = fork(); - if (Process < 0) - return _error->Errno("fork","Couldn't fork gzip"); - - // The child - if (Process == 0) + // Read data from source, generate checksums and write + Hashes Hash; + bool Failed = false; + while (1) { - dup2(From.Fd(),STDIN_FILENO); - dup2(To.Fd(),STDOUT_FILENO); - From.Close(); - To.Close(); - SetCloseExec(STDIN_FILENO,false); - SetCloseExec(STDOUT_FILENO,false); + unsigned char Buffer[4*1024]; + unsigned long Count; - const char *Args[3]; - Args[0] = _config->Find("Dir::bin::gzip","gzip").c_str(); - Args[1] = "-d"; - Args[2] = 0; - execvp(Args[0],(char **)Args); - exit(100); + if (!From.Read(Buffer,sizeof(Buffer),&Count)) + { + To.OpFail(); + return false; + } + if (Count == 0) + break; + + Hash.Add(Buffer,Count); + if (To.Write(Buffer,Count) == false) + { + Failed = true; + break; + } } - From.Close(); - - // Wait for gzip to finish - int Status; - if (waitpid(Process,&Status,0) != Process) - { - To.OpFail(); - return _error->Errno("wait","Waiting for gzip failed"); - } - - if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0) - { - To.OpFail(); - return _error->Error("gzip failed, perhaps the disk is full or the directory permissions are wrong."); - } + From.Close(); To.Close(); + if (Failed == true) + return false; + // Transfer the modification times struct stat Buf; - if (stat(Get.Path.c_str(),&Buf) != 0) - return _error->Errno("stat","Failed to stat"); + if (stat(Path.c_str(),&Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); struct utimbuf TimeBuf; TimeBuf.actime = Buf.st_atime; TimeBuf.modtime = Buf.st_mtime; if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) - return _error->Errno("utime","Failed to set modification time"); + return _error->Errno("utime",_("Failed to set modification time")); if (stat(Itm->DestFile.c_str(),&Buf) != 0) - return _error->Errno("stat","Failed to stat"); + return _error->Errno("stat",_("Failed to stat")); // Return a Done response Res.LastModified = Buf.st_mtime; Res.Size = Buf.st_size; + Res.TakeHashes(Hash); + URIDone(Res); return true; } /*}}}*/ -int main() +int main(int argc, char *argv[]) { + setlocale(LC_ALL, ""); + GzipMethod Mth; return Mth.Run(); }