wrap every unlink call to check for != /dev/null

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

diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index b8189326044b0849b931b11d5fe58371e8ae5d23..34ebcb2b8bf8703d8f8731e722488319de687170 100644 (file)
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -19,10 +19,12 @@
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/srcrecords.h>

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

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

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

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

-#include <apt-pkg/deblistparser.h>
+#include <apt-pkg/debindexfile.h>

 
 #include <sys/stat.h>
 
 
 #include <sys/stat.h>
 


@@ -65,8 +67,11 @@ pkgIndexFile::pkgIndexFile(bool const Trusted) :                     /*{{{*/
 }
                                                                        /*}}}*/
 // IndexFile::ArchiveInfo - Stub                                       /*{{{*/
 }
                                                                        /*}}}*/
 // IndexFile::ArchiveInfo - Stub                                       /*{{{*/

-std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator const &/*Ver*/) const
+std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator const &Ver) const

 {
 {

+   debDebPkgFileIndex const * const debfile = dynamic_cast<debDebPkgFileIndex const*>(this);
+   if (debfile != nullptr)
+      return debfile->ArchiveInfo_impl(Ver);

    return std::string();
 }
                                                                        /*}}}*/
    return std::string();
 }
                                                                        /*}}}*/


@@ -144,11 +149,15 @@ std::string IndexTarget::Option(OptionKeys const EnumKey) const           /*{{{*/
       APT_CASE(TARGET_OF);
       APT_CASE(CREATED_BY);
       APT_CASE(PDIFFS);
       APT_CASE(TARGET_OF);
       APT_CASE(CREATED_BY);
       APT_CASE(PDIFFS);

+      APT_CASE(DEFAULTENABLED);
+      APT_CASE(COMPRESSIONTYPES);
+      APT_CASE(SOURCESENTRY);
+      APT_CASE(BY_HASH);

 #undef APT_CASE
       case FILENAME: return _config->FindDir("Dir::State::lists") + URItoFileName(URI);
       case EXISTING_FILENAME:
         std::string const filename = Option(FILENAME);
 #undef APT_CASE
       case FILENAME: return _config->FindDir("Dir::State::lists") + URItoFileName(URI);
       case EXISTING_FILENAME:
         std::string const filename = Option(FILENAME);

-        std::vector<std::string> const types = APT::Configuration::getCompressionTypes();
+        std::vector<std::string> const types = VectorizeString(Option(COMPRESSIONTYPES), ' ');

         for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
         {
            if (t->empty())
         for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
         {
            if (t->empty())


@@ -208,7 +217,7 @@ std::string pkgDebianIndexTargetFile::IndexFileName() const                 /*{{{*/
    if (FileExists(s))
       return s;
 
    if (FileExists(s))
       return s;
 

-   std::vector<std::string> types = APT::Configuration::getCompressionTypes();
+   std::vector<std::string> const types = VectorizeString(Target.Option(IndexTarget::COMPRESSIONTYPES), ' ');

    for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
    {
       std::string p = s + '.' + *t;
    for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
    {
       std::string p = s + '.' + *t;


@@ -263,9 +272,13 @@ std::string pkgDebianIndexTargetFile::GetProgressDescription() const
    return Target.Description;
 }
 
    return Target.Description;
 }
 

-pkgDebianIndexRealFile::pkgDebianIndexRealFile(std::string const &File, bool const Trusted) :/*{{{*/
-   pkgDebianIndexFile(Trusted), d(NULL), File(flAbsPath(File))
+pkgDebianIndexRealFile::pkgDebianIndexRealFile(std::string const &pFile, bool const Trusted) :/*{{{*/
+   pkgDebianIndexFile(Trusted), d(NULL)

 {
 {

+   if (pFile == "/nonexistent/stdin")
+      File = pFile;
+   else
+      File = flAbsPath(pFile);

 }
                                                                        /*}}}*/
 // IndexRealFile::Size - Return the size of the index                  /*{{{*/
 }
                                                                        /*}}}*/
 // IndexRealFile::Size - Return the size of the index                  /*{{{*/


@@ -334,6 +347,7 @@ bool pkgDebianIndexFile::Merge(pkgCacheGenerator &Gen,OpProgress * const Prog)
    _error->PushToStack();
    std::unique_ptr<pkgCacheListParser> Parser(CreateListParser(Pkg));
    bool const newError = _error->PendingError();
    _error->PushToStack();
    std::unique_ptr<pkgCacheListParser> Parser(CreateListParser(Pkg));
    bool const newError = _error->PendingError();

+   _error->MergeWithStack();

    if (newError == false && Parser == nullptr)
       return true;
    if (Parser == NULL)
    if (newError == false && Parser == nullptr)
       return true;
    if (Parser == NULL)