X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/7db98ffceda347f0bc457c6bdc4ff33d60e26b18..3da8b680afd82541ce0168cf0c42d77f08d4c79f:/methods/file.cc?ds=sidebyside

diff --git a/methods/file.cc b/methods/file.cc
index 3500de9f5..7ed4e6f60 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -13,8 +13,13 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 
 #include <sys/stat.h>
 #include <unistd.h>
@@ -36,7 +41,7 @@ class FileMethod : public pkgAcqMethod
 bool FileMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
-   string File = Get.Path;
+   std::string File = Get.Path;
    FetchResult Res;
    if (Get.Host.empty() == false)
       return _error->Error(_("Invalid URI, local URIS must not start with //"));
@@ -54,10 +59,10 @@ bool FileMethod::Fetch(FetchItem *Itm)
    }
    
    // See if we can compute a file without a .gz exentsion
-   string::size_type Pos = File.rfind(".gz");
+   std::string::size_type Pos = File.rfind(".gz");
    if (Pos + 3 == File.length())
    {
-      File = string(File,0,Pos);
+      File = std::string(File,0,Pos);
       if (stat(File.c_str(),&Buf) == 0)
       {
 	 FetchResult AltRes;
@@ -75,7 +80,11 @@ bool FileMethod::Fetch(FetchItem *Itm)
    
    if (Res.Filename.empty() == true)
       return _error->Error(_("File not found"));
-   
+
+   Hashes Hash;
+   FileFd Fd(Res.Filename, FileFd::ReadOnly);
+   Hash.AddFD(Fd);
+   Res.TakeHashes(Hash);
    URIDone(Res);
    return true;
 }