more explicit MarkRequired algorithm code

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

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index c5c37d122e506a2f825456f4a259e749ba80fca4..a4468b9893eb7016ca7d7fa637a6e7d4b7fd4c70 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -215,25 +215,14 @@ bool DebFile::ParseInfo()
        return true;
 }
                                                                        /*}}}*/
        return true;
 }
                                                                        /*}}}*/

-// ShowHelp - show a short help text                                   /*{{{*/
-bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const *)
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
 {

-       ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
-
-       if (_config->FindB("version") == true)
-               return true;
-

        cout <<
                _("Usage: apt-extracttemplates file1 [file2 ...]\n"
                "\n"
        cout <<
                _("Usage: apt-extracttemplates file1 [file2 ...]\n"
                "\n"

-               "apt-extracttemplates is a tool to extract config and template info\n"
-               "from debian packages\n"
-               "\n"
-               "Options:\n"
-               "  -h   This help text\n"
-               "  -t   Set the temp dir\n"
-               "  -c=? Read this configuration file\n"
-               "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
+               "apt-extracttemplates is used to extract config and template files\n"
+               "from debian packages. It is used mainly by debconf(1) to prompt for\n"
+               "configuration questions before installation of packages.\n");

        return true;
 }
                                                                        /*}}}*/
        return true;
 }
                                                                        /*}}}*/


@@ -341,7 +330,7 @@ static bool Go(CommandLine &CmdL)
        return !_error->PendingError();
 }
                                                                        /*}}}*/
        return !_error->PendingError();
 }
                                                                        /*}}}*/

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

 {
    return {
        {nullptr, nullptr, nullptr}
 {
    return {
        {nullptr, nullptr, nullptr}


@@ -350,10 +339,8 @@ std::vector<CommandLine::DispatchWithHelp> GetCommands()           /*{{{*/
                                                                        /*}}}*/
 int main(int argc, const char **argv)                                  /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc, const char **argv)                                  /*{{{*/
 {

-       InitLocale();
-

        CommandLine CmdL;
        CommandLine CmdL;

-       auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_EXTRACTTEMPLATES, &_config, &_system, argc, argv);
+       auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_EXTRACTTEMPLATES, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);

 
        Go(CmdL);
 
 
        Go(CmdL);