apt-helper: Check that we can open stdout

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

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index b0c1ddacf4a53c6ddf7664195ff27958ac87effd..a519f3042be72527ed4e3c0eda8f5dced3b85fc7 100644 (file)
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -29,6 +29,8 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

+#include <stdlib.h>
+

 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 


@@ -105,38 +107,56 @@ static bool DoSrvLookup(CommandLine &CmdL)                                /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-bool ShowHelp(CommandLine &, aptDispatchWithHelp const  * Cmds)                /*{{{*/
+static bool DoCatFile(CommandLine &CmdL)                               /*{{{*/

 {
 {

-   ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
+   FileFd fd;
+   FileFd out;
+   char buf[4096];
+   unsigned long long read;

 
 

-   if (_config->FindB("version") == true)
-     return true;
+   if (out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly) == false)
+      return false;

 
 

-   std::cout <<
-    _("Usage: apt-helper [options] command\n"
-      "       apt-helper [options] download-file uri target-path\n"
-      "\n"
-      "apt-helper is a internal helper for apt\n")
-    << std::endl
-    << _("Commands:") << std::endl;
-
-   for (; Cmds->Handler != nullptr; ++Cmds)
+   if (CmdL.FileSize() <= 1)
+      return _error->Error("Must specify at least one file name");
+
+   for(size_t i = 1; CmdL.FileList[i] != NULL; ++i)

    {
    {

-      if (Cmds->Help == nullptr)
-        continue;
-      std::cout << "  " << Cmds->Match << " - " << Cmds->Help << std::endl;
-   }
+      std::string const name = CmdL.FileList[i];
+
+      if (fd.Open(name, FileFd::ReadOnly, FileFd::Extension) == false)
+         return false;

 
 

-   std::cout << std::endl <<
-      _("This APT helper has Super Meep Powers.") << std::endl;
+      for (;;) {
+         if (fd.Read(buf, sizeof(buf), &read) == false)
+            return false;
+         if (read == 0)
+            break;
+         if (out.Write(buf, read) == 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"
+           "e.g. the same proxy configuration or acquire system as APT would.\n");

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+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)")},
 {
    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}
    };
       {"auto-detect-proxy", &DoAutoDetectProxy, _("detect proxy using apt.conf")},
       {nullptr, nullptr, nullptr}
    };


@@ -147,7 +167,7 @@ int main(int argc,const char *argv[])                                       /*{{{*/
    InitLocale();
 
    CommandLine CmdL;
    InitLocale();
 
    CommandLine CmdL;

-   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_HELPER, &_config, &_system, argc, argv);
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_HELPER, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);

 
    InitOutput();
 
 
    InitOutput();