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 82729b2f00ea5581b7c515c34e776d4cd7bef58a..de22386b9fbefc696678c084d2a779846feae874 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -1,7 +1,3 @@
-extern "C" {
-    #include <mach-o/nlist.h>
-}
-
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // $Id: apt-extracttemplates.cc,v 1.15 2003/07/26 00:00:11 mdz Exp $
@@ -226,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;
@@ -253,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)
@@ -355,13 +351,6 @@ bool Go(CommandLine &CmdL)
 
 int main(int argc, const char **argv)
 {
-   struct nlist nl[2];
-   memset(nl, 0, sizeof(nl));
-   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
-   nlist("/usr/lib/libc.dylib", nl);
-   if (nl[0].n_type != N_UNDF)
-       *(int *) nl[0].n_value = 0;
-
        CommandLine::Args Args[] = {
                {'h',"help","help",0},
                {'v',"version","version",0},
@@ -372,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);