X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e43312cf4e19bd3eab15a4f43a586e2ab28c9763..bdc00df54d97c2825ce37dd1c249f633f199a80b:/methods/copy.cc diff --git a/methods/copy.cc b/methods/copy.cc index 8dd0bd3f5..3883c822b 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -9,34 +9,54 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include <config.h> + #include <apt-pkg/fileutl.h> +#include <apt-pkg/strutl.h> #include <apt-pkg/acquire-method.h> #include <apt-pkg/error.h> #include <apt-pkg/hashes.h> -#include <apt-pkg/fileutl.h> +#include <apt-pkg/configuration.h> +#include <string> #include <sys/stat.h> -#include <utime.h> -#include <unistd.h> +#include <sys/time.h> + #include <apti18n.h> /*}}}*/ class CopyMethod : public pkgAcqMethod { virtual bool Fetch(FetchItem *Itm); + void CalculateHashes(FetchResult &Res); public: - CopyMethod() : pkgAcqMethod("1.0",SingleInstance) {}; + 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::Fetch - Fetch a file /*{{{*/ // --------------------------------------------------------------------- /* */ bool CopyMethod::Fetch(FetchItem *Itm) { - URI Get = Itm->Uri; - string File = Get.Path; + // this ensures that relative paths work in copy + std::string File = Itm->Uri.substr(Itm->Uri.find(':')+1); // Stat the file and send a start message struct stat Buf; @@ -51,9 +71,17 @@ bool CopyMethod::Fetch(FetchItem *Itm) Res.IMSHit = false; URIStart(Res); + // just calc the hashes if the source and destination are identical + if (File == Itm->DestFile) + { + CalculateHashes(Res); + URIDone(Res); + return true; + } + // See if the file exists FileFd From(File,FileFd::ReadOnly); - FileFd To(Itm->DestFile,FileFd::WriteEmpty); + FileFd To(Itm->DestFile,FileFd::WriteAtomic); To.EraseOnFailure(); if (_error->PendingError() == true) { @@ -70,21 +98,17 @@ 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")); - } + 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); - Hashes Hash; - FileFd Fd(Res.Filename, FileFd::ReadOnly); - Hash.AddFD(Fd.Fd(), Fd.Size()); - Res.TakeHashes(Hash); URIDone(Res); return true; } @@ -95,5 +119,7 @@ int main() setlocale(LC_ALL, ""); CopyMethod Mth; + + Mth.DropPrivsOrDie(); return Mth.Run(); }