X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/c5ccf1750dd00e8c4374162b302a0946f7fe3a96..55a5a46c235a30bf024fb2301066553953701cc5:/methods/file.cc

diff --git a/methods/file.cc b/methods/file.cc
index 298f06608..9cdd5bc2d 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: file.cc,v 1.8 2000/01/27 04:15:10 jgg Exp $
+// $Id: file.cc,v 1.9.2.1 2004/01/16 18:58:50 mdz Exp $
 /* ######################################################################
 
    File URI method for APT
@@ -15,9 +15,12 @@
 // Include Files							/*{{{*/
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/fileutl.h>
 
 #include <sys/stat.h>
 #include <unistd.h>
+#include <apti18n.h>
 									/*}}}*/
 
 class FileMethod : public pkgAcqMethod
@@ -38,7 +41,7 @@ bool FileMethod::Fetch(FetchItem *Itm)
    string File = Get.Path;
    FetchResult Res;
    if (Get.Host.empty() == false)
-      return _error->Error("Invalid URI, local URIS must not start with //");
+      return _error->Error(_("Invalid URI, local URIS must not start with //"));
 
    // See if the file exists
    struct stat Buf;
@@ -73,8 +76,12 @@ bool FileMethod::Fetch(FetchItem *Itm)
    }
    
    if (Res.Filename.empty() == true)
-      return _error->Error("File not found");
-   
+      return _error->Error(_("File not found"));
+
+   Hashes Hash;
+   FileFd Fd(Res.Filename, FileFd::ReadOnly);
+   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Res.TakeHashes(Hash);
    URIDone(Res);
    return true;
 }
@@ -82,6 +89,8 @@ bool FileMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
+   setlocale(LC_ALL, "");
+
    FileMethod Mth;
    return Mth.Run();
 }