pkgCacheGenerator: Use StringView for toString

[apt.git] / cmdline / apt-helper.cc

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index e8b16c4e5bd1accfeb0db9c19dcec6b80b7411c3..001b5e5f778db86bf9b79e1a33dc23c59fa9c45f 100644 (file)
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -107,14 +107,42 @@ 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;
-   char buf[4096];
-   unsigned long long read;
+   std::string const compressorName = _config->Find("Apt-Helper::Cat-File::Compress", "");
+
+   if (compressorName.empty() == false)
+   {
 
-   out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly);
+      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)
       return _error->Error("Must specify at least one file name");
@@ -126,14 +154,8 @@ static bool DoCatFile(CommandLine &CmdL)                           /*{{{*/
       if (fd.Open(name, FileFd::ReadOnly, FileFd::Extension) == false)
          return false;
 
-      for (;;) {
-         if (fd.Read(buf, sizeof(buf), &read) == false)
-            return false;
-         if (read == 0)
-            break;
-         if (out.Write(buf, read) == false)
-            return false;
-      }
+      if (CopyFile(fd, out) == false)
+         return false;
    }
    return true;
 }