[ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines

[apt.git] / apt-pkg / edsp / edspindexfile.cc

diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index 5a9d5aacd445a7894445ddb5660faa17ae2e2975..98ce4497ae62d560c40c6da18a04ca52c055b512 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -1,11 +1,13 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 /* ######################################################################
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 /* ######################################################################

-   The universe file is designed to work as an intermediate file between
+   The scenario file is designed to work as an intermediate file between

    APT and the resolver. Its on propose very similar to a dpkg status file
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    APT and the resolver. Its on propose very similar to a dpkg status file
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/edspindexfile.h>
 #include <apt-pkg/edsplistparser.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/edspindexfile.h>
 #include <apt-pkg/edsplistparser.h>
 #include <apt-pkg/sourcelist.h>


@@ -13,6 +15,7 @@
 #include <apt-pkg/progress.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>

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

 #include <apt-pkg/acquire-item.h>
 
 #include <sys/stat.h>
 #include <apt-pkg/acquire-item.h>
 
 #include <sys/stat.h>


@@ -21,14 +24,18 @@
 // edspIndex::edspIndex - Constructor                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // edspIndex::edspIndex - Constructor                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-edspIndex::edspIndex(string File) : debStatusIndex(File)
+edspIndex::edspIndex(std::string File) : debStatusIndex(File)

 {
 }
                                                                        /*}}}*/
 // StatusIndex::Merge - Load the index file into a cache               /*{{{*/
 bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 {
 {
 }
                                                                        /*}}}*/
 // StatusIndex::Merge - Load the index file into a cache               /*{{{*/
 bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 {

-   FileFd Pkg(File,FileFd::ReadOnlyGzip);
+   FileFd Pkg;
+   if (File != "stdin")
+      Pkg.Open(File, FileFd::ReadOnly);
+   else
+      Pkg.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly);

    if (_error->PendingError() == true)
       return false;
    edspListParser Parser(&Pkg);
    if (_error->PendingError() == true)
       return false;
    edspListParser Parser(&Pkg);


@@ -37,17 +44,15 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 
    if (Prog != NULL)
       Prog->SubProgress(0,File);
 
    if (Prog != NULL)
       Prog->SubProgress(0,File);

-   if (Gen.SelectFile(File,string(),*this) == false)
+   if (Gen.SelectFile(File,std::string(),*this) == false)

       return _error->Error("Problem with SelectFile %s",File.c_str());
 
    // Store the IMS information
    pkgCache::PkgFileIterator CFile = Gen.GetCurFile();
       return _error->Error("Problem with SelectFile %s",File.c_str());
 
    // Store the IMS information
    pkgCache::PkgFileIterator CFile = Gen.GetCurFile();

-   struct stat St;
-   if (fstat(Pkg.Fd(),&St) != 0)
-      return _error->Errno("fstat","Failed to stat");
-   CFile->Size = St.st_size;
-   CFile->mtime = St.st_mtime;
-   CFile->Archive = Gen.WriteUniqString("universe");
+   CFile->Size = Pkg.FileSize();
+   CFile->mtime = Pkg.ModificationTime();
+   map_ptrloc const storage = Gen.WriteUniqString("edsp::scenario");
+   CFile->Archive = storage;

 
    if (Gen.MergeList(Parser) == false)
       return _error->Error("Problem with MergeList %s",File.c_str());
 
    if (Gen.MergeList(Parser) == false)
       return _error->Error("Problem with MergeList %s",File.c_str());


@@ -63,7 +68,7 @@ class edspIFType: public pkgIndexFile::Type
       // we don't have a record parser for this type as the file is not presistent
       return NULL;
    };
       // we don't have a record parser for this type as the file is not presistent
       return NULL;
    };

-   edspIFType() {Label = "APT universe file";};
+   edspIFType() {Label = "EDSP scenario file";};

 };
 static edspIFType _apt_Universe;
 
 };
 static edspIFType _apt_Universe;