deal with --version more centrally

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

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 3e4f8928680920a419d3c57860e3d426383bb5f2..b63f2ff1610f092c2dc2ab39a782c4e044a4e49b 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -34,6 +34,7 @@
 #include <apt-pkg/mmap.h>
 
 #include <apt-private/private-cmndline.h>
+#include <apt-private/private-main.h>
 
 #include <iostream>
 #include <stdio.h>
@@ -214,16 +215,8 @@ bool DebFile::ParseInfo()
        return true;
 }
                                                                        /*}}}*/
-// ShowHelp - show a short help text                                   /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowHelp(CommandLine &)
+bool ShowHelp(CommandLine &, aptDispatchWithHelp const *)              /*{{{*/
 {
-       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"
@@ -342,36 +335,22 @@ static bool Go(CommandLine &CmdL)
        return !_error->PendingError();
 }
                                                                        /*}}}*/
+std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+{
+   return {
+       {nullptr, nullptr, nullptr}
+   };
+}
+                                                                       /*}}}*/
 int main(int argc, const char **argv)                                  /*{{{*/
 {
-       CommandLine::Args Args[] = {
-               {'h',"help","help",0},
-               {'v',"version","version",0},
-               {'t',"tempdir","APT::ExtractTemplates::TempDir",CommandLine::HasArg},
-               {'c',"config-file",0,CommandLine::ConfigFile},
-               {'o',"option",0,CommandLine::ArbItem},
-               {0,0,0,0}};
-
-       // Set up gettext support
-       setlocale(LC_ALL,"");
-       textdomain(PACKAGE);
+       InitLocale();
 
-       // Parse the command line and initialize the package library
-       CommandLine::Dispatch Cmds[] = {{NULL, NULL}};
        CommandLine CmdL;
-       ParseCommandLine(CmdL, Cmds, Args, &_config, &_system, argc, argv, ShowHelp);
+       auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_EXTRACTTEMPLATES, &_config, &_system, argc, argv);
 
        Go(CmdL);
 
-       // Print any errors or warnings found during operation
-       if (_error->empty() == false)
-       {
-               // This goes to stderr..
-               bool Errors = _error->PendingError();
-               _error->DumpErrors();
-               return Errors == true?100:0;
-       }
-       
-       return 0;
+       return DispatchCommandLine(CmdL, {});
 }
                                                                        /*}}}*/