Add a GetListOfFilesInDir() helper method which replaces the old

[apt.git] / methods / file.cc

diff --git a/methods/file.cc b/methods/file.cc
index 0e5e2ebefaf724fe377d3eadeb2f7251b976a041..9cdd5bc2d3b3a3ea9ff14f2732ef832780e146cd 100644 (file)
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: file.cc,v 1.5 1998/11/01 05:27:41 jgg Exp $
+// $Id: file.cc,v 1.9.2.1 2004/01/16 18:58:50 mdz Exp $

 /* ######################################################################
 
    File URI method for APT
 /* ######################################################################
 
    File URI method for APT


@@ -15,9 +15,12 @@
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 // 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 <sys/stat.h>
 #include <unistd.h>

+#include <apti18n.h>

                                                                        /*}}}*/
 
 class FileMethod : public pkgAcqMethod
                                                                        /*}}}*/
 
 class FileMethod : public pkgAcqMethod


@@ -26,7 +29,7 @@ class FileMethod : public pkgAcqMethod
    
    public:
    
    
    public:
    

-   FileMethod() : pkgAcqMethod("1.0",SingleInstance) {};
+   FileMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly) {};

 };
 
 // FileMethod::Fetch - Fetch a file                                    /*{{{*/
 };
 
 // FileMethod::Fetch - Fetch a file                                    /*{{{*/


@@ -37,7 +40,9 @@ bool FileMethod::Fetch(FetchItem *Itm)
    URI Get = Itm->Uri;
    string File = Get.Path;
    FetchResult Res;
    URI Get = Itm->Uri;
    string File = Get.Path;
    FetchResult Res;

-   
+   if (Get.Host.empty() == false)
+      return _error->Error(_("Invalid URI, local URIS must not start with //"));
+

    // See if the file exists
    struct stat Buf;
    if (stat(File.c_str(),&Buf) == 0)
    // See if the file exists
    struct stat Buf;
    if (stat(File.c_str(),&Buf) == 0)


@@ -46,7 +51,7 @@ bool FileMethod::Fetch(FetchItem *Itm)
       Res.Filename = File;
       Res.LastModified = Buf.st_mtime;
       Res.IMSHit = false;
       Res.Filename = File;
       Res.LastModified = Buf.st_mtime;
       Res.IMSHit = false;

-      if (Itm->LastModified == Buf.st_mtime)
+      if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0)

         Res.IMSHit = true;
    }
    
         Res.IMSHit = true;
    }
    


@@ -62,7 +67,7 @@ bool FileMethod::Fetch(FetchItem *Itm)
         AltRes.Filename = File;
         AltRes.LastModified = Buf.st_mtime;
         AltRes.IMSHit = false;
         AltRes.Filename = File;
         AltRes.LastModified = Buf.st_mtime;
         AltRes.IMSHit = false;

-        if (Itm->LastModified == Buf.st_mtime)
+        if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0)

            AltRes.IMSHit = true;
         
         URIDone(Res,&AltRes);
            AltRes.IMSHit = true;
         
         URIDone(Res,&AltRes);


@@ -71,8 +76,12 @@ bool FileMethod::Fetch(FetchItem *Itm)
    }
    
    if (Res.Filename.empty() == true)
    }
    
    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;
 }
    URIDone(Res);
    return true;
 }


@@ -80,6 +89,8 @@ bool FileMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

+   setlocale(LC_ALL, "");
+

    FileMethod Mth;
    return Mth.Run();
 }
    FileMethod Mth;
    return Mth.Run();
 }