testcases runable as root

[apt.git] / apt-pkg / indexcopy.cc

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 9ea2441396208e94d225e0b6c5e3bf5bec758da6..5fa57fd8b0ab2c4eecc478ccec5109c97d9c9059 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -20,17 +20,17 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/indexrecords.h>

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

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

+#include <apt-pkg/gpgv.h>
+#include <apt-pkg/hashes.h>

 
 #include <iostream>
 #include <sstream>
 #include <unistd.h>
 #include <sys/stat.h>
 
 #include <iostream>
 #include <sstream>
 #include <unistd.h>
 #include <sys/stat.h>

-#include <sys/types.h>
-#include <fcntl.h>

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

+#include <string.h>

 
 #include "indexcopy.h"
 #include <apti18n.h>
 
 #include "indexcopy.h"
 #include <apti18n.h>


@@ -65,7 +65,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
       for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
           c != compressor.end(); ++c)
       {
       for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
           c != compressor.end(); ++c)
       {

-        if (stat(std::string(file + c->Extension).c_str(), &Buf) != 0)
+        if (stat((file + c->Extension).c_str(), &Buf) != 0)

            continue;
         found = true;
         break;
            continue;
         found = true;
         break;


@@ -160,7 +160,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
            
            // Get the size
            struct stat Buf;
            
            // Get the size
            struct stat Buf;

-           if (stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0 || 
+           if (stat((CDROM + Prefix + File).c_str(),&Buf) != 0 || 

                Buf.st_size == 0)
            {
               bool Mangled = false;
                Buf.st_size == 0)
            {
               bool Mangled = false;


@@ -175,7 +175,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
               }
               
               if (Mangled == false ||
               }
               
               if (Mangled == false ||

-                  stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0)
+                  stat((CDROM + Prefix + File).c_str(),&Buf) != 0)

               {
                  if (Debug == true)
                     clog << "Missed(2): " << OrigFile << endl;
               {
                  if (Debug == true)
                     clog << "Missed(2): " << OrigFile << endl;


@@ -286,7 +286,7 @@ bool IndexCopy::ReconstructPrefix(string &Prefix,string OrigPath,string CD,
    while (1)
    {
       struct stat Buf;
    while (1)
    {
       struct stat Buf;

-      if (stat(string(CD + MyPrefix + File).c_str(),&Buf) != 0)
+      if (stat((CD + MyPrefix + File).c_str(),&Buf) != 0)

       {
         if (Debug == true)
            cout << "Failed, " << CD + MyPrefix + File << endl;
       {
         if (Debug == true)
            cout << "Failed, " << CD + MyPrefix + File << endl;


@@ -315,7 +315,7 @@ bool IndexCopy::ReconstructChop(unsigned long &Chop,string Dir,string File)
    while (1)
    {
       struct stat Buf;
    while (1)
    {
       struct stat Buf;

-      if (stat(string(Dir + File).c_str(),&Buf) != 0)
+      if (stat((Dir + File).c_str(),&Buf) != 0)

       {
         File = ChopDirs(File,1);
         Depth++;
       {
         File = ChopDirs(File,1);
         Depth++;


@@ -516,7 +516,7 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
       return false;
    }
 
       return false;
    }
 

-   if (!Record->Hash.VerifyFile(prefix+file))
+   if (!Record->Hashes.VerifyFile(prefix+file))

    {
       _error->Warning(_("Hash mismatch for: %s"),file.c_str());
       return false;
    {
       _error->Warning(_("Hash mismatch for: %s"),file.c_str());
       return false;


@@ -524,8 +524,10 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
 
    if(Debug == true)
    {
 
    if(Debug == true)
    {

-      cout << "File: " << prefix+file << endl;
-      cout << "Expected Hash " << Record->Hash.toStr() << endl;
+      cout << "File: " << prefix+file << endl
+        << "Expected Hash " << endl;
+      for (HashStringList::const_iterator hs = Record->Hashes.begin(); hs != Record->Hashes.end(); ++hs)
+        std::cout <<  "\t- " << hs->toStr() << std::endl;

    }
 
    return true;
    }
 
    return true;


@@ -551,7 +553,7 @@ bool SigVerify::CopyMetaIndex(string CDROM, string CDName,          /*{{{*/
 }
                                                                        /*}}}*/
 bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,        /*{{{*/
 }
                                                                        /*}}}*/
 bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,        /*{{{*/

-                             vector<string> PkgList,vector<string> SrcList)
+                             vector<string> /*PkgList*/,vector<string> /*SrcList*/)

 {
    if (SigList.empty() == true)
       return true;
 {
    if (SigList.empty() == true)
       return true;


@@ -642,16 +644,14 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
 }
                                                                        /*}}}*/
 // SigVerify::RunGPGV - deprecated wrapper calling ExecGPGV            /*{{{*/
 }
                                                                        /*}}}*/
 // SigVerify::RunGPGV - deprecated wrapper calling ExecGPGV            /*{{{*/

-bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
+APT_NORETURN bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,

       int const &statusfd, int fd[2]) {
    ExecGPGV(File, FileOut, statusfd, fd);
       int const &statusfd, int fd[2]) {
    ExecGPGV(File, FileOut, statusfd, fd);

-   return false;
-};
-bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
+}
+APT_NORETURN bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,

       int const &statusfd) {
    ExecGPGV(File, FileOut, statusfd);
       int const &statusfd) {
    ExecGPGV(File, FileOut, statusfd);

-   return false;
-};
+}

                                                                        /*}}}*/
 bool TranslationsCopy::CopyTranslations(string CDROM,string Name,      /*{{{*/
                                vector<string> &List, pkgCdromStatus *log)
                                                                        /*}}}*/
 bool TranslationsCopy::CopyTranslations(string CDROM,string Name,      /*{{{*/
                                vector<string> &List, pkgCdromStatus *log)


@@ -676,7 +676,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,   /*{{{*/
       for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
           c != compressor.end(); ++c)
       {
       for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
           c != compressor.end(); ++c)
       {

-        if (stat(std::string(file + c->Extension).c_str(), &Buf) != 0)
+        if (stat((file + c->Extension).c_str(), &Buf) != 0)

            continue;
         found = true;
         break;
            continue;
         found = true;
         break;


@@ -793,3 +793,5 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,   /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+
+APT_CONST IndexCopy::~IndexCopy() {}