From 91cb4c6b436bfddd4c4fd655e4cd4dce9073d5c4 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:52:26 +0000
Subject: Doc fixes and copy method patch Author: jgg Date: 1999-01-20 04:36:43
 GMT Doc fixes and copy method patch

---
 methods/copy.cc | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'methods/copy.cc')

diff --git a/methods/copy.cc b/methods/copy.cc
index 94e88e503..c89eb975d 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: copy.cc,v 1.5 1998/11/01 05:27:40 jgg Exp $
+// $Id: copy.cc,v 1.6 1999/01/20 04:36:43 jgg Exp $
 /* ######################################################################
 
    Copy URI - This method takes a uri like a file: uri and copies it
@@ -35,28 +35,40 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    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)
+   {
+      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 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;
@@ -66,13 +78,6 @@ bool CopyMethod::Fetch(FetchItem *Itm)
       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;
 }
-- 
cgit v1.2.3