#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"));
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());
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())
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"));
return true;
}
-
-static bool DoSrvLookup(CommandLine &CmdL)
+ /*}}}*/
+static bool DoSrvLookup(CommandLine &CmdL) /*{{{*/
{
- if (CmdL.FileSize() < 1)
- return _error->Error(_("Must specifc at least one srv record"));
+ if (CmdL.FileSize() <= 1)
+ return _error->Error("Must specify at least one SRV record");
- std::vector<SrvRec> srv_records;
- c1out << "# target priority weight port" << std::endl;
- for(int i=1; CmdL.FileList[i] != NULL; i++)
+ for(size_t i = 1; CmdL.FileList[i] != NULL; ++i)
{
- if(GetSrvRecords(CmdL.FileList[i], srv_records) == false)
- _error->Warning(_("GetSrvRec failed for %s"), CmdL.FileList[i]);
- for (std::vector<SrvRec>::const_iterator I = srv_records.begin();
- I != srv_records.end(); ++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)
{
- c1out << (*I).target.c_str() << " "
- << (*I).priority << " "
- << (*I).weight << " "
- << (*I).port << " "
- << std::endl;
+ 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)
+ 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;
+ }
-static bool ShowHelp(CommandLine &)
+ return compressor;
+}
+ /*}}}*/
+static bool DoCatFile(CommandLine &CmdL) /*{{{*/
{
- ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
+ FileFd fd;
+ FileFd out;
+ std::string const compressorName = _config->Find("Apt-Helper::Cat-File::Compress", "");
- if (_config->FindB("version") == true)
- return true;
+ if (compressorName.empty() == 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"
- "\n"
- "Commands:\n"
- " download-file - download the given uri to the target-path\n"
- " srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
- " auto-detect-proxy - detect proxy using apt.conf\n"
- "\n"
- " This APT helper has Super Meep Powers.\n");
- return true;
-}
+ 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());
-int main(int argc,const char *argv[]) /*{{{*/
-{
- CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
- {"download-file", &DoDownloadFile},
- {"srv-lookup", &DoSrvLookup},
- {"auto-detect-proxy", &DoAutoDetectProxy},
- {0,0}};
+ if (out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly, *compressor) == false)
+ return false;
+ } else
+ {
+ if (out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly) == false)
+ return false;
+ }
- std::vector<CommandLine::Args> Args = getCommandArgs(
- "apt-download", CommandLine::GetCommand(Cmds, argc, argv));
+ 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];
- // Set up gettext support
- setlocale(LC_ALL,"");
- textdomain(PACKAGE);
+ if (name != "-")
+ {
+ if (fd.Open(name, FileFd::ReadOnly, FileFd::Extension) == false)
+ return false;
+ }
+ else
+ {
+ if (fd.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly) == false)
+ return false;
+ }
- // Parse the command line and initialize the package library
+ if (CopyFile(fd, out) == 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;
+}
+ /*}}}*/
+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[]) /*{{{*/
+{
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);
}
/*}}}*/
projects / apt.git / blobdiff