Commit that APT bug fix from their bug tracker.

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

diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index bec90aeaf3e58771ff95504f73aa0efcbbb6ecb3..171b0ba13d86ca2d9808320a59847af03afb94ad 100644 (file)
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -1,7 +1,3 @@
-extern "C" {
-    #include <mach-o/nlist.h>
-}
-
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // $Id: apt-sortpkgs.cc,v 1.5 2003/01/11 07:18:44 jgg Exp $
@@ -35,7 +31,7 @@ extern "C" {
 
 using namespace std;
 
-struct PkgName
+struct PkgName                                                         /*{{{*/
 {
    string Name;
    string Ver;
@@ -59,7 +55,7 @@ struct PkgName
    bool operator >(const PkgName &x) const {return Compare3(x) > 0;};
    bool operator ==(const PkgName &x) const {return Compare3(x) == 0;};
 };
-
+                                                                       /*}}}*/
 // DoIt - Sort a single file                                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -145,8 +141,8 @@ bool DoIt(string InFile)
 /* */
 int ShowHelp()
 {
-   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;
    
@@ -165,18 +161,8 @@ int ShowHelp()
    return 0;
 }
                                                                        /*}}}*/
-
-int main(unsigned int argc,const char *argv[])
+int main(int argc,const char *argv[])                                  /*{{{*/
 {
-#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
-   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;
-#endif
-
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
       {'v',"version","version",0},
@@ -187,7 +173,7 @@ int main(unsigned 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);
@@ -219,3 +205,4 @@ int main(unsigned int argc,const char *argv[])
    
    return 0;   
 }
+                                                                       /*}}}*/