DropPrivs: Move the re-set uid/gid thing to the end of the function

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

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 73b3bc51c78483dfaf86e025f21f59b20d0586e1..f95b9e5ba2eff3ec8943127a60f317541cec89d1 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.14 2003/01/11 07:18:44 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
 /* ######################################################################
    
    APT Extract Templates - Program to extract debconf config and template


@@ -13,46 +13,47 @@
    ##################################################################### */
                                                                        /*}}}*/
 // 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 <stdlib.h>

 
 

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

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

+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 using namespace std;
 
                                                                        /*}}}*/
 
 using namespace std;
 

-#define TMPDIR         "/tmp"
-

 pkgCache *DebFile::Cache = 0;
 
 // DebFile::DebFile - Construct the DebFile object                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 DebFile::DebFile(const char *debfile)
 pkgCache *DebFile::Cache = 0;
 
 // DebFile::DebFile - Construct the DebFile object                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 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), Control(NULL), ControlLen(0),
+         DepOp(0), PreDepOp(0), Config(0), Template(0), Which(None)

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


@@ -89,18 +90,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                 /*{{{*/


@@ -111,10 +103,12 @@ bool DebFile::DoItem(Item &I, int &Fd)
        if (strcmp(I.Name, "control") == 0)
        {
                delete [] Control;
        if (strcmp(I.Name, "control") == 0)
        {
                delete [] Control;

-               Control = new char[I.Size+1];
-               Control[I.Size] = 0;
+               Control = new char[I.Size+3];
+               Control[I.Size] = '\n';
+               Control[I.Size + 1] = '\n';
+               Control[I.Size + 2] = '\0';

                Which = IsControl;
                Which = IsControl;

-               ControlLen = I.Size;
+               ControlLen = I.Size + 3;

                // make it call the Process method below. this is so evil
                Fd = -2;
        }
                // make it call the Process method below. this is so evil
                Fd = -2;
        }


@@ -145,8 +139,8 @@ 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, 
-               unsigned long size, unsigned long pos)
+bool DebFile::Process(Item &/*I*/, const unsigned char *data,
+               unsigned long long size, unsigned long long pos)

 {
        switch (Which)
        {
 {
        switch (Which)
        {


@@ -170,9 +164,10 @@ 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;
        pkgTagSection Section;

-       Section.Scan(Control, ControlLen);
+       if (Section.Scan(Control, ControlLen) == false)
+               return false;

 
        Package = Section.FindS("Package");
        Version = GetInstalledVer(Package);
 
        Package = Section.FindS("Package");
        Version = GetInstalledVer(Package);


@@ -220,10 +215,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;


@@ -238,28 +233,35 @@ 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 *package, const char *prefix, const char *data)
+static string WriteFile(const char *package, const char *prefix, const char *data)

 {
        char fn[512];
 {
        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++);
+
+        std::string tempdir = GetTempDir();
+       snprintf(fn, sizeof(fn), "%s/%s.%s.XXXXXX",
+                 _config->Find("APT::ExtractTemplates::TempDir", 
+                               tempdir.c_str()).c_str(),
+                 package, prefix);

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

-
-       if (!f.Open(fn, FileFd::WriteTemp, 0600))
+        int fd = mkstemp(fn);
+        if (fd < 0) {
+               _error->Errno("ofstream::ofstream",_("Unable to mkstemp %s"),fn);
+                return string();
+        }
+       if (!f.OpenDescriptor(fd, FileFd::WriteOnly, FileFd::None, true))

        {
                _error->Errno("ofstream::ofstream",_("Unable to write to %s"),fn);
                return string();
        }
        {
                _error->Errno("ofstream::ofstream",_("Unable to write to %s"),fn);
                return string();
        }

-

        f.Write(data, strlen(data));
        f.Close();
        return fn;
        f.Write(data, strlen(data));
        f.Close();
        return fn;


@@ -268,7 +270,7 @@ string WriteFile(const char *package, 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(file.Package.c_str(), "template", file.Template);
        string configscript = WriteFile(file.Package.c_str(), "config", file.Config);
 {
        string templatefile = WriteFile(file.Package.c_str(), "template", file.Template);
        string configscript = WriteFile(file.Package.c_str(), "config", file.Config);


@@ -282,14 +284,13 @@ 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 (Map == 0)
           return false;
        DebFile::Cache = new pkgCache(Map);


@@ -340,8 +341,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},


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

+                                                                       /*}}}*/