merged the relevant bits from lp:~mvo/apt/lp346386

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

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index c2b4b1a50e3e82a9a2903b9d3d38529ad8eab7ad..8fe15fdf928dc57be8323204aba42611dff856be 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-extracttemplates.cc,v 1.3 2001/02/25 05:25:29 tausq 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
 /* ######################################################################
    
    APT Extract Templates - Program to extract debconf config and template


@@ -13,9 +13,10 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include<config.h>
+

 #include <apt-pkg/init.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/cmndline.h>

-#include <apt-pkg/debversion.h>

 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/progress.h>


@@ -28,19 +29,25 @@
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>

-       
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgsystem.h>
+

 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>

-#include <wait.h>
-#include <fstream.h>
+#include <locale.h>
+
+#include <fstream>

 
 

-#include <config.h>
-#include <apti18n.h>

 #include "apt-extracttemplates.h"
 
 #include "apt-extracttemplates.h"
 

-#define TMPDIR         "/var/lib/debconf/"
+#include <apti18n.h>
+                                                                       /*}}}*/
+
+using namespace std;
+
+#define TMPDIR         "/tmp"

 
 pkgCache *DebFile::Cache = 0;
 
 
 pkgCache *DebFile::Cache = 0;
 


@@ -48,8 +55,8 @@ pkgCache *DebFile::Cache = 0;
 // ---------------------------------------------------------------------
 /* */
 DebFile::DebFile(const char *debfile)
 // ---------------------------------------------------------------------
 /* */
 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)

 {
 }
                                                                        /*}}}*/
 {
 }
                                                                        /*}}}*/


@@ -66,21 +73,19 @@ DebFile::~DebFile()
 // DebFile::GetInstalledVer - Find out the installed version of a pkg  /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // DebFile::GetInstalledVer - Find out the installed version of a pkg  /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-char *DebFile::GetInstalledVer(const string &package)
+string DebFile::GetInstalledVer(const string &package)

 {
 {

-       char *ver = 0;
-

        pkgCache::PkgIterator Pkg = Cache->FindPkg(package);
        if (Pkg.end() == false) 
        {
                pkgCache::VerIterator V = Pkg.CurrentVer();
        pkgCache::PkgIterator Pkg = Cache->FindPkg(package);
        if (Pkg.end() == false) 
        {
                pkgCache::VerIterator V = Pkg.CurrentVer();

-               if (V.end() == false) 
+               if (V.end() == false)

                {
                {

-                       ver = strdup(V.VerStr());
+                       return V.VerStr();

                }
        }
 
                }
        }
 

-       return ver;
+       return string();

 }
                                                                        /*}}}*/
 // DebFile::Go - Start extracting a debian package                     /*{{{*/
 }
                                                                        /*}}}*/
 // DebFile::Go - Start extracting a debian package                     /*{{{*/


@@ -89,19 +94,16 @@ char *DebFile::GetInstalledVer(const string &package)
 bool DebFile::Go()
 {
        ARArchive AR(File);
 bool DebFile::Go()
 {
        ARArchive AR(File);

+       if (_error->PendingError() == true)
+               return false;
+               

        const ARArchive::Member *Member = AR.FindMember("control.tar.gz");
        if (Member == 0)
        const ARArchive::Member *Member = AR.FindMember("control.tar.gz");
        if (Member == 0)

-       {
-               fprintf(stderr, _("This is not a valid DEB package.\n"));
-               return false;
-       }
+               return _error->Error(_("%s not a valid DEB package."),File.Name().c_str());

        
        if (File.Seek(Member->Start) == false)
        
        if (File.Seek(Member->Start) == false)

-       {

                return false;
                return false;

-       }
-
-       ExtractTar Tar(File, Member->Size);
+       ExtractTar Tar(File, Member->Size,"gzip");

        return Tar.Go(*this);
 }
                                                                        /*}}}*/
        return Tar.Go(*this);
 }
                                                                        /*}}}*/


@@ -138,6 +140,7 @@ bool DebFile::DoItem(Item &I, int &Fd)
        } 
        else 
        {
        } 
        else 
        {

+               // Ignore it

                Fd = -1;
        }
        return true;
                Fd = -1;
        }
        return true;


