Added some initial debtags data.

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

diff --git a/cmdline/apt-get.cc.orig b/cmdline/apt-get.cc.orig
index f623710886b3ef566a312201fef54989e4e920cb..04791b5786f882f375dce477694bc46164b3024f 100644 (file)
--- a/cmdline/apt-get.cc.orig
+++ b/cmdline/apt-get.cc.orig
@@ -66,12 +66,13 @@ extern "C" {
 #include <sys/wait.h>
                                                                        /*}}}*/
 
 #include <sys/wait.h>
                                                                        /*}}}*/
 

+#define _trace() printf("_trace(%s:%d)\n", __FILE__, __LINE__)
+

 using namespace std;
 
 ostream c0out(0);
 ostream c1out(0);
 ostream c2out(0);
 using namespace std;
 
 ostream c0out(0);
 ostream c1out(0);
 ostream c2out(0);

-ofstream devnull("/dev/null");

 unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */
 
 // class CacheFile - Cover class for some dependency cache functions   /*{{{*/
 unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */
 
 // class CacheFile - Cover class for some dependency cache functions   /*{{{*/


@@ -2507,12 +2508,14 @@ void SigWinch(int)
 
 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));
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   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;
    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},
 
    CommandLine::Args Args[] = {
       {'h',"help","help",0},


@@ -2571,7 +2574,7 @@ int main(int argc,const char *argv[])
 
    // Set up gettext support
    setlocale(LC_ALL,"");
 
    // Set up gettext support
    setlocale(LC_ALL,"");

-   textdomain(PACKAGE);
+   //textdomain(PACKAGE);

 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);


@@ -2599,6 +2602,9 @@ int main(int argc,const char *argv[])
    if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
       _config->Set("quiet","1");
 
    if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
       _config->Set("quiet","1");
 

+   ofstream devnull;
+   devnull.open("/dev/null");
+

    // Setup the output streams
    c0out.rdbuf(cout.rdbuf());
    c1out.rdbuf(cout.rdbuf());
    // Setup the output streams
    c0out.rdbuf(cout.rdbuf());
    c1out.rdbuf(cout.rdbuf());