enable various compiler warnings

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

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 3fd572e4f71a1a386f1dd20725f1ae5b109f1847..a82623444be60606b3de1277e667929b8c4d3a71 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.5 2001/03/03 22:45:59 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,34 +13,37 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include<config.h>
+

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

+#include <apt-pkg/cacheiterators.h>

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

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

 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/tagfile.h>

-#include <apt-pkg/extracttar.h>
-#include <apt-pkg/arfile.h>
+#include <apt-pkg/debfile.h>

 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.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 <apt-pkg/dirstream.h>
+#include <apt-pkg/mmap.h>
+
+#include <iostream>

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

-#include <stdlib.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <fstream>

 
 

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

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

+
+#include <apti18n.h>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

-#define TMPDIR         "/tmp"
+using namespace std;

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


@@ -48,8 +51,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)

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


@@ -86,18 +89,9 @@ string DebFile::GetInstalledVer(const string &package)
 /* */
 bool DebFile::Go()
 {
 /* */
 bool DebFile::Go()
 {

-       ARArchive AR(File);
-       if (_error->PendingError() == true)
-               return false;
-               
-       const ARArchive::Member *Member = AR.FindMember("control.tar.gz");
-       if (Member == 0)
-               return _error->Error(_("%s not a valid DEB package."),File.Name().c_str());
-       
-       if (File.Seek(Member->Start) == false)
-               return false;
-       ExtractTar Tar(File, Member->Size);
-       return Tar.Go(*this);
+       debDebFile Deb(File);
+
+       return Deb.ExtractTarMember(*this, "control.tar");

 }
                                                                        /*}}}*/
 // DebFile::DoItem examine element in package and mark                 /*{{{*/
 }
                                                                        /*}}}*/
 // DebFile::DoItem examine element in package and mark                 /*{{{*/


@@ -142,7 +136,7 @@ bool DebFile::DoItem(Item &I, int &Fd)
 // DebFile::Process examine element in package and copy                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // DebFile::Process examine element in package and copy                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool DebFile::Process(Item &I, const unsigned char *data, 
+bool DebFile::Process(Item &/*I*/, const unsigned char *data,

                unsigned long size, unsigned long pos)
 {
        switch (Which)
                unsigned long size, unsigned long pos)
 {
        switch (Which)


@@ -217,10 +211,10 @@ bool DebFile::ParseInfo()
 // ShowHelp - show a short help text                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowHelp - show a short help text                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

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


@@ -235,18 +229,23 @@ int ShowHelp(void)
                "  -h   This help text\n"
                "  -t   Set the temp dir\n"
                "  -c=? Read this configuration file\n"
                "  -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       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
        return 0;
 }
                                                                        /*}}}*/
 // WriteFile - write the contents of the passed string to a file       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-string WriteFile(const char *prefix, const char *data)
+static 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++);
+
+        std::string tempdir = GetTempDir();
+       snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d",
+                 _config->Find("APT::ExtractTemplates::TempDir", 
+                               tempdir.c_str()).c_str(),
+                 package, prefix, getpid(), i++);

        FileFd f;
        if (data == NULL)
                data = "";
        FileFd f;
        if (data == NULL)
                data = "";


@@ -265,10 +264,10 @@ string WriteFile(const char *prefix, const char *data)
 // WriteConfig - write out the config data from a debian package file  /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // WriteConfig - write out the config data from a debian package file  /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void WriteConfig(const DebFile &file)
+static 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;
 
        if (templatefile.empty() == true || configscript.empty() == true)
                return;


@@ -279,14 +278,15 @@ void WriteConfig(const DebFile &file)
 // InitCache - initialize the package cache                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // InitCache - initialize the package cache                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool Go(CommandLine &CmdL)
+static bool Go(CommandLine &CmdL)

 {      
        // Initialize the apt cache
        MMap *Map = 0;
        pkgSourceList List;
        List.ReadMainList();
 {      
        // Initialize the apt cache
        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;
        DebFile::Cache = new pkgCache(Map);
        if (_error->PendingError() == true)
                return false;


@@ -302,20 +302,26 @@ bool Go(CommandLine &CmdL)
                // Will pick up the errors later..
                DebFile file(CmdL.FileList[I]);
                if (file.Go() == false)
                // 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
                // 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.c_str()) == 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.c_str()) == false) 
+                           DebFile::Cache->VS->CheckDep(debconfver.c_str(),
+                                       file.PreDepOp,file.PreDepVer.c_str()
+                                                        ) == false) 

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


@@ -329,8 +335,7 @@ bool Go(CommandLine &CmdL)
        return !_error->PendingError();
 }
                                                                        /*}}}*/
        return !_error->PendingError();
 }
                                                                        /*}}}*/

-
-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},


@@ -339,7 +344,11 @@ int main(int argc, const char **argv)
                {'c',"config-file",0,CommandLine::ConfigFile},
                {'o',"option",0,CommandLine::ArbItem},
                {0,0,0,0}};
                {'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 ||
        // Parse the command line and initialize the package library
        CommandLine CmdL(Args,_config);
        if (pkgInitConfig(*_config) == false ||


@@ -368,3 +377,4 @@ int main(int argc, const char **argv)
        
        return 0;
 }
        
        return 0;
 }

+                                                                       /*}}}*/