travis: pull liblz4-dev from wily

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

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index ff9061dc79c3cafee4f365bb179528320b6f224d..5e0b00c46342a1045762723381d5b68ee776ba89 100644 (file)
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -29,10 +29,12 @@
 #include <string>
 #include <vector>
 
+#include <stdlib.h>
+
 #include <apti18n.h>
                                                                        /*}}}*/
 
-static bool DoAutoDetectProxy(CommandLine &CmdL)
+static bool DoAutoDetectProxy(CommandLine &CmdL)                       /*{{{*/
 {
    if (CmdL.FileSize() != 2)
       return _error->Error(_("Need one URL as argument"));
@@ -44,15 +46,13 @@ static bool DoAutoDetectProxy(CommandLine &CmdL)
 
    return true;
 }
-
-static bool DoDownloadFile(CommandLine &CmdL)
+                                                                       /*}}}*/
+static bool DoDownloadFile(CommandLine &CmdL)                          /*{{{*/
 {
    if (CmdL.FileSize() <= 2)
       return _error->Error(_("Must specify at least one pair url/filename"));
 
-   AcqTextStatus Stat(std::cout, ScreenWidth,_config->FindI("quiet",0));
-   pkgAcquire Fetcher(&Stat);
-
+   aptAcquireWithTextStatus Fetcher;
    size_t fileind = 0;
    std::vector<std::string> targetfiles;
    while (fileind + 2 <= CmdL.FileSize())
@@ -79,8 +79,8 @@ static bool DoDownloadFile(CommandLine &CmdL)
 
    return true;
 }
-
-static bool DoSrvLookup(CommandLine &CmdL)
+                                                                       /*}}}*/
+static bool DoSrvLookup(CommandLine &CmdL)                             /*{{{*/
 {
    if (CmdL.FileSize() <= 1)
       return _error->Error("Must specify at least one SRV record");
@@ -106,49 +106,60 @@ static bool DoSrvLookup(CommandLine &CmdL)
    }
    return true;
 }
-
-static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const  * Cmds)
+                                                                       /*}}}*/
+static bool DoCatFile(CommandLine &CmdL)                               /*{{{*/
 {
-   ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
+   FileFd fd;
+   FileFd out;
 
-   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];
 
-   std::cout << std::endl <<
-      _("This APT helper has Super Meep Powers.") << std::endl;
+      if (fd.Open(name, FileFd::ReadOnly, FileFd::Extension) == false)
+         return false;
+
+      if (CopyFile(fd, out) == false)
+         return false;
+   }
    return true;
 }
-
-
-int main(int argc,const char *argv[])                                  /*{{{*/
+                                                                       /*}}}*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/
 {
-   InitLocale();
-
-   CommandLine::DispatchWithHelp Cmds[] = {
+   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;
+}
+                                                                       /*}}}*/
+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}
    };
+}
+                                                                       /*}}}*/
+int main(int argc,const char *argv[])                                  /*{{{*/
+{
+   InitLocale();
 
-   // Parse the command line and initialize the package library
    CommandLine CmdL;
-   ParseCommandLine(CmdL, Cmds, "apt-helper", &_config, &_system, argc, argv, ShowHelp);
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_HELPER, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 
    InitOutput();