Deprecate SPtrArray<T> and convert everyone to unique_ptr<T[]>

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index c89eb975df194ae6a66dde640582c5abc29b9be8..0c9f322e62aec5d310eb2e9027b78864c3ad5ee6 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: copy.cc,v 1.6 1999/01/20 04:36:43 jgg Exp $
+// $Id: copy.cc,v 1.7.2.1 2004/01/16 18:58:50 mdz Exp $

 /* ######################################################################
 
    Copy URI - This method takes a uri like a file: uri and copies it
 /* ######################################################################
 
    Copy URI - This method takes a uri like a file: uri and copies it


@@ -9,48 +9,72 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/fileutl.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/acquire-method.h>
 #include <apt-pkg/error.h>

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

 
 

+#include <string>

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

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

                                                                        /*}}}*/
 
 class CopyMethod : public pkgAcqMethod
 {
                                                                        /*}}}*/
 
 class CopyMethod : public pkgAcqMethod
 {

-   virtual bool Fetch(FetchItem *Itm);
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+   void CalculateHashes(FetchItem const * const Itm, FetchResult &Res);

    
    public:
    
    
    public:
    

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

 };
 
 };
 

+void CopyMethod::CalculateHashes(FetchItem const * const Itm, FetchResult &Res)
+{
+   Hashes Hash(Itm->ExpectedHashes);
+   FileFd Fd(Res.Filename, FileFd::ReadOnly, FileFd::Extension);
+   Hash.AddFD(Fd);
+   Res.TakeHashes(Hash);
+}
+

 // CopyMethod::Fetch - Fetch a file                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool CopyMethod::Fetch(FetchItem *Itm)
 {
 // 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 const File = Itm->Uri.substr(Itm->Uri.find(':')+1);

 
    // Stat the file and send a start message
    struct stat Buf;
    if (stat(File.c_str(),&Buf) != 0)
 
    // Stat the file and send a start message
    struct stat Buf;
    if (stat(File.c_str(),&Buf) != 0)

-      return _error->Errno("stat","Failed to stat");
+      return _error->Errno("stat",_("Failed to stat"));

 
    // Forumulate a result and send a start message
    FetchResult Res;
    Res.Size = Buf.st_size;
    Res.Filename = Itm->DestFile;
    Res.LastModified = Buf.st_mtime;
 
    // Forumulate a result and send a start message
    FetchResult Res;
    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)
+   {
+      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();
    if (_error->PendingError() == true)
    {
    To.EraseOnFailure();
    if (_error->PendingError() == true)
    {


@@ -67,17 +91,17 @@ bool CopyMethod::Fetch(FetchItem *Itm)
 
    From.Close();
    To.Close();
 
    From.Close();
    To.Close();

-   
+

    // Transfer the modification times
    // 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(Itm, Res);
+

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


@@ -85,6 +109,9 @@ bool CopyMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

+   setlocale(LC_ALL, "");
+

    CopyMethod Mth;
    CopyMethod Mth;

+

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