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 2408a7d9d8f333b94dcdc84e005aa0b557b75466..f95b9e5ba2eff3ec8943127a60f317541cec89d1 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -18,8 +18,8 @@
 #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/sourcelist.h>
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/version.h>


@@ -30,14 +30,14 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgsystem.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 <locale.h>
-
-#include <fstream>
+#include <stdlib.h>

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


@@ -52,7 +52,7 @@ pkgCache *DebFile::Cache = 0;
 // ---------------------------------------------------------------------
 /* */
 DebFile::DebFile(const char *debfile)
 // ---------------------------------------------------------------------
 /* */
 DebFile::DebFile(const char *debfile)

-       : File(debfile, FileFd::ReadOnly), Size(0), Control(NULL), ControlLen(0),
+       : File(debfile, FileFd::ReadOnly), Control(NULL), ControlLen(0),

          DepOp(0), PreDepOp(0), Config(0), Template(0), Which(None)
 {
 }
          DepOp(0), PreDepOp(0), Config(0), Template(0), Which(None)
 {
 }


@@ -103,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;
        }


@@ -137,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)
        {


@@ -162,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);


@@ -212,7 +215,7 @@ 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 compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
 {
        ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);


@@ -237,26 +240,28 @@ int ShowHelp(void)
 // WriteFile - write the contents of the passed string to a file       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // 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;

 
         std::string tempdir = GetTempDir();
 
         std::string tempdir = GetTempDir();

-       snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d",
+       snprintf(fn, sizeof(fn), "%s/%s.%s.XXXXXX",

                  _config->Find("APT::ExtractTemplates::TempDir", 
                                tempdir.c_str()).c_str(),
                  _config->Find("APT::ExtractTemplates::TempDir", 
                                tempdir.c_str()).c_str(),

-                 package, prefix, getpid(), i++);
+                 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;


@@ -265,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);


@@ -279,7 +284,7 @@ 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;
 {      
        // Initialize the apt cache
        MMap *Map = 0;