X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/2f17261da947e143d79d9c843a26eeb4b44ec385..2853201580944cb4e5a2a8a810e800e89e9a0475:/cmdline/apt-helper.cc

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index 5a29427c8..b92055ab7 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -107,10 +107,78 @@ static bool DoSrvLookup(CommandLine &CmdL)				/*{{{*/
    return true;
 }
 									/*}}}*/
+static const APT::Configuration::Compressor *FindCompressor(std::vector<APT::Configuration::Compressor> const & compressors, std::string name)				/*{{{*/
+{
+   APT::Configuration::Compressor const * compressor = NULL;
+   for (auto const & c : compressors)
+   {
+      if (compressor != NULL && c.Cost >= compressor->Cost)
+         continue;
+      if (c.Name == name || c.Extension == name || (!c.Extension.empty() && c.Extension.substr(1) == name))
+         compressor = &c;
+   }
+
+   return compressor;
+}
+									/*}}}*/
+static bool DoCatFile(CommandLine &CmdL)				/*{{{*/
+{
+   FileFd fd;
+   FileFd out;
+   std::string const compressorName = _config->Find("Apt-Helper::Cat-File::Compress", "");
+
+   if (compressorName.empty() == false)
+   {
+
+      auto const compressors = APT::Configuration::getCompressors();
+      auto const compressor = FindCompressor(compressors, compressorName);
+
+      if (compressor == NULL)
+         return _error->Error("Could not find compressor: %s", compressorName.c_str());
+
+      if (out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly, *compressor) == false)
+         return false;
+   } else
+   {
+      if (out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly) == false)
+         return false;
+   }
+
+   if (CmdL.FileSize() <= 1)
+   {
+      if (fd.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly) == false)
+	 return false;
+      if (CopyFile(fd, out) == false)
+         return false;
+      return true;
+   }
+
+   for(size_t i = 1; CmdL.FileList[i] != NULL; ++i)
+   {
+      std::string const name = CmdL.FileList[i];
+
+      if (name != "-")
+      {
+	 if (fd.Open(name, FileFd::ReadOnly, FileFd::Extension) == false)
+	    return false;
+      }
+      else
+      {
+	 if (fd.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly) == false)
+	    return false;
+      }
+
+      if (CopyFile(fd, out) == false)
+         return false;
+   }
+   return true;
+}
+									/*}}}*/
 static bool ShowHelp(CommandLine &)					/*{{{*/
 {
    std::cout <<
       _("Usage: apt-helper [options] command\n"
+	    "       apt-helper [options] cat-file file ...\n"
 	    "       apt-helper [options] download-file uri target-path\n"
 	    "\n"
 	    "apt-helper bundles a variety of commands for shell scripts to use\n"
@@ -123,6 +191,7 @@ static std::vector<aptDispatchWithHelp> GetCommands()			/*{{{*/
    return {
       {"download-file", &DoDownloadFile, _("download the given uri to the target-path")},
       {"srv-lookup", &DoSrvLookup, _("lookup a SRV record (e.g. _http._tcp.ftp.debian.org)")},
+      {"cat-file", &DoCatFile, _("concatenate files, with automatic decompression")},
       {"auto-detect-proxy", &DoAutoDetectProxy, _("detect proxy using apt.conf")},
       {nullptr, nullptr, nullptr}
    };