add apt-key support for armored GPG key files (*.asc)

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

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index c0575bea12c96c3f50eb0f085f12fd9dba24a4e6..a6f88ad06c6c25c35502de2c647f379d96f54ea5 100644 (file)
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -29,6 +29,9 @@
 #include <string>
 #include <vector>
 
+#include <unistd.h>
+#include <stdlib.h>
+
 #include <apti18n.h>
                                                                        /*}}}*/
 
@@ -37,7 +40,8 @@ static bool DoAutoDetectProxy(CommandLine &CmdL)                      /*{{{*/
    if (CmdL.FileSize() != 2)
       return _error->Error(_("Need one URL as argument"));
    URI ServerURL(CmdL.FileList[1]);
-   AutoDetectProxy(ServerURL);
+   if (AutoDetectProxy(ServerURL) == false)
+      return false;
    std::string SpecificProxy = _config->Find("Acquire::"+ServerURL.Access+"::Proxy::" + ServerURL.Host);
    ioprintf(std::cout, "Using proxy '%s' for URL '%s'\n",
             SpecificProxy.c_str(), std::string(ServerURL).c_str());
@@ -100,7 +104,74 @@ static bool DoSrvLookup(CommandLine &CmdL)                         /*{{{*/
         _error->Error(_("GetSrvRec failed for %s"), name.c_str());
 
       for (SrvRec const &I : srv_records)
-        c1out << I.target << "\t" << I.priority << "\t" << I.weight << "\t" << I.port << std::endl;
+        ioprintf(c1out, "%s\t%d\t%d\t%d\n", I.target.c_str(), I.priority, I.weight, I.port);
+   }
+   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;
 }
@@ -109,6 +180,7 @@ 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"
@@ -121,6 +193,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}
    };
@@ -128,8 +201,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                       /*{{{*/
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
-   InitLocale();
-
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_HELPER, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);