Fixed some dependencies, removed mDNS fix for 2.0, and factored for multi-arch support.

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 8628dbc726181924cb5491df1dfa0fd235e9470a..04791b5786f882f375dce477694bc46164b3024f 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,3 +1,7 @@
+extern "C" {
+    #include <mach-o/nlist.h>
+}
+
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // $Id: apt-get.cc,v 1.156 2004/08/28 01:05:16 mdz Exp $
@@ -2502,12 +2506,17 @@ void SigWinch(int)
 }
                                                                        /*}}}*/
 
-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[])
 {
+#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},
@@ -2593,7 +2602,8 @@ int main_(int argc,const char *argv[])
    if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
       _config->Set("quiet","1");
 
-   ofstream devnull("/dev/null");
+   ofstream devnull;
+   devnull.open("/dev/null");
 
    // Setup the output streams
    c0out.rdbuf(cout.rdbuf());