FildFd: Introduce a Flush() function and call it from Close()

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index 744cc2b51a024b6f421af852d5396d4fd2ad6e37..e515b2def10e1eed04abd89709915703470ec684 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -16,19 +16,23 @@
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>

+#include <apt-pkg/configuration.h>
+#include "aptmethod.h"

 
 

+#include <string>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <unistd.h>
+#include <sys/time.h>
+

 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

-class CopyMethod : public pkgAcqMethod
+class CopyMethod : public aptMethod

 {
 {

-   virtual bool Fetch(FetchItem *Itm);
-   
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+

    public:
    public:

-   
-   CopyMethod() : pkgAcqMethod("1.0",SingleInstance) {};
+
+   CopyMethod() : aptMethod("copy", "1.0",SingleInstance | SendConfig) {};

 };
 
 // CopyMethod::Fetch - Fetch a file                                    /*{{{*/
 };
 
 // CopyMethod::Fetch - Fetch a file                                    /*{{{*/


@@ -36,8 +40,8 @@ class CopyMethod : public pkgAcqMethod
 /* */
 bool CopyMethod::Fetch(FetchItem *Itm)
 {
 /* */
 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;
 
    // Stat the file and send a start message
    struct stat Buf;


@@ -49,19 +53,22 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    Res.Size = Buf.st_size;
    Res.Filename = Itm->DestFile;
    Res.LastModified = Buf.st_mtime;
    Res.Size = Buf.st_size;
    Res.Filename = Itm->DestFile;
    Res.LastModified = Buf.st_mtime;

-   Res.IMSHit = false;      
+   Res.IMSHit = false;

    URIStart(Res);
    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();
    // 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)
    {
    // Copy the file
    if (CopyFile(From,To) == false)
    {


@@ -70,24 +77,17 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    }
 
    From.Close();
    }
 
    From.Close();

+   To.Close();

 
    // Transfer the modification times
 
    // Transfer the modification times

-   struct timespec times[2];
+   struct timeval times[2];

    times[0].tv_sec = Buf.st_atime;
    times[1].tv_sec = Buf.st_mtime;
    times[0].tv_sec = Buf.st_atime;
    times[1].tv_sec = Buf.st_mtime;

-   times[0].tv_nsec = times[1].tv_nsec = 0;
-   if (futimens(To.Fd(), times) != 0)
-   {
-      To.OpFail();
-      return _error->Errno("futimens",_("Failed to set modification time"));
-   }
-   To.Close();
-
-   Hashes Hash;
-   FileFd Fd(Res.Filename, FileFd::ReadOnly);
-   Hash.AddFD(Fd);
-   Res.TakeHashes(Hash);
+   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(Itm, Res);

    URIDone(Res);
    return true;
 }
    URIDone(Res);
    return true;
 }


@@ -98,5 +98,6 @@ int main()
    setlocale(LC_ALL, "");
 
    CopyMethod Mth;
    setlocale(LC_ALL, "");
 
    CopyMethod Mth;

+

    return Mth.Run();
 }
    return Mth.Run();
 }