fix compiler warning in the new mirror code

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index 68253a64c88e056cbc312e8959fc1ac215748cca..027b59f4632ada50b809cbe78e2792c3756afb83 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -1,116 +1,99 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: copy.cc,v 1.1 1998/10/25 01:57:07 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
-   to the destination URI.
+   to the destination file.
    
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/fileutl.h>
-#include <strutl.h>
+#include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/hashes.h>
 
 #include <sys/stat.h>
+#include <utime.h>
 #include <unistd.h>
-#include <stdio.h>
+#include <apti18n.h>
                                                                        /*}}}*/
 
-// Fail - Generate a failure message                                   /*{{{*/
+class CopyMethod : public pkgAcqMethod
+{
+   virtual bool Fetch(FetchItem *Itm);
+   
+   public:
+   
+   CopyMethod() : pkgAcqMethod("1.0",SingleInstance) {};
+};
+
+// CopyMethod::Fetch - Fetch a file                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void Fail(string URI)
+bool CopyMethod::Fetch(FetchItem *Itm)
 {
-   string Err = "Undetermined Error";
-   if (_error->empty() == false)
-      _error->PopMessage(Err);
+   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);
    
-   printf("400 URI Failure\n"
-         "URI: %s\n"
-         "Message: %s\n\n",URI.c_str(),Err.c_str());
-   _error->Discard();
+   // 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;
+   }
+   
+   // Copy the file
+   if (CopyFile(From,To) == false)
+   {
+      To.OpFail();
+      return false;
+   }
+
+   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);
+
+   URIDone(Res);
+   return true;
 }
                                                                        /*}}}*/
 
 int main()
 {
-   setlinebuf(stdout);
-   SetNonBlock(STDIN_FILENO,true);
-   
-   printf("100 Capabilities\n"
-         "Version: 1.0\n"
-         "Pipeline: true\n\n");
-      
-   vector<string> Messages;   
-   while (1)
-   {
-      if (WaitFd(STDIN_FILENO) == false ||
-         ReadMessages(STDIN_FILENO,Messages) == false)
-        return 0;
+   setlocale(LC_ALL, "");
 
-      while (Messages.empty() == false)
-      {
-        string Message = Messages.front();
-        Messages.erase(Messages.begin());
-        
-        // Fetch the message number
-        char *End;
-        int Number = strtol(Message.c_str(),&End,10);
-        if (End == Message.c_str())
-        {
-           cerr << "Malformed message!" << endl;
-           return 100;
-        }
-        
-        // We only understand 600 URI Fetch messages
-        if (Number != 600)
-           continue;
-        
-        // Grab the URI bit 
-        string URI = LookupTag(Message,"URI");
-        string Target = LookupTag(Message,"Filename");
-        
-        // Grab the filename
-        string::size_type Pos = URI.find(':');
-        if (Pos == string::npos)
-        {
-           _error->Error("Invalid message");
-           Fail(URI);
-           continue;
-        }
-        string File = string(URI,Pos+1);
-        
-        // Start the reply message
-        string Result = "201 URI Done";
-        Result += "\nURI: " + URI;
-        Result += "\nFileName: " + Target;
-        
-        // See if the file exists
-        FileFd From(File,FileFd::ReadOnly);
-        FileFd To(Target,FileFd::WriteEmpty);
-        To.EraseOnFailure();
-        if (_error->PendingError() == true)
-        {
-           Fail(URI);
-           continue;
-        }       
-        
-        // Copy the file
-        if (CopyFile(From,To) == false)
-        {
-           Fail(URI);
-           continue;
-        }       
-        
-        // Send the message
-        Result += "\n\n";
-        if (write(STDOUT_FILENO,Result.begin(),Result.length()) != 
-            (signed)Result.length())
-           return 100;
-      }      
-   }
-   
-   return 0;
+   CopyMethod Mth;
+   return Mth.Run();
 }