X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/9f697f69cf1adaced476598cfe08ab03c76c5d18..62600666d21aacea63cece3b4ec64f0ffb40168b:/methods/file.cc

diff --git a/methods/file.cc b/methods/file.cc
index 5d5fffa67..5cbf1924e 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -15,12 +15,12 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/acquire-method.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
+#include "aptmethod.h"
 
 #include <string>
 #include <sys/stat.h>
@@ -28,13 +28,12 @@
 #include <apti18n.h>
 									/*}}}*/
 
-class FileMethod : public pkgAcqMethod
+class FileMethod : public aptMethod
 {
-   virtual bool Fetch(FetchItem *Itm);
-   
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+
    public:
-   
-   FileMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig | LocalOnly) {};
+   FileMethod() : aptMethod("file", "1.0", SingleInstance | SendConfig | LocalOnly) {};
 };
 
 // FileMethod::Fetch - Fetch a file					/*{{{*/
@@ -58,13 +57,17 @@ bool FileMethod::Fetch(FetchItem *Itm)
 	 {
 	    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());
+      RemoveFile("file", Itm->DestFile);
 
+   int olderrno = 0;
    // See if the file exists
    if (stat(File.c_str(),&Buf) == 0)
    {
@@ -78,7 +81,13 @@ bool FileMethod::Fetch(FetchItem *Itm)
 	 if (filesize != 0 && filesize == Res.Size)
 	    Res.IMSHit = true;
       }
+
+      CalculateHashes(Itm, Res);
    }
+   else
+      olderrno = errno;
+   if (Res.IMSHit == false)
+      URIStart(Res);
 
    // See if the uncompressed file exists and reuse it
    FetchResult AltRes;
@@ -88,7 +97,7 @@ bool FileMethod::Fetch(FetchItem *Itm)
    {
       if (APT::String::Endswith(File, *ext) == true)
       {
-	 std::string const unfile = File.substr(0, File.length() - ext->length() - 1);
+	 std::string const unfile = File.substr(0, File.length() - ext->length());
 	 if (stat(unfile.c_str(),&Buf) == 0)
 	 {
 	    AltRes.Size = Buf.st_size;
@@ -103,20 +112,15 @@ bool FileMethod::Fetch(FetchItem *Itm)
       }
    }
 
-   if (Res.Filename.empty() == false)
-   {
-      Hashes Hash(Itm->ExpectedHashes);
-      FileFd Fd(Res.Filename, FileFd::ReadOnly);
-      Hash.AddFD(Fd);
-      Res.TakeHashes(Hash);
-   }
-
    if (AltRes.Filename.empty() == false)
       URIDone(Res,&AltRes);
    else if (Res.Filename.empty() == false)
       URIDone(Res);
    else
-      return _error->Error(_("File not found"));
+   {
+      errno = olderrno;
+      return _error->Errno(File.c_str(), _("File not found"));
+   }
 
    return true;
 }
@@ -124,8 +128,5 @@ bool FileMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
-   setlocale(LC_ALL, "");
-
-   FileMethod Mth;
-   return Mth.Run();
+   return FileMethod().Run();
 }