diff options
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/makefile | 14 | ||||
| -rw-r--r-- | methods/store.cc (renamed from methods/gzip.cc) | 68 |
2 files changed, 45 insertions, 37 deletions
diff --git a/methods/makefile b/methods/makefile index 868c52a40..3274e9279 100644 --- a/methods/makefile +++ b/methods/makefile @@ -23,11 +23,11 @@ LIB_MAKES = apt-pkg/makefile SOURCE = copy.cc include $(PROGRAM_H) -# The gzip method -PROGRAM=gzip +# The store method +PROGRAM=store SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile -SOURCE = gzip.cc +SOURCE = store.cc include $(PROGRAM_H) # The gpgv method @@ -96,15 +96,15 @@ $(BIN)/ssh: clean-$(BIN)/ssh: -rm $(BIN)/ssh -# create links for all other compressors -COMPRESSORS=bzip2 lzma xz +# create compat links for all compressors +COMPRESSORS=gzip bzip2 lzma xz binary: $(addprefix $(BIN)/,$(COMPRESSORS)) veryclean: $(addprefix clean-$(BIN)/,$(COMPRESSORS)) -$(addprefix $(BIN)/,$(COMPRESSORS)): $(BIN)/gzip +$(addprefix $(BIN)/,$(COMPRESSORS)): $(BIN)/store echo "Installing $(notdir $@) method link" - ln -fs gzip $@ + ln -fs store $@ $(addprefix clean-$(BIN)/,$(COMPRESSORS)): -rm $(BIN)/$(notdir $@) diff --git a/methods/gzip.cc b/methods/store.cc index c470807ac..29cf9e947 100644 --- a/methods/gzip.cc +++ b/methods/store.cc @@ -1,11 +1,13 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: gzip.cc,v 1.17.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### - GZip method - Take a file URI in and decompress it into the target - file. - + Store method - Takes a file URI and stores its content (for which it will + calculate the hashes) in the given destination. The input file will be + extracted based on its file extension (or with the given compressor if + called with one of the compatible symlinks) and potentially recompressed + based on the file extension of the destination filename. + ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ @@ -29,72 +31,78 @@ #include <apti18n.h> /*}}}*/ -class GzipMethod : public aptMethod +class StoreMethod : public aptMethod { std::string const Prog; virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE; public: - explicit GzipMethod(std::string const &pProg) : aptMethod(pProg.c_str(),"1.1",SingleInstance | SendConfig), Prog(pProg) {}; + explicit StoreMethod(std::string const &pProg) : aptMethod(pProg.c_str(),"1.2",SingleInstance | SendConfig), Prog(pProg) {}; }; -// GzipMethod::Fetch - Decompress the passed URI /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool GzipMethod::Fetch(FetchItem *Itm) +static bool OpenFileWithCompressorByName(FileFd &fileFd, std::string const &Filename, unsigned int const Mode, std::string const &Name) { - URI Get = Itm->Uri; - std::string Path = Get.Host + Get.Path; // To account for relative paths - - FetchResult Res; - Res.Filename = Itm->DestFile; - URIStart(Res); + if (Name == "store") + return fileFd.Open(Filename, Mode, FileFd::Extension); std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors(); std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin(); for (; compressor != compressors.end(); ++compressor) - if (compressor->Name == Prog) + if (compressor->Name == Name) break; if (compressor == compressors.end()) - return _error->Error("Extraction of file %s requires unknown compressor %s", Path.c_str(), Prog.c_str()); + return _error->Error("Extraction of file %s requires unknown compressor %s", Filename.c_str(), Name.c_str()); + return fileFd.Open(Filename, Mode, *compressor); +} + + + /*}}}*/ +bool StoreMethod::Fetch(FetchItem *Itm) /*{{{*/ +{ + URI Get = Itm->Uri; + std::string Path = Get.Host + Get.Path; // To account for relative paths + + FetchResult Res; + Res.Filename = Itm->DestFile; + URIStart(Res); // Open the source and destination files FileFd From; if (_config->FindB("Method::Compress", false) == false) { - From.Open(Path, FileFd::ReadOnly, *compressor); + if (OpenFileWithCompressorByName(From, Path, FileFd::ReadOnly, Prog) == false) + return false; if(From.FileSize() == 0) return _error->Error(_("Empty files can't be valid archives")); } else - From.Open(Path, FileFd::ReadOnly); + From.Open(Path, FileFd::ReadOnly, FileFd::Extension); if (From.IsOpen() == false || From.Failed() == true) return false; FileFd To; - if (Itm->DestFile != "/dev/null") + if (Itm->DestFile != "/dev/null" && Itm->DestFile != Path) { if (_config->FindB("Method::Compress", false) == false) - To.Open(Itm->DestFile, FileFd::WriteAtomic); - else - To.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty, *compressor); + To.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Atomic, FileFd::Extension); + else if (OpenFileWithCompressorByName(To, Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty, Prog) == false) + return false; if (To.IsOpen() == false || To.Failed() == true) return false; To.EraseOnFailure(); } - // Read data from source, generate checksums and write Hashes Hash(Itm->ExpectedHashes); bool Failed = false; Res.Size = 0; - while (1) + while (1) { unsigned char Buffer[4*1024]; unsigned long long Count = 0; - + if (!From.Read(Buffer,sizeof(Buffer),&Count)) { if (To.IsOpen()) @@ -110,9 +118,9 @@ bool GzipMethod::Fetch(FetchItem *Itm) { Failed = true; break; - } + } } - + From.Close(); To.Close(); @@ -146,6 +154,6 @@ int main(int, char *argv[]) { setlocale(LC_ALL, ""); - GzipMethod Mth(flNotDir(argv[0])); + StoreMethod Mth(flNotDir(argv[0])); return Mth.Run(); } |