X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e42eb508e01f4de6def088fe941344d3ca733fa5..6724d2173133f24bc8a3875c13513761f9340627:/cmdline/apt-config.cc diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index c626a1ee0..34365dc2e 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-config.cc,v 1.5 1999/05/23 05:45:12 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 @@ -19,10 +19,16 @@ #include #include #include -#include "config.h" +#include +#include +#include + +#include #include +#include /*}}}*/ +using namespace std; // DoShell - Handle the shell command /*{{{*/ // --------------------------------------------------------------------- @@ -32,22 +38,27 @@ bool DoShell(CommandLine &CmdL) for (const char **I = CmdL.FileList + 1; *I != 0; I += 2) { if (I[1] == 0 || strlen(I[1]) == 0) - return _error->Error("Arguments not in pairs"); + return _error->Error(_("Arguments not in pairs")); + + string key = I[1]; + if (key.end()[-1] == '/') // old directory format + key.append("d"); - // Check if the caller has requested a directory path - if (I[1][strlen(I[1])-1] == '/') - { - char S[300]; - strcpy(S,I[1]); - S[strlen(S)-1] = 0; - if (_config->Exists(S) == true) - cout << *I << "=\"" << _config->FindDir(S) << '"' << endl; - } + if (_config->ExistsAny(key.c_str())) + cout << *I << "='" << + SubstVar(_config->FindAny(key.c_str()),"'","'\\''") << '\'' << endl; - if (_config->Exists(I[1]) == true) - cout << *I << "=\"" << _config->Find(I[1]) << '"' << endl; } + return true; +} + /*}}}*/ +// DoDump - Dump the configuration space /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool DoDump(CommandLine &CmdL) +{ + _config->Dump(cout); return true; } /*}}}*/ @@ -56,23 +67,25 @@ bool DoShell(CommandLine &CmdL) /* */ int ShowHelp() { - cout << PACKAGE << ' ' << VERSION << " for " << ARCHITECTURE << - " compiled on " << __DATE__ << " " << __TIME__ << endl; + ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_OS,COMMON_CPU,__DATE__,__TIME__); if (_config->FindB("version") == true) - return 100; + return 0; - cout << "Usage: apt-config [options] command" << endl; - cout << endl; - cout << "apt-config is a simple tool to read the APT config file" << endl; - cout << endl; - cout << "Commands:" << endl; - cout << " shell - Shell mode" << endl; - cout << endl; - cout << "Options:" << endl; - cout << " -h This help text." << endl; - cout << " -c=? Read this configuration file" << endl; - cout << " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp" << endl; - return 100; + cout << + _("Usage: apt-config [options] command\n" + "\n" + "apt-config is a simple tool to read the APT config file\n" + "\n" + "Commands:\n" + " shell - Shell mode\n" + " dump - Show the configuration\n" + "\n" + "Options:\n" + " -h This help text.\n" + " -c=? Read this configuration file\n" + " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"); + return 0; } /*}}}*/ @@ -85,12 +98,18 @@ int main(int argc,const char *argv[]) {'o',"option",0,CommandLine::ArbItem}, {0,0,0,0}}; CommandLine::Dispatch Cmds[] = {{"shell",&DoShell}, + {"dump",&DoDump}, {0,0}}; - + + // Set up gettext support + setlocale(LC_ALL,""); + textdomain(PACKAGE); + // Parse the command line and initialize the package library CommandLine CmdL(Args,_config); - if (pkgInitialize(*_config) == false || - CmdL.Parse(argc,argv) == false) + if (pkgInitConfig(*_config) == false || + CmdL.Parse(argc,argv) == false || + pkgInitSystem(*_config,_system) == false) { _error->DumpErrors(); return 100;