X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/98136088cd0f111938b9a896395cae36d972d019..2853201580944cb4e5a2a8a810e800e89e9a0475:/methods/copy.cc?ds=sidebyside

diff --git a/methods/copy.cc b/methods/copy.cc
index 5570f31c8..e515b2def 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -17,6 +17,7 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
+#include "aptmethod.h"
 
 #include <string>
 #include <sys/stat.h>
@@ -25,38 +26,22 @@
 #include <apti18n.h>
 									/*}}}*/
 
-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					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 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;
@@ -68,13 +53,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 +68,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)
    {
@@ -107,8 +87,7 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    if (utimes(Res.Filename.c_str(), times) != 0)
       return _error->Errno("utimes",_("Failed to set modification time"));
 
-   CalculateHashes(Res);
-
+   CalculateHashes(Itm, Res);
    URIDone(Res);
    return true;
 }
@@ -119,5 +98,6 @@ int main()
    setlocale(LC_ALL, "");
 
    CopyMethod Mth;
+
    return Mth.Run();
 }