Various things I forgot to commit.

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

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index fa102b5e9a0b9440ef1aae578554d0a22c6b8647..de22386b9fbefc696678c084d2a779846feae874 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -222,8 +222,8 @@ bool DebFile::ParseInfo()
 /* */
 int ShowHelp(void)
 {
-       ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+       ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+           COMMON_ARCH,__DATE__,__TIME__);
 
        if (_config->FindB("version") == true) 
                return 0;
@@ -249,7 +249,7 @@ string WriteFile(const char *package, const char *prefix, const char *data)
 {
        char fn[512];
        static int i;
-        char *tempdir = NULL;
+       const char *tempdir = NULL;
 
         tempdir = getenv("TMPDIR");
         if (tempdir == NULL)
@@ -349,11 +349,7 @@ bool Go(CommandLine &CmdL)
 }
                                                                        /*}}}*/
 
-int main_(int argc,const char *argv[]);
-int main(int argc,const char *argv[]) {
-    _exit(main_(argc, argv));
-}
-int main_(int argc,const char *argv[])
+int main(int argc, const char **argv)
 {
        CommandLine::Args Args[] = {
                {'h',"help","help",0},
@@ -365,7 +361,7 @@ int main_(int argc,const char *argv[])
 
        // Set up gettext support
        setlocale(LC_ALL,"");
-       //textdomain(PACKAGE);
+       textdomain(PACKAGE);
 
        // Parse the command line and initialize the package library
        CommandLine CmdL(Args,_config);