X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/c511c5e8ed3f59ddee1b174b39e5cc16a2f11922..2906182db398419a9c59a928b7ae73cf7c7aa307:/methods/copy.cc?ds=sidebyside diff --git a/methods/copy.cc b/methods/copy.cc index b78053d36..810fc2f38 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -13,10 +13,10 @@ #include #include -#include #include #include #include +#include "aptmethod.h" #include #include @@ -25,30 +25,14 @@ #include /*}}}*/ -class CopyMethod : public pkgAcqMethod +class CopyMethod : public aptMethod { - virtual bool Fetch(FetchItem *Itm); - void CalculateHashes(FetchResult &Res); - + virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE; + public: - - CopyMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {}; -}; -void CopyMethod::CalculateHashes(FetchResult &Res) -{ - // For gzip indexes we need to look inside the gzip for the hash - // We can not use the extension here as its not used in partial - // on a IMS hit - FileFd::OpenMode OpenMode = FileFd::ReadOnly; - if (_config->FindB("Acquire::GzipIndexes", false) == true) - OpenMode = FileFd::ReadOnlyGzip; - - Hashes Hash; - FileFd Fd(Res.Filename, OpenMode); - Hash.AddFD(Fd); - Res.TakeHashes(Hash); -} + CopyMethod() : aptMethod("copy", "1.0",SingleInstance | SendConfig) {}; +}; // CopyMethod::Fetch - Fetch a file /*{{{*/ // --------------------------------------------------------------------- @@ -56,7 +40,7 @@ void CopyMethod::CalculateHashes(FetchResult &Res) bool CopyMethod::Fetch(FetchItem *Itm) { // this ensures that relative paths work in copy - std::string File = Itm->Uri.substr(Itm->Uri.find(':')+1); + std::string const File = Itm->Uri.substr(Itm->Uri.find(':')+1); // Stat the file and send a start message struct stat Buf; @@ -68,13 +52,13 @@ bool CopyMethod::Fetch(FetchItem *Itm) Res.Size = Buf.st_size; Res.Filename = Itm->DestFile; Res.LastModified = Buf.st_mtime; - Res.IMSHit = false; + Res.IMSHit = false; URIStart(Res); - + // just calc the hashes if the source and destination are identical - if (File == Itm->DestFile) + if (File == Itm->DestFile || Itm->DestFile == "/dev/null") { - CalculateHashes(Res); + CalculateHashes(Itm, Res); URIDone(Res); return true; } @@ -83,12 +67,7 @@ bool CopyMethod::Fetch(FetchItem *Itm) FileFd From(File,FileFd::ReadOnly); FileFd To(Itm->DestFile,FileFd::WriteAtomic); To.EraseOnFailure(); - if (_error->PendingError() == true) - { - To.OpFail(); - return false; - } - + // Copy the file if (CopyFile(From,To) == false) { @@ -99,16 +78,10 @@ bool CopyMethod::Fetch(FetchItem *Itm) From.Close(); To.Close(); - // Transfer the modification times - struct timeval times[2]; - times[0].tv_sec = Buf.st_atime; - times[1].tv_sec = Buf.st_mtime; - times[0].tv_usec = times[1].tv_usec = 0; - if (utimes(Res.Filename.c_str(), times) != 0) - return _error->Errno("utimes",_("Failed to set modification time")); - - CalculateHashes(Res); + if (TransferModificationTimes(File.c_str(), Res.Filename.c_str(), Res.LastModified) == false) + return false; + CalculateHashes(Itm, Res); URIDone(Res); return true; } @@ -116,8 +89,5 @@ bool CopyMethod::Fetch(FetchItem *Itm) int main() { - setlocale(LC_ALL, ""); - - CopyMethod Mth; - return Mth.Run(); + return CopyMethod().Run(); }