Fix status file parser so that if a record is larger th...

[apt.git] / methods / file.cc

diff --git a/methods/file.cc b/methods/file.cc
index 1b3183f05989fa08f05005ca4a8140c444d591d2..bf7d380c58267200f46d1711c7a77c5feabf6672 100644 (file)
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: file.cc,v 1.6 1998/11/14 01:39:49 jgg Exp $
+// $Id: file.cc,v 1.9 2003/02/10 07:34:41 doogie Exp $
 /* ######################################################################
 
    File URI method for APT
@@ -13,6 +13,7 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
+#include <apti18n.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 
@@ -37,7 +38,9 @@ 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)
@@ -46,7 +49,7 @@ bool FileMethod::Fetch(FetchItem *Itm)
       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;
    }
    
@@ -62,7 +65,7 @@ bool FileMethod::Fetch(FetchItem *Itm)
         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);
@@ -71,7 +74,7 @@ bool FileMethod::Fetch(FetchItem *Itm)
    }
    
    if (Res.Filename.empty() == true)
-      return _error->Error("File not found");
+      return _error->Error(_("File not found"));
    
    URIDone(Res);
    return true;