@@ -171,6 +174,7 @@ bool DebFile::Process(Item &I, const unsigned char *data,
 bool DebFile::ParseInfo()
 {
        if (Control == NULL) return false;
 bool DebFile::ParseInfo()
 {
        if (Control == NULL) return false;

+       

        pkgTagSection Section;
        Section.Scan(Control, ControlLen);
 
        pkgTagSection Section;
        Section.Scan(Control, ControlLen);
 


@@ -220,35 +224,57 @@ bool DebFile::ParseInfo()
 // ShowHelp - show a short help text                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowHelp - show a short help text                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void ShowHelp(void)
+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;
+       if (_config->FindB("version") == true) 
+               return 0;

 
 

-       fprintf(stderr, 
+       cout << 

                _("Usage: apt-extracttemplates file1 [file2 ...]\n"
                "\n"
                "apt-extracttemplates is a tool to extract config and template info\n"
                _("Usage: apt-extracttemplates file1 [file2 ...]\n"
                "\n"
                "apt-extracttemplates is a tool to extract config and template info\n"

-               "from debian packages\n"));
-       exit(0);
+               "from debian packages\n"
+               "\n"
+               "Options:\n"
+               "  -h   This help text\n"
+               "  -t   Set the temp dir\n"
+               "  -c=? Read this configuration file\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       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 }
                                                                        /*}}}*/
 // WriteFile - write the contents of the passed string to a file       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-char *WriteFile(const char *prefix, const char *data)
+string WriteFile(const char *package, const char *prefix, const char *data)

 {
        char fn[512];
        static int i;
 {
        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) return NULL;
-       ofs << (data ? data : "");
-       ofs.close();
-       return strdup(fn);
+       if (!f.Open(fn, FileFd::WriteTemp, 0600))
+       {
+               _error->Errno("ofstream::ofstream",_("Unable to write to %s"),fn);
+               return string();
+       }
+
+       f.Write(data, strlen(data));
+       f.Close();
+       return fn;

 }
                                                                        /*}}}*/
 // WriteConfig - write out the config data from a debian package file  /*{{{*/
 }
                                                                        /*}}}*/
 // WriteConfig - write out the config data from a debian package file  /*{{{*/


@@ -256,104 +282,62 @@ char *WriteFile(const char *prefix, const char *data)
 /* */
 void WriteConfig(const DebFile &file)
 {
 /* */
 void WriteConfig(const DebFile &file)
 {

-       char *templatefile = WriteFile("template", file.Template);
-       char *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 == 0 || configscript == 0)
-       {
-               fprintf(stderr, _("Cannot write config script or templates\n"));
+       if (templatefile.empty() == true || configscript.empty() == true)

                return;
                return;

-       }

        cout << file.Package << " " << file.Version << " " 
             << templatefile << " " << configscript << endl;
        cout << file.Package << " " << file.Version << " " 
             << templatefile << " " << configscript << endl;

-
-       free(templatefile);
-       free(configscript);

 }
                                                                        /*}}}*/
 // InitCache - initialize the package cache                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 }
                                                                        /*}}}*/
 // InitCache - initialize the package cache                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-int InitCache(MMap *&Map, pkgCache *&Cache)
-{
+bool Go(CommandLine &CmdL)
+{      

        // Initialize the apt cache
        // Initialize the apt cache

-       if (pkgInitConfig(*_config) == false || pkgInitSystem(*_config, _system) == false)
-       {
-               _error->DumpErrors();
-               return -1;
-       }
+       MMap *Map = 0;

        pkgSourceList List;
        List.ReadMainList();
        pkgSourceList List;
        List.ReadMainList();

-       OpProgress Prog;
-       pkgMakeStatusCache(List,Prog,&Map,true);
-       Cache = new pkgCache(Map);
-       return 0;
-}
-                                                                       /*}}}*/
-
-int main(int argc, const char **argv)
-{
-       MMap *Map = 0;
-       const char *debconfver = NULL;
-
-       CommandLine::Args Args[] = {
-               {'h',"help","help",0},
-               {'v',"version","version",0},
-               {'t',"tempdir","APT::ExtractTemplates::TempDir",CommandLine::HasArg},
-               {'c',"config-file",0,CommandLine::ConfigFile},
-               {'o',"option",0,CommandLine::ArbItem},
-               {0,0,0,0}};
-       
-       // Initialize the package cache
-       if (InitCache(Map, DebFile::Cache) < 0 || Map == 0 || DebFile::Cache == 0)
-       {
-               fprintf(stderr, _("Cannot initialize APT cache\n"));
-               return 100;
-       }
-
-       // Parse the command line
-       CommandLine CmdL(Args,_config);
-       if (CmdL.Parse(argc,argv) == false)
-       {
-               fprintf(stderr, _("Cannot parse commandline options\n"));
-               return 100;
-       }
-
-       // See if the help should be shown
-       if (_config->FindB("help") == true || CmdL.FileSize() == 0)
-       {
-               ShowHelp();
-               return 0;
-       }
+       pkgCacheGenerator::MakeStatusCache(List,NULL,&Map,true);
+       if (Map == 0)
+          return false;
+       DebFile::Cache = new pkgCache(Map);
+       if (_error->PendingError() == true)
+               return false;

 
        // Find out what version of debconf is currently installed
 
        // Find out what version of debconf is currently installed

-       if ((debconfver = DebFile::GetInstalledVer("debconf")) == NULL)
-       {
-               fprintf(stderr, _("Cannot get debconf version. Is debconf installed?\n"));
-               return 1;
-       }
+       string debconfver = DebFile::GetInstalledVer("debconf");
+       if (debconfver.empty() == true)
+               return _error->Error( _("Cannot get debconf version. Is debconf installed?"));

 
        // Process each package passsed in
        for (unsigned int I = 0; I != CmdL.FileSize(); I++)
        {
 
        // Process each package passsed in
        for (unsigned int I = 0; I != CmdL.FileSize(); I++)
        {

+               // Will pick up the errors later..

                DebFile file(CmdL.FileList[I]);
                DebFile file(CmdL.FileList[I]);

-               if (file.Go() == false) 
+               if (file.Go() == false)

                {
                {

-                       fprintf(stderr, _("Cannot read %s\n"), CmdL.FileList[I]);
+                       _error->Error("Prior errors apply to %s",CmdL.FileList[I]);

                        continue;
                }
                        continue;
                }

+

                // Does the package have templates?
                if (file.Template != 0 && file.ParseInfo() == true)
                {
                        // Check to make sure debconf dependencies are
                        // satisfied
                // 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 != "" &&
                        if (file.DepVer != "" &&

-                           DebFile::Cache->VS->CheckDep(file.DepVer.c_str(), 
-                                       file.DepOp, debconfver) == false) 
+                           DebFile::Cache->VS->CheckDep(debconfver.c_str(),
+                                       file.DepOp,file.DepVer.c_str()
+                                                        ) == false)

                                continue;
                        if (file.PreDepVer != "" &&
                                continue;
                        if (file.PreDepVer != "" &&

-                           DebFile::Cache->VS->CheckDep(file.PreDepVer.c_str(), 
-                                       file.PreDepOp, debconfver) == false) 
+                           DebFile::Cache->VS->CheckDep(debconfver.c_str(),
+                                       file.PreDepOp,file.PreDepVer.c_str()
+                                                        ) == false) 

                                continue;
 
                        WriteConfig(file);
                                continue;
 
                        WriteConfig(file);


@@ -363,6 +347,50 @@ int main(int argc, const char **argv)
 
        delete Map;
        delete DebFile::Cache;
 
        delete Map;
        delete DebFile::Cache;

+       
+       return !_error->PendingError();
+}
+                                                                       /*}}}*/
+int main(int argc, const char **argv)                                  /*{{{*/
+{
+       CommandLine::Args Args[] = {
+               {'h',"help","help",0},
+               {'v',"version","version",0},
+               {'t',"tempdir","APT::ExtractTemplates::TempDir",CommandLine::HasArg},
+               {'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 ||
+           CmdL.Parse(argc,argv) == false ||
+           pkgInitSystem(*_config,_system) == false)
+       {
+               _error->DumpErrors();
+               return 100;
+       }
+       
+       // See if the help should be shown
+       if (_config->FindB("help") == true ||
+           CmdL.FileSize() == 0)
+               return ShowHelp();
+       
+       Go(CmdL);

 
 

+       // Print any errors or warnings found during operation
+       if (_error->empty() == false)
+       {
+               // This goes to stderr..
+               bool Errors = _error->PendingError();
+               _error->DumpErrors();
+               return Errors == true?100:0;
+       }
+       

        return 0;
 }
        return 0;
 }

+                                                                       /*}}}*/