Update changelog

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index 94e88e503df3896597caa2dd02958dd056a8cd74..d737e3c33cb851b646d726c24f00fad053098cce 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.5 1998/11/01 05:27:40 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


@@ -16,6 +16,7 @@
 #include <sys/stat.h>
 #include <utime.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <utime.h>
 #include <unistd.h>

+#include <apti18n.h>

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


@@ -35,44 +36,49 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    URI Get = Itm->Uri;
    string File = Get.Path;
 
    URI Get = Itm->Uri;
    string File = Get.Path;
 

+   // 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"));
+
+   // 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;      
+   URIStart(Res);
+   

    // See if the file exists
    FileFd From(File,FileFd::ReadOnly);
    FileFd To(Itm->DestFile,FileFd::WriteEmpty);
    To.EraseOnFailure();
    if (_error->PendingError() == true)
    // See if the file exists
    FileFd From(File,FileFd::ReadOnly);
    FileFd To(Itm->DestFile,FileFd::WriteEmpty);
    To.EraseOnFailure();
    if (_error->PendingError() == true)

+   {
+      To.OpFail();

       return false;
       return false;

+   }

    
    // Copy the file
    if (CopyFile(From,To) == false)
    
    // Copy the file
    if (CopyFile(From,To) == false)

+   {
+      To.OpFail();

       return false;
       return false;

+   }

 
    From.Close();
    To.Close();
    
    // Transfer the modification times
 
    From.Close();
    To.Close();
    
    // Transfer the modification times

-   struct stat Buf;
-   if (stat(File.c_str(),&Buf) != 0)
-   {
-      To.OpFail();
-      return _error->Errno("stat","Failed to stat");
-   }
-   

    struct utimbuf TimeBuf;
    TimeBuf.actime = Buf.st_atime;
    TimeBuf.modtime = Buf.st_mtime;
    if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
    {
       To.OpFail();
    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");
+      return _error->Errno("utime",_("Failed to set modification time"));

    }
    
    }
    

-   // Forumulate a result
-   FetchResult Res;
-   Res.Size = Buf.st_size;
-   Res.Filename = Itm->DestFile;
-   Res.LastModified = Buf.st_mtime;
-   Res.IMSHit = false;
-   

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


@@ -80,6 +86,8 @@ bool CopyMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

+   setlocale(LC_ALL, "");
+

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