X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/58d4a28e10d689ccbf3087c870be0fc2d2a37ee1..0fb16c3e678044d6d06ba8a6199b1e96487ee0d8:/cmdline/apt-config.cc diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 589ee7ada..adec8dda4 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -8,7 +8,7 @@ This program will parse a config file and then do something with it. Commands: - shell - Shell mode. After this a series of word pairs should occure. + shell - Shell mode. After this a series of word pairs should occur. The first is the environment var to set and the second is the key to set it from. Use like: eval `apt-config shell QMode apt::QMode` @@ -16,27 +16,33 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include + #include #include #include #include #include #include +#include -#include -#include - -#include #include #include #include +#include +#include + +#include +#include + +#include /*}}}*/ using namespace std; // DoShell - Handle the shell command /*{{{*/ // --------------------------------------------------------------------- /* */ -bool DoShell(CommandLine &CmdL) +static bool DoShell(CommandLine &CmdL) { for (const char **I = CmdL.FileList + 1; *I != 0; I += 2) { @@ -59,68 +65,42 @@ bool DoShell(CommandLine &CmdL) // DoDump - Dump the configuration space /*{{{*/ // --------------------------------------------------------------------- /* */ -bool DoDump(CommandLine &CmdL) +static bool DoDump(CommandLine &CmdL) { - _config->Dump(cout); + bool const empty = _config->FindB("APT::Config::Dump::EmptyValue", true); + std::string const format = _config->Find("APT::Config::Dump::Format", "%f \"%v\";\n"); + if (CmdL.FileSize() == 1) + _config->Dump(cout, NULL, format.c_str(), empty); + else + for (const char **I = CmdL.FileList + 1; *I != 0; ++I) + _config->Dump(cout, *I, format.c_str(), empty); return true; } /*}}}*/ -// ShowHelp - Show the help screen /*{{{*/ -// --------------------------------------------------------------------- -/* */ -int ShowHelp() +static bool ShowHelp(CommandLine &) /*{{{*/ { - ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_ARCH,__DATE__,__TIME__); - if (_config->FindB("version") == true) - return 0; - - cout << - _("Usage: apt-config [options] command\n" - "\n" - "apt-config is a simple tool to read the APT config file\n" + std::cout << + _("Usage: apt-config [options] command\n" "\n" - "Commands:\n" - " shell - Shell mode\n" - " dump - Show the configuration\n" - "\n" - "Options:\n" - " -h This help text.\n" - " -c=? Read this configuration file\n" - " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"); - return 0; + "apt-config is an interface to the configuration settings used by\n" + "all APT tools, mainly intended for debugging and shell scripting.\n"); + return true; +} + /*}}}*/ +static std::vector GetCommands() /*{{{*/ +{ + return { + {"shell", &DoShell, _("get configuration values via shell evaluation")}, + {"dump", &DoDump, _("show the active configuration setting")}, + {nullptr, nullptr, nullptr} + }; } /*}}}*/ int main(int argc,const char *argv[]) /*{{{*/ { - CommandLine::Args Args[] = { - {'h',"help","help",0}, - {'v',"version","version",0}, - {'c',"config-file",0,CommandLine::ConfigFile}, - {'o',"option",0,CommandLine::ArbItem}, - {0,0,0,0}}; - CommandLine::Dispatch Cmds[] = {{"shell",&DoShell}, - {"dump",&DoDump}, - {0,0}}; - - // Set up gettext support - setlocale(LC_ALL,""); - textdomain(PACKAGE); - // Parse the command line and initialize the package library - CommandLine CmdL(Args,_config); - if (pkgInitConfig(*_config) == false || - CmdL.Parse(argc,argv) == false || - pkgInitSystem(*_config,_system) == false) - { - _error->DumpErrors(); - return 100; - } - - // See if the help should be shown - if (_config->FindB("help") == true || - CmdL.FileSize() == 0) - return ShowHelp(); + CommandLine CmdL; + auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CONFIG, &_config, &_system, argc, argv, &ShowHelp, &GetCommands); std::vector const langs = APT::Configuration::getLanguages(true); _config->Clear("Acquire::Languages"); @@ -132,17 +112,34 @@ int main(int argc,const char *argv[]) /*{{{*/ for (std::vector::const_iterator a = archs.begin(); a != archs.end(); ++a) _config->Set("APT::Architectures::", *a); - // Match the operation - CmdL.DispatchArg(Cmds); - - // Print any errors or warnings found during parsing - if (_error->empty() == false) + string const conf = "APT::Compressor::"; + std::map CompressorNames; + for (auto && key : _config->FindVector("APT::Compressor", "", true)) { - bool Errors = _error->PendingError(); - _error->DumpErrors(); - return Errors == true?100:0; + auto const comp = conf + key + "::Name"; + CompressorNames.emplace(_config->Find(comp, key), key); } - - return 0; + std::vector const compressors = APT::Configuration::getCompressors(); + _config->Clear("APT::Compressor"); + for (std::vector::const_iterator c = compressors.begin(); c != compressors.end(); ++c) + { + auto const n = CompressorNames.find(c->Name); + string comp = conf + (n == CompressorNames.end() ? c->Name : n->second) + "::"; + _config->Set(comp + "Name", c->Name); + _config->Set(comp + "Extension", c->Extension); + _config->Set(comp + "Binary", c->Binary); + _config->Set(std::string(comp + "Cost").c_str(), c->Cost); + for (std::vector::const_iterator a = c->CompressArgs.begin(); a != c->CompressArgs.end(); ++a) + _config->Set(comp + "CompressArg::", *a); + for (std::vector::const_iterator a = c->UncompressArgs.begin(); a != c->UncompressArgs.end(); ++a) + _config->Set(comp + "UncompressArg::", *a); + } + + std::vector const profiles = APT::Configuration::getBuildProfiles(); + _config->Clear("APT::Build-Profiles"); + for (std::vector::const_iterator p = profiles.begin(); p != profiles.end(); ++p) + _config->Set("APT::Build-Profiles::", *p); + + return DispatchCommandLine(CmdL, Cmds); } /*}}}*/