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

[apt.git] / methods / file.cc

diff --git a/methods/file.cc b/methods/file.cc
index 043ab04b8286c68c03ad8290a5a1f0c918ba7eef..40e85bce5a464d7fafa1014bfeba8a242cc3aa47 100644 (file)
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -30,7 +30,7 @@
 
 class FileMethod : public pkgAcqMethod
 {
-   virtual bool Fetch(FetchItem *Itm);
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
    
    public:
    
@@ -48,8 +48,27 @@ bool FileMethod::Fetch(FetchItem *Itm)
    if (Get.Host.empty() == false)
       return _error->Error(_("Invalid URI, local URIS must not start with //"));
 
-   // See if the file exists
    struct stat Buf;
+   // deal with destination files which might linger around
+   if (lstat(Itm->DestFile.c_str(), &Buf) == 0)
+   {
+      if ((Buf.st_mode & S_IFREG) != 0)
+      {
+        if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0)
+        {
+           HashStringList const hsl = Itm->ExpectedHashes;
+           if (Itm->ExpectedHashes.VerifyFile(File))
+           {
+              Res.Filename = Itm->DestFile;
+              Res.IMSHit = true;
+           }
+        }
+      }
+   }
+   if (Res.IMSHit != true)
+      unlink(Itm->DestFile.c_str());
+
+   // See if the file exists
    if (stat(File.c_str(),&Buf) == 0)
    {
       Res.Size = Buf.st_size;
@@ -57,10 +76,23 @@ bool FileMethod::Fetch(FetchItem *Itm)
       Res.LastModified = Buf.st_mtime;
       Res.IMSHit = false;
       if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0)
-        Res.IMSHit = true;
+      {
+        unsigned long long const filesize = Itm->ExpectedHashes.FileSize();
+        if (filesize != 0 && filesize == Res.Size)
+           Res.IMSHit = true;
+      }
+
+      Hashes Hash(Itm->ExpectedHashes);
+      FileFd Fd(File, FileFd::ReadOnly);
+      Hash.AddFD(Fd);
+      Res.TakeHashes(Hash);
    }
+   if (Res.IMSHit == false)
+      URIStart(Res);
 
    // See if the uncompressed file exists and reuse it
+   FetchResult AltRes;
+   AltRes.Filename.clear();
    std::vector<std::string> extensions = APT::Configuration::getCompressorExtensions();
    for (std::vector<std::string>::const_iterator ext = extensions.begin(); ext != extensions.end(); ++ext)
    {
@@ -69,29 +101,25 @@ bool FileMethod::Fetch(FetchItem *Itm)
         std::string const unfile = File.substr(0, File.length() - ext->length() - 1);
         if (stat(unfile.c_str(),&Buf) == 0)
         {
-           FetchResult AltRes;
            AltRes.Size = Buf.st_size;
            AltRes.Filename = unfile;
            AltRes.LastModified = Buf.st_mtime;
            AltRes.IMSHit = false;
            if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0)
               AltRes.IMSHit = true;
-
-           URIDone(Res,&AltRes);
-           return true;
+           break;
         }
         // no break here as we could have situations similar to '.gz' vs '.tar.gz' here
       }
    }
 
-   if (Res.Filename.empty() == true)
+   if (AltRes.Filename.empty() == false)
+      URIDone(Res,&AltRes);
+   else if (Res.Filename.empty() == false)
+      URIDone(Res);
+   else
       return _error->Error(_("File not found"));
 
-   Hashes Hash(Itm->ExpectedHashes);
-   FileFd Fd(Res.Filename, FileFd::ReadOnly);
-   Hash.AddFD(Fd);
-   Res.TakeHashes(Hash);
-   URIDone(Res);
    return true;
 }
                                                                        /*}}}*/