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 eb096440a2fca88448896b7e974979c536c27988..69485de9091f2e4c908404a3f5a0eec99255aba7 100644 (file)
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -76,23 +76,17 @@ static bool DoDump(CommandLine &CmdL)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-bool ShowHelp(CommandLine &, aptDispatchWithHelp const * Cmds)         /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
    std::cout <<
       _("Usage: apt-config [options] command\n"
       "\n"
 {
    std::cout <<
       _("Usage: apt-config [options] command\n"
       "\n"

-      "apt-config is a simple tool to read the APT config file\n")
-      << std::endl;
-   ShowHelpListCommands(Cmds);
-   std::cout << std::endl <<
-      _("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");
+      "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;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
       {"shell", &DoShell, _("get configuration values via shell evaluation")},
 {
    return {
       {"shell", &DoShell, _("get configuration values via shell evaluation")},


@@ -107,7 +101,7 @@ int main(int argc,const char *argv[])                                       /*{{{*/
 
    // Parse the command line and initialize the package library
    CommandLine CmdL;
 
    // Parse the command line and initialize the package library
    CommandLine CmdL;

-   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CONFIG, &_config, &_system, argc, argv);
+   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");