fix off-by-one error and do not use magic constant of 100 when checking StackPost

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

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 9261f68057e9098b399d7c4118b5dddb3ebdbd1e..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.12 2002/11/09 22:41:55 doogie 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,6 +13,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // 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>


@@ -28,19 +30,23 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.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 <locale.h>
+

 #include <fstream>
 
 #include <fstream>
 

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

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

+
+#include <apti18n.h>

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

+using namespace std;
+

 #define TMPDIR         "/tmp"
 
 pkgCache *DebFile::Cache = 0;
 #define TMPDIR         "/tmp"
 
 pkgCache *DebFile::Cache = 0;


@@ -49,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)

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


@@ -97,7 +103,7 @@ bool DebFile::Go()
        
        if (File.Seek(Member->Start) == false)
                return false;
        
        if (File.Seek(Member->Start) == false)
                return false;

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

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


@@ -220,8 +226,8 @@ bool DebFile::ParseInfo()
 /* */
 int 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 0;
 
        if (_config->FindB("version") == true) 
                return 0;


@@ -236,7 +242,7 @@ 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;
 }
                                                                        /*}}}*/
        return 0;
 }
                                                                        /*}}}*/


@@ -247,7 +253,15 @@ 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.%s.%u%d", _config->Find("APT::ExtractTemplates::TempDir", TMPDIR).c_str(), package, 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 = "";
        FileFd f;
        if (data == NULL)
                data = "";


@@ -268,8 +282,8 @@ string WriteFile(const char *package, const char *prefix, const char *data)
 /* */
 void WriteConfig(const DebFile &file)
 {
 /* */
 void WriteConfig(const DebFile &file)
 {

-       string templatefile = WriteFile(file.package, "template", file.Template);
-       string configscript = WriteFile(file.package, "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;


@@ -286,8 +300,7 @@ bool Go(CommandLine &CmdL)
        MMap *Map = 0;
        pkgSourceList List;
        List.ReadMainList();
        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 (Map == 0)
           return false;
        DebFile::Cache = new pkgCache(Map);


@@ -338,8 +351,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},


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

+                                                                       /*}}}*/