doc: Fix fuzzy string regression

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

diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index a8a528131c322a9c2e7d5a598ba8a58f6a2341ba..042a88cf93088ba09a691c6723c647095347f6bf 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -12,13 +12,8 @@
 #include <apt-pkg/edsplistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/edsplistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>

-#include <apt-pkg/progress.h>
-#include <apt-pkg/debindexfile.h>

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

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

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

-#include <apt-pkg/cacheiterators.h>
-#include <apt-pkg/pkgcachegen.h>

 #include <apt-pkg/pkgrecords.h>
 
 #include <stddef.h>
 #include <apt-pkg/pkgrecords.h>
 
 #include <stddef.h>


@@ -26,37 +21,42 @@
 #include <string>
                                                                        /*}}}*/
 
 #include <string>
                                                                        /*}}}*/
 

-// EDSP Index                                                          /*{{{*/
-edspIndex::edspIndex(std::string const &File) : pkgDebianIndexRealFile(File, true), d(NULL)
+// EDSP-like Index                                                     /*{{{*/
+edspLikeIndex::edspLikeIndex(std::string const &File) : pkgDebianIndexRealFile(File, true)

 {
 }
 {
 }

-std::string edspIndex::GetComponent() const
-{
-   return "edsp";
-}
-std::string edspIndex::GetArchitecture() const
+std::string edspLikeIndex::GetArchitecture() const

 {
    return std::string();
 }
 {
    return std::string();
 }

-bool edspIndex::HasPackages() const
+bool edspLikeIndex::HasPackages() const

 {
    return true;
 }
 {
    return true;
 }

-bool edspIndex::Exists() const
+bool edspLikeIndex::Exists() const

 {
    return true;
 }
 {
    return true;
 }

-uint8_t edspIndex::GetIndexFlags() const
+uint8_t edspLikeIndex::GetIndexFlags() const

 {
    return 0;
 }
 {
    return 0;
 }

-bool edspIndex::OpenListFile(FileFd &Pkg, std::string const &FileName)
+bool edspLikeIndex::OpenListFile(FileFd &Pkg, std::string const &FileName)

 {
 {

-   if (FileName.empty() == false && FileName != "stdin")
+   if (FileName.empty() == false && FileName != "/nonexistent/stdin")

       return pkgDebianIndexRealFile::OpenListFile(Pkg, FileName);
    if (Pkg.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly) == false)
       return _error->Error("Problem opening %s",FileName.c_str());
    return true;
       return pkgDebianIndexRealFile::OpenListFile(Pkg, FileName);
    if (Pkg.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly) == false)
       return _error->Error("Problem opening %s",FileName.c_str());
    return true;

+}
+                                                                       /*}}}*/
+// EDSP Index                                                          /*{{{*/
+edspIndex::edspIndex(std::string const &File) : edspLikeIndex(File)
+{
+}
+std::string edspIndex::GetComponent() const
+{
+   return "edsp";

 }
 pkgCacheListParser * edspIndex::CreateListParser(FileFd &Pkg)
 {
 }
 pkgCacheListParser * edspIndex::CreateListParser(FileFd &Pkg)
 {


@@ -69,6 +69,25 @@ pkgCacheListParser * edspIndex::CreateListParser(FileFd &Pkg)
    return newError ? NULL : Parser;
 }
                                                                        /*}}}*/
    return newError ? NULL : Parser;
 }
                                                                        /*}}}*/

+// EIPP Index                                                          /*{{{*/
+eippIndex::eippIndex(std::string const &File) : edspLikeIndex(File)
+{
+}
+std::string eippIndex::GetComponent() const
+{
+   return "eipp";
+}
+pkgCacheListParser * eippIndex::CreateListParser(FileFd &Pkg)
+{
+   if (Pkg.IsOpen() == false)
+      return NULL;
+   _error->PushToStack();
+   pkgCacheListParser * const Parser = new eippListParser(&Pkg);
+   bool const newError = _error->PendingError();
+   _error->MergeWithStack();
+   return newError ? NULL : Parser;
+}
+                                                                       /*}}}*/

 
 // Index File types for APT                                            /*{{{*/
 class APT_HIDDEN edspIFType: public pkgIndexFile::Type
 
 // Index File types for APT                                            /*{{{*/
 class APT_HIDDEN edspIFType: public pkgIndexFile::Type


@@ -82,11 +101,28 @@ class APT_HIDDEN edspIFType: public pkgIndexFile::Type
    edspIFType() {Label = "EDSP scenario file";};
 };
 APT_HIDDEN edspIFType _apt_Edsp;
    edspIFType() {Label = "EDSP scenario file";};
 };
 APT_HIDDEN edspIFType _apt_Edsp;

-

 const pkgIndexFile::Type *edspIndex::GetType() const
 {
    return &_apt_Edsp;
 }
 const pkgIndexFile::Type *edspIndex::GetType() const
 {
    return &_apt_Edsp;
 }

+
+class APT_HIDDEN eippIFType: public pkgIndexFile::Type
+{
+   public:
+   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &) const APT_OVERRIDE
+   {
+      // we don't have a record parser for this type as the file is not presistent
+      return NULL;
+   };
+   eippIFType() {Label = "EIPP scenario file";};
+};
+APT_HIDDEN eippIFType _apt_Eipp;
+const pkgIndexFile::Type *eippIndex::GetType() const
+{
+   return &_apt_Eipp;
+}

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

+edspLikeIndex::~edspLikeIndex() {}

 edspIndex::~edspIndex() {}
 edspIndex::~edspIndex() {}

+eippIndex::~eippIndex() {}