merge debian/sid into debian/experimental

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

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index f95b9e5ba2eff3ec8943127a60f317541cec89d1..5211ee027e9af25d4374fd3d1939e2d9b6f18383 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -33,6 +33,8 @@
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/mmap.h>
 
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/mmap.h>
 

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

 #include <iostream>
 #include <stdio.h>
 #include <string.h>
 #include <iostream>
 #include <stdio.h>
 #include <string.h>


@@ -215,15 +217,15 @@ bool DebFile::ParseInfo()
 // ShowHelp - show a short help text                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowHelp - show a short help text                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-static int ShowHelp(void)
+static bool ShowHelp(CommandLine &)

 {
 {

-       ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
+       ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,

            COMMON_ARCH,__DATE__,__TIME__);
 
            COMMON_ARCH,__DATE__,__TIME__);
 

-       if (_config->FindB("version") == true) 
-               return 0;
+       if (_config->FindB("version") == true)
+               return true;

 
 

-       cout << 
+       cout <<

                _("Usage: apt-extracttemplates file1 [file2 ...]\n"
                "\n"
                "apt-extracttemplates is a tool to extract config and template info\n"
                _("Usage: apt-extracttemplates file1 [file2 ...]\n"
                "\n"
                "apt-extracttemplates is a tool to extract config and template info\n"


@@ -234,7 +236,7 @@ static int ShowHelp(void)
                "  -t   Set the temp dir\n"
                "  -c=? Read this configuration file\n"
                "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\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");

-       return 0;
+       return true;

 }
                                                                        /*}}}*/
 // WriteFile - write the contents of the passed string to a file       /*{{{*/
 }
                                                                        /*}}}*/
 // WriteFile - write the contents of the passed string to a file       /*{{{*/


@@ -356,20 +358,10 @@ int main(int argc, const char **argv)                                     /*{{{*/
        textdomain(PACKAGE);
 
        // Parse the command line and initialize the package library
        textdomain(PACKAGE);
 
        // 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::Dispatch Cmds[] = {{NULL, NULL}};
+       CommandLine CmdL;
+       ParseCommandLine(CmdL, Cmds, Args, &_config, &_system, argc, argv, ShowHelp);
+

        Go(CmdL);
 
        // Print any errors or warnings found during operation
        Go(CmdL);
 
        // Print any errors or warnings found during operation