X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/73eb1788912790f19d42d8c95b98fcb5760fbbdf..27f38567fe327ecaf7fb361c3cca6ee29e6300c9:/cmdline/apt-config.cc

diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 63fa0867c..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,24 +16,33 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/pkgsystem.h>
 
-#include <config.h>
-#include <apti18n.h>
-
-#include <locale.h>
 #include <iostream>
 #include <string>
+#include <vector>
+#include <map>
+#include <string.h>
+
+#include <apt-private/private-cmndline.h>
+#include <apt-private/private-main.h>
+
+#include <apti18n.h>
 									/*}}}*/
 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)
    {
@@ -56,80 +65,81 @@ 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;
 }
 									/*}}}*/
-
-int main(int argc,const char *argv[])
+static std::vector<aptDispatchWithHelp> GetCommands()			/*{{{*/
 {
-   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}};
+   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[])					/*{{{*/
+{
+   // Parse the command line and initialize the package library
+   CommandLine CmdL;
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CONFIG, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 
-   // Set up gettext support
-   setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
+   std::vector<std::string> const langs = APT::Configuration::getLanguages(true);
+   _config->Clear("Acquire::Languages");
+   for (std::vector<std::string>::const_iterator l = langs.begin(); l != langs.end(); ++l)
+      _config->Set("Acquire::Languages::", *l);
 
-   // 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)
+   std::vector<std::string> const archs = APT::Configuration::getArchitectures();
+   _config->Clear("APT::Architectures");
+   for (std::vector<std::string>::const_iterator a = archs.begin(); a != archs.end(); ++a)
+      _config->Set("APT::Architectures::", *a);
+
+   string const conf = "APT::Compressor::";
+   std::map<std::string,std::string> CompressorNames;
+   for (auto && key : _config->FindVector("APT::Compressor", "", true))
    {
-      _error->DumpErrors();
-      return 100;
+      auto const comp = conf + key + "::Name";
+      CompressorNames.emplace(_config->Find(comp, key), key);
    }
-
-   // See if the help should be shown
-   if (_config->FindB("help") == true ||
-       CmdL.FileSize() == 0)
-      return ShowHelp();
-
-   // Match the operation
-   CmdL.DispatchArg(Cmds);
-   
-   // Print any errors or warnings found during parsing
-   if (_error->empty() == false)
+   std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
+   _config->Clear("APT::Compressor");
+   for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin(); c != compressors.end(); ++c)
    {
-      bool Errors = _error->PendingError();
-      _error->DumpErrors();
-      return Errors == true?100:0;
+      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<std::string>::const_iterator a = c->CompressArgs.begin(); a != c->CompressArgs.end(); ++a)
+	 _config->Set(comp + "CompressArg::", *a);
+      for (std::vector<std::string>::const_iterator a = c->UncompressArgs.begin(); a != c->UncompressArgs.end(); ++a)
+	 _config->Set(comp + "UncompressArg::", *a);
    }
-   
-   return 0;
+
+   std::vector<std::string> const profiles = APT::Configuration::getBuildProfiles();
+   _config->Clear("APT::Build-Profiles");
+   for (std::vector<std::string>::const_iterator p = profiles.begin(); p != profiles.end(); ++p)
+      _config->Set("APT::Build-Profiles::", *p);
+
+   return DispatchCommandLine(CmdL, Cmds);
 }
+									/*}}}*/