Regex, --all-versions and more OR stuff

[apt.git] / methods / file.cc

diff --git a/methods/file.cc b/methods/file.cc
index 64490749b5fa2568beb288b4e10c14e7a444a4ac..f2bcf371a1fa6e1386fbf9a1bcb6b5118a972439 100644 (file)
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: file.cc,v 1.4 1998/10/30 07:53:52 jgg Exp $
+// $Id: file.cc,v 1.7 1999/01/18 06:20:08 jgg Exp $
 /* ######################################################################
 
    File URI method for APT
@@ -22,21 +22,24 @@
 
 class FileMethod : public pkgAcqMethod
 {
-   virtual bool Fetch(string Message,URI Get);
+   virtual bool Fetch(FetchItem *Itm);
    
    public:
    
-   FileMethod() : pkgAcqMethod("1.0",SingleInstance) {};
+   FileMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly) {};
 };
 
 // FileMethod::Fetch - Fetch a file                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool FileMethod::Fetch(string Message,URI Get)
+bool FileMethod::Fetch(FetchItem *Itm)
 {
+   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)
@@ -45,7 +48,7 @@ bool FileMethod::Fetch(string Message,URI Get)
       Res.Filename = File;
       Res.LastModified = Buf.st_mtime;
       Res.IMSHit = false;
-      if (LastModified == Buf.st_mtime)
+      if (Itm->LastModified == Buf.st_mtime)
         Res.IMSHit = true;
    }
    
@@ -61,7 +64,7 @@ bool FileMethod::Fetch(string Message,URI Get)
         AltRes.Filename = File;
         AltRes.LastModified = Buf.st_mtime;
         AltRes.IMSHit = false;
-        if (LastModified == Buf.st_mtime)
+        if (Itm->LastModified == Buf.st_mtime)
            AltRes.IMSHit = true;
         
         URIDone(Res,&AltRes);