reenable gcc warnings for deprecated functions

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

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 144c508bef3b7fe8d4bacc255cf417876ccd2d4b..c54b365dc83a4cd7ed382ed19dd61ad8f8c1f099 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -19,18 +19,19 @@
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/tagfile.h>

-#include <apt-pkg/indexrecords.h>
+#include <apt-pkg/metaindex.h>

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

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

 
 #include <iostream>
 
 #include <iostream>

-#include <sstream>

 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <sstream>

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


@@ -89,7 +90,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
       off_t const FileSize = Pkg.Size();
 
       pkgTagFile Parser(&Pkg);
       off_t const FileSize = Pkg.Size();
 
       pkgTagFile Parser(&Pkg);

-      if (_error->PendingError() == true)
+      if (Pkg.IsOpen() == false || Pkg.Failed())

         return false;
       
       // Open the output file
         return false;
       
       // Open the output file


@@ -106,12 +107,9 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
       } else {
          Target.Open(TargetF,FileFd::WriteAtomic);
       }
       } else {
          Target.Open(TargetF,FileFd::WriteAtomic);
       }

-      if (_error->PendingError() == true)
+      if (Target.IsOpen() == false || Target.Failed())

         return false;
         return false;

-      FILE *TargetFl = fdopen(dup(Target.Fd()),"w");
-      if (TargetFl == 0)
-        return _error->Errno("fdopen","Failed to reopen fd");
-      
+

       // Setup the progress meter
       if(Progress)
         Progress->OverallProgress(CurrentSize,TotalSize,FileSize,
       // Setup the progress meter
       if(Progress)
         Progress->OverallProgress(CurrentSize,TotalSize,FileSize,


@@ -132,14 +130,11 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
         string File;
         unsigned long long Size;
         if (GetFile(File,Size) == false)
         string File;
         unsigned long long Size;
         if (GetFile(File,Size) == false)

-        {
-           fclose(TargetFl);

            return false;
            return false;

-        }
-        
+

         if (Chop != 0)
            File = OrigPath + ChopDirs(File,Chop);
         if (Chop != 0)
            File = OrigPath + ChopDirs(File,Chop);

-        
+

         // See if the file exists
         if (NoStat == false || Hits < 10)
         {
         // See if the file exists
         if (NoStat == false || Hits < 10)
         {


@@ -157,10 +152,10 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
               if (Chop != 0)
                  File = OrigPath + ChopDirs(File,Chop);
            }
               if (Chop != 0)
                  File = OrigPath + ChopDirs(File,Chop);
            }

-           
+

            // Get the size
            struct stat Buf;
            // Get the size
            struct stat Buf;

-           if (stat((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;


@@ -173,7 +168,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
                  File.replace(Start,End-Start,"binary-all");
                  Mangled = true;
               }
                  File.replace(Start,End-Start,"binary-all");
                  Mangled = true;
               }

-              
+

               if (Mangled == false ||
                   stat((CDROM + Prefix + File).c_str(),&Buf) != 0)
               {
               if (Mangled == false ||
                   stat((CDROM + Prefix + File).c_str(),&Buf) != 0)
               {


@@ -181,9 +176,9 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
                     clog << "Missed(2): " << OrigFile << endl;
                  NotFound++;
                  continue;
                     clog << "Missed(2): " << OrigFile << endl;
                  NotFound++;
                  continue;

-              }               
-           }       
-                                           
+              }
+           }
+

            // Size match
            if ((unsigned long long)Buf.st_size != Size)
            {
            // Size match
            if ((unsigned long long)Buf.st_size != Size)
            {


@@ -193,21 +188,17 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
               continue;
            }
         }
               continue;
            }
         }

-        
+

         Packages++;
         Hits++;
         Packages++;
         Hits++;

-        
-        if (RewriteEntry(TargetFl,File) == false)
-        {
-           fclose(TargetFl);
+
+        if (RewriteEntry(Target, File) == false)

            return false;
            return false;

-        }

       }
       }

-      fclose(TargetFl);

 
       if (Debug == true)
         cout << " Processed by using Prefix '" << Prefix << "' and chop " << Chop << endl;
 
       if (Debug == true)
         cout << " Processed by using Prefix '" << Prefix << "' and chop " << Chop << endl;

-        
+

       if (_config->FindB("APT::CDROM::NoAct",false) == false)
       {
         // Move out of the partial directory
       if (_config->FindB("APT::CDROM::NoAct",false) == false)
       {
         // Move out of the partial directory


@@ -218,39 +209,38 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
            return _error->Errno("rename","Failed to rename");
         ChangeOwnerAndPermissionOfFile("CopyPackages", FinalF.c_str(), "root", "root", 0644);
       }
            return _error->Errno("rename","Failed to rename");
         ChangeOwnerAndPermissionOfFile("CopyPackages", FinalF.c_str(), "root", "root", 0644);
       }

