X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/ed793a19ec00b83254029509bc516e3ba911c75a..803491dc568d2994745c3c4359f68053f7261658:/cmdline/apt-helper.cc

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index a05ae90a2..5a29427c8 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -22,15 +22,19 @@
 #include <apt-private/private-output.h>
 #include <apt-private/private-download.h>
 #include <apt-private/private-cmndline.h>
+#include <apt-private/private-main.h>
+#include <apt-pkg/srvrec.h>
 
 #include <iostream>
 #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"));
@@ -42,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(ScreenWidth, _config->FindI("quiet",0));
-   pkgAcquire Fetcher(&Stat);
-
+   aptAcquireWithTextStatus Fetcher;
    size_t fileind = 0;
    std::vector<std::string> targetfiles;
    while (fileind + 2 <= CmdL.FileSize())
@@ -67,9 +69,6 @@ static bool DoDownloadFile(CommandLine &CmdL)
       fileind += 3;
    }
 
-   // Disable drop-privs if "_apt" can not write to the target dir
-   CheckDropPrivsMustBeDisabled(Fetcher);
-
    bool Failed = false;
    if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true)
       return _error->Error(_("Download Failed"));
@@ -80,59 +79,64 @@ static bool DoDownloadFile(CommandLine &CmdL)
 
    return true;
 }
-
-static bool ShowHelp(CommandLine &)
+									/*}}}*/
+static bool DoSrvLookup(CommandLine &CmdL)				/*{{{*/
 {
-   ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-	    COMMON_ARCH,__DATE__,__TIME__);
-
-   if (_config->FindB("version") == true)
-     return true;
+   if (CmdL.FileSize() <= 1)
+      return _error->Error("Must specify at least one SRV record");
 
+   for(size_t i = 1; CmdL.FileList[i] != NULL; ++i)
+   {
+      std::vector<SrvRec> srv_records;
+      std::string const name = CmdL.FileList[i];
+      c0out << "# Target\tPriority\tWeight\tPort # for " << name << std::endl;
+      size_t const found = name.find(":");
+      if (found != std::string::npos)
+      {
+	 std::string const host = name.substr(0, found);
+	 size_t const port = atoi(name.c_str() + found + 1);
+	 if(GetSrvRecords(host, port, srv_records) == false)
+	    _error->Error(_("GetSrvRec failed for %s"), name.c_str());
+      }
+      else if(GetSrvRecords(name, srv_records) == false)
+	 _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;
+   }
+   return true;
+}
+									/*}}}*/
+static bool ShowHelp(CommandLine &)					/*{{{*/
+{
    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"
-      "\n"
-      "Commands:\n"
-      "   download-file - download the given uri to the target-path\n"
-      "   auto-detect-proxy - detect proxy using apt.conf\n"
-      "\n"
-      "                       This APT helper has Super Meep Powers.\n");
+      _("Usage: apt-helper [options] command\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)")},
+      {"auto-detect-proxy", &DoAutoDetectProxy, _("detect proxy using apt.conf")},
+      {nullptr, nullptr, nullptr}
+   };
+}
+									/*}}}*/
 int main(int argc,const char *argv[])					/*{{{*/
 {
-   CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
-				   {"download-file", &DoDownloadFile},
-				   {"auto-detect-proxy", &DoAutoDetectProxy},
-                                   {0,0}};
-
-   std::vector<CommandLine::Args> Args = getCommandArgs(
-      "apt-download", CommandLine::GetCommand(Cmds, argc, argv));
+   InitLocale();
 
-   // Set up gettext support
-   setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
-
-   // Parse the command line and initialize the package library
    CommandLine CmdL;
-   ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_HELPER, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 
    InitOutput();
 
-   // Match the operation
-   CmdL.DispatchArg(Cmds);
-
-   // Print any errors or warnings found during parsing
-   bool const Errors = _error->PendingError();
-   if (_config->FindI("quiet",0) > 0)
-      _error->DumpErrors();
-   else
-      _error->DumpErrors(GlobalError::DEBUG);
-   return Errors == true ? 100 : 0;
+   return DispatchCommandLine(CmdL, Cmds);
 }
 									/*}}}*/