* debian/apt.cron.daily:

[apt.git] / cmdline / apt-config.cc

diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 5d4efdcbc075c79e19d656e586ea72ad6c2d20df..9919a9c949be91f64eb584ad76844dbb93cc3b52 100644 (file)
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-config.cc,v 1.8 2002/01/09 04:59:44 jgg Exp $
+// $Id: apt-config.cc,v 1.11 2003/01/11 07:18:44 jgg Exp $

 /* ######################################################################
    
    APT Config - Program to manipulate APT configuration files
 /* ######################################################################
    
    APT Config - Program to manipulate APT configuration files


@@ -23,10 +23,12 @@
 
 #include <config.h>
 #include <apti18n.h>
 
 #include <config.h>
 #include <apti18n.h>

-    
+
+#include <locale.h>

 #include <iostream>
 #include <string>
                                                                        /*}}}*/
 #include <iostream>
 #include <string>
                                                                        /*}}}*/

+using namespace std;

 
 // DoShell - Handle the shell command                                  /*{{{*/
 // ---------------------------------------------------------------------
 
 // DoShell - Handle the shell command                                  /*{{{*/
 // ---------------------------------------------------------------------


@@ -56,7 +58,7 @@ bool DoShell(CommandLine &CmdL)
 /* */
 bool DoDump(CommandLine &CmdL)
 {
 /* */
 bool DoDump(CommandLine &CmdL)
 {

-   _config->Dump();
+   _config->Dump(cout);

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -65,8 +67,8 @@ bool DoDump(CommandLine &CmdL)
 /* */
 int ShowHelp()
 {
 /* */
 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;
    
    if (_config->FindB("version") == true)
       return 0;
    


@@ -82,12 +84,11 @@ int ShowHelp()
       "Options:\n"
       "  -h   This help text.\n" 
       "  -c=? Read this configuration file\n" 
       "Options:\n"
       "  -h   This help text.\n" 
       "  -c=? Read this configuration file\n" 

-      "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n");
+      "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");

    return 0;
 }
                                                                        /*}}}*/
    return 0;
 }
                                                                        /*}}}*/

-
-int main(int argc,const char *argv[])
+int main(int argc,const char *argv[])                                  /*{{{*/

 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},


@@ -131,3 +132,4 @@ int main(int argc,const char *argv[])
    
    return 0;
 }
    
    return 0;
 }

+                                                                       /*}}}*/