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

diff --git a/methods/file.cc b/methods/file.cc
index 298f06608..12db62203 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -1,11 +1,11 @@
 // -*- 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
    
-   This simply checks that the file specified exists, if so the relevent
+   This simply checks that the file specified exists, if so the relevant
    information is returned. If a .gz filename is specified then the file
    name with .gz removed will also be checked and information about it
    will be returned in Alt-*
@@ -13,11 +13,18 @@
    ##################################################################### */
 									/*}}}*/
 // 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 <string>
 #include <sys/stat.h>
-#include <unistd.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
 class FileMethod : public pkgAcqMethod
@@ -35,10 +42,10 @@ 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 //");
+      return _error->Error(_("Invalid URI, local URIS must not start with //"));
 
    // See if the file exists
    struct stat Buf;
@@ -53,10 +60,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;
@@ -73,8 +80,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);
+   Res.TakeHashes(Hash);
    URIDone(Res);
    return true;
 }
@@ -82,6 +93,8 @@ bool FileMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
+   setlocale(LC_ALL, "");
+
    FileMethod Mth;
    return Mth.Run();
 }