X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/be4401bfa4a240bbc894e1bfeb1e1e8d63fc7b18..26b3ade25dc90ab9288fcdd19af747eb62743013:/methods/file.cc diff --git a/methods/file.cc b/methods/file.cc index 0e5e2ebef..12db62203 100644 --- a/methods/file.cc +++ b/methods/file.cc @@ -1,11 +1,11 @@ // -*- 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 - 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 + #include #include +#include +#include +#include +#include #include -#include + +#include /*}}}*/ class FileMethod : public pkgAcqMethod @@ -26,7 +33,7 @@ class FileMethod : public pkgAcqMethod public: - FileMethod() : pkgAcqMethod("1.0",SingleInstance) {}; + FileMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly) {}; }; // FileMethod::Fetch - Fetch a file /*{{{*/ @@ -35,9 +42,11 @@ 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 //")); + // See if the file exists struct stat Buf; if (stat(File.c_str(),&Buf) == 0) @@ -46,15 +55,15 @@ 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; } // 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; @@ -62,7 +71,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,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; } @@ -80,6 +93,8 @@ bool FileMethod::Fetch(FetchItem *Itm) int main() { + setlocale(LC_ALL, ""); + FileMethod Mth; return Mth.Run(); }