fix Alt-Filename handling of file method

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

diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 397ce32df71bead27ca4f62eb0b0ad280271e2c4..69485de9091f2e4c908404a3f5a0eec99255aba7 100644 (file)
--- 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:
    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`
              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`


@@ -26,10 +26,13 @@
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/pkgsystem.h>
 
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/pkgsystem.h>
 

-#include <locale.h>

 #include <iostream>
 #include <string>
 #include <vector>
 #include <iostream>
 #include <string>
 #include <vector>

+#include <string.h>
+
+#include <apt-private/private-cmndline.h>
+#include <apt-private/private-main.h>

 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/


@@ -38,7 +41,7 @@ using namespace std;
 // DoShell - Handle the shell command                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // 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)
    {
 {
    for (const char **I = CmdL.FileList + 1; *I != 0; I += 2)
    {


@@ -61,7 +64,7 @@ bool DoShell(CommandLine &CmdL)
 // DoDump - Dump the configuration space                               /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // DoDump - Dump the configuration space                               /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool DoDump(CommandLine &CmdL)
+static bool DoDump(CommandLine &CmdL)

 {
    bool const empty = _config->FindB("APT::Config::Dump::EmptyValue", true);
    std::string const format = _config->Find("APT::Config::Dump::Format", "%f \"%v\";\n");
 {
    bool const empty = _config->FindB("APT::Config::Dump::EmptyValue", true);
    std::string const format = _config->Find("APT::Config::Dump::Format", "%f \"%v\";\n");


@@ -73,64 +76,32 @@ bool DoDump(CommandLine &CmdL)
    return true;
 }
                                                                        /*}}}*/
    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,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"
       "\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<aptDispatchWithHelp> 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[])                                  /*{{{*/
 {
 }
                                                                        /*}}}*/
 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,"empty","APT::Config::Dump::EmptyValue",CommandLine::Boolean},
-      {0,"format","APT::Config::Dump::Format",CommandLine::HasArg},
-      {0,0,0,0}};
-   CommandLine::Dispatch Cmds[] = {{"shell",&DoShell},
-                                   {"dump",&DoDump},
-                                   {0,0}};
-
-   // Set up gettext support
-   setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
+   InitLocale();

 
    // Parse the command line and initialize the package library
 
    // 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<std::string> const langs = APT::Configuration::getLanguages(true);
    _config->Clear("Acquire::Languages");
 
    std::vector<std::string> const langs = APT::Configuration::getLanguages(true);
    _config->Clear("Acquire::Languages");


@@ -158,17 +129,11 @@ int main(int argc,const char *argv[])                                     /*{{{*/
         _config->Set(comp + "UncompressArg::", *a);
    }
 
         _config->Set(comp + "UncompressArg::", *a);
    }
 

-   // Match the operation
-   CmdL.DispatchArg(Cmds);
-   
-   // Print any errors or warnings found during parsing
-   if (_error->empty() == false)
-   {
-      bool Errors = _error->PendingError();
-      _error->DumpErrors();
-      return Errors == true?100:0;
-   }
-   
-   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);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/