-        
+

       /* Mangle the source to be in the proper notation with
       /* Mangle the source to be in the proper notation with

-                prefix dist [component] */ 
+        prefix dist [component] */

       *I = string(*I,Prefix.length());
       ConvertToSourceList(CDROM,*I);
       *I = Prefix + ' ' + *I;
       *I = string(*I,Prefix.length());
       ConvertToSourceList(CDROM,*I);
       *I = Prefix + ' ' + *I;

-      
+

       CurrentSize += FileSize;
       CurrentSize += FileSize;

-   }   
+   }

    if(Progress)
       Progress->Done();
    if(Progress)
       Progress->Done();

-   
+

    // Some stats
    if(log) {
       stringstream msg;
       if(NotFound == 0 && WrongSize == 0)
         ioprintf(msg, _("Wrote %i records.\n"), Packages);
       else if (NotFound != 0 && WrongSize == 0)
    // Some stats
    if(log) {
       stringstream msg;
       if(NotFound == 0 && WrongSize == 0)
         ioprintf(msg, _("Wrote %i records.\n"), Packages);
       else if (NotFound != 0 && WrongSize == 0)

-        ioprintf(msg, _("Wrote %i records with %i missing files.\n"), 
+        ioprintf(msg, _("Wrote %i records with %i missing files.\n"),

                  Packages, NotFound);
       else if (NotFound == 0 && WrongSize != 0)
                  Packages, NotFound);
       else if (NotFound == 0 && WrongSize != 0)

-        ioprintf(msg, _("Wrote %i records with %i mismatched files\n"), 
+        ioprintf(msg, _("Wrote %i records with %i mismatched files\n"),

                  Packages, WrongSize);
       if (NotFound != 0 && WrongSize != 0)
         ioprintf(msg, _("Wrote %i records with %i missing files and %i mismatched files\n"), Packages, NotFound, WrongSize);
    }
                  Packages, WrongSize);
       if (NotFound != 0 && WrongSize != 0)
         ioprintf(msg, _("Wrote %i records with %i missing files and %i mismatched files\n"), Packages, NotFound, WrongSize);
    }

-   
+

    if (Packages == 0)
       _error->Warning("No valid records were found.");
 
    if (NotFound + WrongSize > 10)
       _error->Warning("A lot of entries were discarded, something may be wrong.\n");
    if (Packages == 0)
       _error->Warning("No valid records were found.");
 
    if (NotFound + WrongSize > 10)
       _error->Warning("A lot of entries were discarded, something may be wrong.\n");

-   

 
    return true;
 }
 
    return true;
 }


@@ -267,10 +257,10 @@ string IndexCopy::ChopDirs(string Path,unsigned int Depth)
       Depth--;
    }
    while (I != string::npos && Depth != 0);
       Depth--;
    }
    while (I != string::npos && Depth != 0);

-   
+

    if (I == string::npos)
       return string();
    if (I == string::npos)
       return string();

-   
+

    return string(Path,I+1);
 }
                                                                        /*}}}*/
    return string(Path,I+1);
 }
                                                                        /*}}}*/


@@ -433,17 +423,14 @@ bool PackageCopy::GetFile(string &File,unsigned long long &Size)
 }
                                                                        /*}}}*/
 // PackageCopy::RewriteEntry - Rewrite the entry with a new filename   /*{{{*/
 }
                                                                        /*}}}*/
 // PackageCopy::RewriteEntry - Rewrite the entry with a new filename   /*{{{*/

-// ---------------------------------------------------------------------
-/* */
-bool PackageCopy::RewriteEntry(FILE *Target,string File)
+bool PackageCopy::RewriteEntry(FileFd &Target,string const &File)

 {
 {

-   TFRewriteData Changes[] = {{ "Filename", File.c_str(), NULL },
-                              { NULL, NULL, NULL }};
-   
-   if (TFRewrite(Target,*Section,TFRewritePackageOrder,Changes) == false)
+   std::vector<pkgTagSection::Tag> Changes;
+   Changes.push_back(pkgTagSection::Tag::Rewrite("Filename", File));
+
+   if (Section->Write(Target, TFRewritePackageOrder, Changes) == false)

       return false;
       return false;

-   fputc('\n',Target);
-   return true;
+   return Target.Write("\n", 1);

 }
                                                                        /*}}}*/
 // SourceCopy::GetFile - Get the file information from the section     /*{{{*/
 }
                                                                        /*}}}*/
 // SourceCopy::GetFile - Get the file information from the section     /*{{{*/


