gpgv: cleanup statusfd parsing a bit

[apt.git] / methods / file.cc

diff --git a/methods/file.cc b/methods/file.cc
index 40e85bce5a464d7fafa1014bfeba8a242cc3aa47..36f3c39b9b8c2a9fef1fc25893e994f43263d0e6 100644 (file)
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -21,6 +21,7 @@
 #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 +29,12 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
-class FileMethod : public pkgAcqMethod
+class FileMethod : public aptMethod
 {
    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                                    /*{{{*/
@@ -66,8 +66,9 @@ bool FileMethod::Fetch(FetchItem *Itm)
       }
    }
    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)
    {
@@ -82,11 +83,10 @@ bool FileMethod::Fetch(FetchItem *Itm)
            Res.IMSHit = true;
       }
 
-      Hashes Hash(Itm->ExpectedHashes);
-      FileFd Fd(File, FileFd::ReadOnly);
-      Hash.AddFD(Fd);
-      Res.TakeHashes(Hash);
+      CalculateHashes(Itm, Res);
    }
+   else
+      olderrno = errno;
    if (Res.IMSHit == false)
       URIStart(Res);
 
@@ -98,7 +98,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;
@@ -118,7 +118,10 @@ bool FileMethod::Fetch(FetchItem *Itm)
    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;
 }