X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/472ff00ef2e48383805d281c6364ec27839e3f4d..2906182db398419a9c59a928b7ae73cf7c7aa307:/methods/copy.cc?ds=inline diff --git a/methods/copy.cc b/methods/copy.cc index f8d58e479..810fc2f38 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -13,23 +13,25 @@ #include #include -#include #include #include +#include +#include "aptmethod.h" +#include #include -#include -#include +#include + #include /*}}}*/ -class CopyMethod : public pkgAcqMethod +class CopyMethod : public aptMethod { - virtual bool Fetch(FetchItem *Itm); - + virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE; + public: - - CopyMethod() : pkgAcqMethod("1.0",SingleInstance) {}; + + CopyMethod() : aptMethod("copy", "1.0",SingleInstance | SendConfig) {}; }; // CopyMethod::Fetch - Fetch a file /*{{{*/ @@ -37,8 +39,8 @@ class CopyMethod : public pkgAcqMethod /* */ bool CopyMethod::Fetch(FetchItem *Itm) { - URI Get = Itm->Uri; - std::string File = Get.Path; + // this ensures that relative paths work in copy + std::string const File = Itm->Uri.substr(Itm->Uri.find(':')+1); // Stat the file and send a start message struct stat Buf; @@ -50,19 +52,22 @@ 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 || Itm->DestFile == "/dev/null") + { + CalculateHashes(Itm, Res); + URIDone(Res); + return true; + } + // See if the file exists 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) { @@ -72,22 +77,11 @@ bool CopyMethod::Fetch(FetchItem *Itm) From.Close(); To.Close(); - - // Transfer the modification times - struct utimbuf TimeBuf; - TimeBuf.actime = Buf.st_atime; - TimeBuf.modtime = Buf.st_mtime; - if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) - { - To.OpFail(); - return _error->Errno("utime",_("Failed to set modification time")); - } - - Hashes Hash; - FileFd Fd(Res.Filename, FileFd::ReadOnly); - Hash.AddFD(Fd.Fd(), Fd.Size()); - Res.TakeHashes(Hash); + if (TransferModificationTimes(File.c_str(), Res.Filename.c_str(), Res.LastModified) == false) + return false; + + CalculateHashes(Itm, Res); URIDone(Res); return true; } @@ -95,8 +89,5 @@ bool CopyMethod::Fetch(FetchItem *Itm) int main() { - setlocale(LC_ALL, ""); - - CopyMethod Mth; - return Mth.Run(); + return CopyMethod().Run(); }