@@ -478,26 +465,21 @@ bool SourceCopy::GetFile(string &File,unsigned long long &Size)
 }
                                                                        /*}}}*/
 // SourceCopy::RewriteEntry - Rewrite the entry with a new filename    /*{{{*/
 }
                                                                        /*}}}*/
 // SourceCopy::RewriteEntry - Rewrite the entry with a new filename    /*{{{*/

-// ---------------------------------------------------------------------
-/* */
-bool SourceCopy::RewriteEntry(FILE *Target,string File)
+bool SourceCopy::RewriteEntry(FileFd &Target, std::string const &File)

 {
 {

-   string Dir(File,0,File.rfind('/'));
-   TFRewriteData Changes[] = {{ "Directory", Dir.c_str(), NULL },
-                              { NULL, NULL, NULL }};
-   
-   if (TFRewrite(Target,*Section,TFRewriteSourceOrder,Changes) == false)
+   string const Dir(File,0,File.rfind('/'));
+   std::vector<pkgTagSection::Tag> Changes;
+   Changes.push_back(pkgTagSection::Tag::Rewrite("Directory", Dir));
+
+   if (Section->Write(Target, TFRewriteSourceOrder, Changes) == false)

       return false;
       return false;

-   fputc('\n',Target);
-   return true;
+   return Target.Write("\n", 1);

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

-// SigVerify::Verify - Verify a files md5sum against its metaindex             /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
+// SigVerify::Verify - Verify a files md5sum against its metaindex     /*{{{*/
+bool SigVerify::Verify(string prefix, string file, metaIndex *MetaIndex)

 {
 {

-   const indexRecords::checkSum *Record = MetaIndex->Lookup(file);
+   const metaIndex::checkSum *Record = MetaIndex->Lookup(file);

    bool const Debug = _config->FindB("Debug::aptcdrom",false);
 
    // we skip non-existing files in the verifcation of the Release file
    bool const Debug = _config->FindB("Debug::aptcdrom",false);
 
    // we skip non-existing files in the verifcation of the Release file


@@ -564,11 +546,11 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
 
    // Read all Release files
    for (vector<string>::iterator I = SigList.begin(); I != SigList.end(); ++I)
 
    // Read all Release files
    for (vector<string>::iterator I = SigList.begin(); I != SigList.end(); ++I)

-   { 
+   {

       if(Debug)
         cout << "Signature verify for: " << *I << endl;
 
       if(Debug)
         cout << "Signature verify for: " << *I << endl;
 

-      indexRecords *MetaIndex = new indexRecords;
+      metaIndex *MetaIndex = new debReleaseIndex("","");

       string prefix = *I; 
 
       string const releasegpg = *I+"Release.gpg";
       string prefix = *I; 
 
       string const releasegpg = *I+"Release.gpg";


@@ -610,12 +592,13 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
       }
 
       // Open the Release file and add it to the MetaIndex
       }
 
       // Open the Release file and add it to the MetaIndex

-      if(!MetaIndex->Load(release))
+      std::string ErrorText;
+      if(MetaIndex->Load(release, &ErrorText) == false)

       {
       {

-        _error->Error("%s",MetaIndex->ErrorText.c_str());
+        _error->Error("%s", ErrorText.c_str());

         return false;
       }
         return false;
       }

-      
+

       // go over the Indexfiles and see if they verify
       // if so, remove them from our copy of the lists
       vector<string> keys = MetaIndex->MetaKeys();
       // go over the Indexfiles and see if they verify
       // if so, remove them from our copy of the lists
       vector<string> keys = MetaIndex->MetaKeys();


@@ -700,9 +683,9 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,   /*{{{*/
       off_t const FileSize = Pkg.Size();
 
       pkgTagFile Parser(&Pkg);
       off_t const FileSize = Pkg.Size();
 
       pkgTagFile Parser(&Pkg);

-      if (_error->PendingError() == true)
+      if (Pkg.IsOpen() == false || Pkg.Failed())

         return false;
         return false;

-      
+

       // Open the output file
       char S[400];
       snprintf(S,sizeof(S),"cdrom:[%s]/%s",Name.c_str(),
       // Open the output file
       char S[400];
       snprintf(S,sizeof(S),"cdrom:[%s]/%s",Name.c_str(),


@@ -717,12 +700,9 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,  /*{{{*/
       } else {
         Target.Open(TargetF,FileFd::WriteAtomic);
       }
       } else {
         Target.Open(TargetF,FileFd::WriteAtomic);
       }

-      if (_error->PendingError() == true)
+      if (Pkg.IsOpen() == false || Pkg.Failed())

         return false;
         return false;

-      FILE *TargetFl = fdopen(dup(Target.Fd()),"w");
-      if (TargetFl == 0)
-        return _error->Errno("fdopen","Failed to reopen fd");
-      
+

       // Setup the progress meter
       if(Progress)
         Progress->OverallProgress(CurrentSize,TotalSize,FileSize,
       // Setup the progress meter
       if(Progress)
         Progress->OverallProgress(CurrentSize,TotalSize,FileSize,


@@ -740,20 +720,16 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
         if(Progress)
            Progress->Progress(Parser.Offset());
 
         if(Progress)
            Progress->Progress(Parser.Offset());
 

-        const char *Start;
-        const char *Stop;
-        Section.GetSection(Start,Stop);
-        fwrite(Start,Stop-Start, 1, TargetFl);
-        fputc('\n',TargetFl);
+        if (Section.Write(Target) == false || Target.Write("\n", 1) == false)
+           return false;

 
         Packages++;
         Hits++;
       }
 
         Packages++;
         Hits++;
       }

-      fclose(TargetFl);

 
       if (Debug == true)
         cout << " Processed by using Prefix '" << Prefix << "' and chop " << endl;
 
       if (Debug == true)
         cout << " Processed by using Prefix '" << Prefix << "' and chop " << endl;

-        
+

       if (_config->FindB("APT::CDROM::NoAct",false) == false)
       {
         // Move out of the partial directory
       if (_config->FindB("APT::CDROM::NoAct",false) == false)
       {
         // Move out of the partial directory


@@ -764,37 +740,45 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
            return _error->Errno("rename","Failed to rename");
         ChangeOwnerAndPermissionOfFile("CopyTranslations", FinalF.c_str(), "root", "root", 0644);
       }
            return _error->Errno("rename","Failed to rename");
         ChangeOwnerAndPermissionOfFile("CopyTranslations", FinalF.c_str(), "root", "root", 0644);
       }

-      
-      
+

       CurrentSize += FileSize;
       CurrentSize += FileSize;

-   }   
+   }

    if(Progress)
       Progress->Done();
    if(Progress)
       Progress->Done();

-   
+

    // Some stats
    if(log) {
       stringstream msg;
       if(NotFound == 0 && WrongSize == 0)
         ioprintf(msg, _("Wrote %i records.\n"), Packages);
       else if (NotFound != 0 && WrongSize == 0)
    // Some stats
    if(log) {
       stringstream msg;
       if(NotFound == 0 && WrongSize == 0)
         ioprintf(msg, _("Wrote %i records.\n"), Packages);
       else if (NotFound != 0 && WrongSize == 0)

-        ioprintf(msg, _("Wrote %i records with %i missing files.\n"), 
+        ioprintf(msg, _("Wrote %i records with %i missing files.\n"),

                  Packages, NotFound);
       else if (NotFound == 0 && WrongSize != 0)
                  Packages, NotFound);
       else if (NotFound == 0 && WrongSize != 0)

-        ioprintf(msg, _("Wrote %i records with %i mismatched files\n"), 
+        ioprintf(msg, _("Wrote %i records with %i mismatched files\n"),

                  Packages, WrongSize);
       if (NotFound != 0 && WrongSize != 0)
         ioprintf(msg, _("Wrote %i records with %i missing files and %i mismatched files\n"), Packages, NotFound, WrongSize);
    }
                  Packages, WrongSize);
       if (NotFound != 0 && WrongSize != 0)
         ioprintf(msg, _("Wrote %i records with %i missing files and %i mismatched files\n"), Packages, NotFound, WrongSize);
    }

-   
+

    if (Packages == 0)
       _error->Warning("No valid records were found.");
 
    if (NotFound + WrongSize > 10)
       _error->Warning("A lot of entries were discarded, something may be wrong.\n");
    if (Packages == 0)
       _error->Warning("No valid records were found.");
 
    if (NotFound + WrongSize > 10)
       _error->Warning("A lot of entries were discarded, something may be wrong.\n");

-   

 
    return true;
 }
                                                                        /*}}}*/
 
 
    return true;
 }
                                                                        /*}}}*/
 

+IndexCopy::IndexCopy() : d(NULL) {}

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

+
+PackageCopy::PackageCopy() : IndexCopy(), d(NULL) {}
+APT_CONST PackageCopy::~PackageCopy() {}
+SourceCopy::SourceCopy() : IndexCopy(), d(NULL) {}
+APT_CONST SourceCopy::~SourceCopy() {}
+TranslationsCopy::TranslationsCopy() : d(NULL) {}
+APT_CONST TranslationsCopy::~TranslationsCopy() {}
+SigVerify::SigVerify() : d(NULL) {}
+APT_CONST SigVerify::~SigVerify() {}