X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/7e72625549527d9c2db6abceb400f128ca4e85c9..8e4c3f0a42664b8c37cc2e0de285849fbf118e11:/cmdline/apt-extracttemplates.cc diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 0f7242e98..8fe15fdf9 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-extracttemplates.cc,v 1.4 2001/02/27 04:26:03 jgg Exp $ +// $Id: apt-extracttemplates.cc,v 1.15 2003/07/26 00:00:11 mdz Exp $ /* ###################################################################### APT Extract Templates - Program to extract debconf config and template @@ -13,6 +13,8 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include + #include #include #include @@ -27,19 +29,25 @@ #include #include #include - +#include +#include + #include #include #include #include +#include + #include -#include -#include #include "apt-extracttemplates.h" + +#include /*}}}*/ -#define TMPDIR "/var/lib/debconf/" +using namespace std; + +#define TMPDIR "/tmp" pkgCache *DebFile::Cache = 0; @@ -47,8 +55,8 @@ pkgCache *DebFile::Cache = 0; // --------------------------------------------------------------------- /* */ DebFile::DebFile(const char *debfile) - : File(debfile, FileFd::ReadOnly), Control(0), DepOp(0), - PreDepOp(0), Config(0), Template(0), Which(None) + : File(debfile, FileFd::ReadOnly), Size(0), Control(NULL), ControlLen(0), + DepOp(0), PreDepOp(0), Config(0), Template(0), Which(None) { } /*}}}*/ @@ -95,7 +103,7 @@ bool DebFile::Go() if (File.Seek(Member->Start) == false) return false; - ExtractTar Tar(File, Member->Size); + ExtractTar Tar(File, Member->Size,"gzip"); return Tar.Go(*this); } /*}}}*/ @@ -218,8 +226,8 @@ bool DebFile::ParseInfo() /* */ int ShowHelp(void) { - 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,PACKAGE_VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return 0; @@ -234,28 +242,38 @@ int ShowHelp(void) " -h This help text\n" " -t Set the temp dir\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; } /*}}}*/ // WriteFile - write the contents of the passed string to a file /*{{{*/ // --------------------------------------------------------------------- /* */ -string WriteFile(const char *prefix, const char *data) +string WriteFile(const char *package, const char *prefix, const char *data) { char fn[512]; static int i; - snprintf(fn, sizeof(fn), "%s%s.%u%d", _config->Find("APT::ExtractTemplates::TempDir", TMPDIR).c_str(), prefix, getpid(), i++); + const char *tempdir = NULL; + + tempdir = getenv("TMPDIR"); + if (tempdir == NULL) + tempdir = TMPDIR; + + snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d", + _config->Find("APT::ExtractTemplates::TempDir", tempdir).c_str(), + package, prefix, getpid(), i++); + FileFd f; + if (data == NULL) + data = ""; - ofstream ofs(fn); - if (!ofs) + if (!f.Open(fn, FileFd::WriteTemp, 0600)) { _error->Errno("ofstream::ofstream",_("Unable to write to %s"),fn); return string(); } - ofs << (data ? data : ""); - ofs.close(); + f.Write(data, strlen(data)); + f.Close(); return fn; } /*}}}*/ @@ -264,8 +282,8 @@ string WriteFile(const char *prefix, const char *data) /* */ void WriteConfig(const DebFile &file) { - string templatefile = WriteFile("template", file.Template); - string configscript = WriteFile("config", file.Config); + string templatefile = WriteFile(file.Package.c_str(), "template", file.Template); + string configscript = WriteFile(file.Package.c_str(), "config", file.Config); if (templatefile.empty() == true || configscript.empty() == true) return; @@ -282,8 +300,9 @@ bool Go(CommandLine &CmdL) MMap *Map = 0; pkgSourceList List; List.ReadMainList(); - OpProgress Prog; - pkgMakeStatusCache(List,Prog,&Map,true); + pkgCacheGenerator::MakeStatusCache(List,NULL,&Map,true); + if (Map == 0) + return false; DebFile::Cache = new pkgCache(Map); if (_error->PendingError() == true) return false; @@ -299,20 +318,26 @@ bool Go(CommandLine &CmdL) // Will pick up the errors later.. DebFile file(CmdL.FileList[I]); if (file.Go() == false) - continue; - + { + _error->Error("Prior errors apply to %s",CmdL.FileList[I]); + continue; + } + // Does the package have templates? if (file.Template != 0 && file.ParseInfo() == true) { // Check to make sure debconf dependencies are // satisfied + // cout << "Check " << file.DepVer << ',' << debconfver << endl; if (file.DepVer != "" && - DebFile::Cache->VS->CheckDep(file.DepVer.c_str(), - file.DepOp, debconfver.c_str()) == false) + DebFile::Cache->VS->CheckDep(debconfver.c_str(), + file.DepOp,file.DepVer.c_str() + ) == false) continue; if (file.PreDepVer != "" && - DebFile::Cache->VS->CheckDep(file.PreDepVer.c_str(), - file.PreDepOp, debconfver.c_str()) == false) + DebFile::Cache->VS->CheckDep(debconfver.c_str(), + file.PreDepOp,file.PreDepVer.c_str() + ) == false) continue; WriteConfig(file); @@ -326,8 +351,7 @@ bool Go(CommandLine &CmdL) return !_error->PendingError(); } /*}}}*/ - -int main(int argc, const char **argv) +int main(int argc, const char **argv) /*{{{*/ { CommandLine::Args Args[] = { {'h',"help","help",0}, @@ -336,7 +360,11 @@ int main(int argc, const char **argv) {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,0,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 (pkgInitConfig(*_config) == false || @@ -365,3 +393,4 @@ int main(int argc, const char **argv) return 0; } + /*}}}*/