Fixed URLs with +'s not downloading from CDN.

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

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index b2d210a9709155e4c5d918d1cd8af35484a33cdb..363148ec350391c4581314a2168eac9cec58df1c 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,3 +1,7 @@
+extern "C" {
+    #include <mach-o/nlist.h>
+}
+
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // $Id: apt-cache.cc,v 1.72 2004/04/30 04:34:03 mdz Exp $
@@ -1649,8 +1653,8 @@ bool GenCaches(CommandLine &Cmd)
 /* */
 bool ShowHelp(CommandLine &Cmd)
 {
-   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 %s\n"),PACKAGE,VERSION,
+           COMMON_OS,COMMON_CPU);
    
    if (_config->FindB("version") == true)
      return true;
@@ -1704,12 +1708,17 @@ void CacheInitialize()
 }
                                                                        /*}}}*/
 
-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},