use forward declaration in headers if possible instead of includes

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

diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index 5a9d5aacd445a7894445ddb5660faa17ae2e2975..058cef63689ba80356187fa9e90b69a7b9a4f358 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>


@@ -28,7 +31,11 @@ edspIndex::edspIndex(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);


@@ -47,7 +54,7 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
       return _error->Errno("fstat","Failed to stat");
    CFile->Size = St.st_size;
    CFile->mtime = St.st_mtime;
       return _error->Errno("fstat","Failed to stat");
    CFile->Size = St.st_size;
    CFile->mtime = St.st_mtime;

-   CFile->Archive = Gen.WriteUniqString("universe");
+   CFile->Archive = Gen.WriteUniqString("edsp::scenario");

 
    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 +70,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;