tests: don't do boundless string compares with data()

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index 72896b4c076e77ce56086c6a3519770571d599c4..810fc2f38356612649fd8d58e14b275639773262 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -9,24 +9,29 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/fileutl.h>

-#include <apt-pkg/acquire-method.h>
+#include <apt-pkg/strutl.h>

 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.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 <utime.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                                    /*{{{*/


@@ -34,8 +39,8 @@ class CopyMethod : public pkgAcqMethod
 /* */
 bool CopyMethod::Fetch(FetchItem *Itm)
 {
 /* */
 bool CopyMethod::Fetch(FetchItem *Itm)
 {

-   URI Get = Itm->Uri;
-   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;


@@ -47,19 +52,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);
    // See if the file exists
    FileFd From(File,FileFd::ReadOnly);

-   FileFd To(Itm->DestFile,FileFd::WriteEmpty);
+   FileFd To(Itm->DestFile,FileFd::WriteAtomic);

    To.EraseOnFailure();
    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)
    {


@@ -69,21 +77,11 @@ bool CopyMethod::Fetch(FetchItem *Itm)
 
    From.Close();
    To.Close();
 
    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;
 }
    URIDone(Res);
    return true;
 }


@@ -91,8 +89,5 @@ bool CopyMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   CopyMethod Mth;
-   return Mth.Run();
+   return CopyMethod().Run();

 }
 }