Remove invalid "-f" option for apt-get check

[apt.git] / apt-pkg / cacheiterators.h

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index e2ca746838ce075977406c5d669607efc39504f7..886d84838ab7b8f99b1d3b03933b8611557e3028 100644 (file)
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -29,10 +29,15 @@
                                                                        /*}}}*/
 #ifndef PKGLIB_CACHEITERATORS_H
 #define PKGLIB_CACHEITERATORS_H
                                                                        /*}}}*/
 #ifndef PKGLIB_CACHEITERATORS_H
 #define PKGLIB_CACHEITERATORS_H

+#include<iterator>
+
+#include<string.h>
+

 // abstract Iterator template                                          /*{{{*/
 /* This template provides the very basic iterator methods we
    need to have for doing some walk-over-the-cache magic */
 // abstract Iterator template                                          /*{{{*/
 /* This template provides the very basic iterator methods we
    need to have for doing some walk-over-the-cache magic */

-template<typename Str, typename Itr> class pkgCache::Iterator {
+template<typename Str, typename Itr> class pkgCache::Iterator :
+                       public std::iterator<std::forward_iterator_tag, Str> {

        protected:
        Str *S;
        pkgCache *Owner;
        protected:
        Str *S;
        pkgCache *Owner;


@@ -64,13 +69,19 @@ template<typename Str, typename Itr> class pkgCache::Iterator {
        inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;};
        inline Str &operator *() {return *S;};
        inline Str const &operator *() const {return *S;};
        inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;};
        inline Str &operator *() {return *S;};
        inline Str const &operator *() const {return *S;};

-       inline pkgCache *Cache() {return Owner;};
+       inline pkgCache *Cache() const {return Owner;};

 
        // Mixed stuff
        inline void operator =(const Itr &B) {S = B.S; Owner = B.Owner;};
        inline bool IsGood() const { return S && Owner && ! end();};
        inline unsigned long Index() const {return S - OwnerPointer();};
 
 
        // Mixed stuff
        inline void operator =(const Itr &B) {S = B.S; Owner = B.Owner;};
        inline bool IsGood() const { return S && Owner && ! end();};
        inline unsigned long Index() const {return S - OwnerPointer();};
 

+       void ReMap(void const * const oldMap, void const * const newMap) {
+               if (Owner == 0 || S == 0)
+                       return;
+               S += (Str*)(newMap) - (Str*)(oldMap);
+       }
+

        // Constructors - look out for the variable assigning
        inline Iterator() : S(0), Owner(0) {};
        inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {};
        // Constructors - look out for the variable assigning
        inline Iterator() : S(0), Owner(0) {};
        inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {};


@@ -86,7 +97,7 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
 
        protected:
        inline Group* OwnerPointer() const {
 
        protected:
        inline Group* OwnerPointer() const {

-               return Owner->GrpP;
+               return (Owner != 0) ? Owner->GrpP : 0;

        };
 
        public:
        };
 
        public:


@@ -101,8 +112,16 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
 
        inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;};
        inline PkgIterator PackageList() const;
 
        inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;};
        inline PkgIterator PackageList() const;

-       PkgIterator FindPkg(string Arch = "any");
-       PkgIterator NextPkg(PkgIterator const &Pkg);
+       PkgIterator FindPkg(std::string Arch = "any") const;
+       /** \brief find the package with the "best" architecture
+
+           The best architecture is either the "native" or the first
+           in the list of Architectures which is not an end-Pointer
+
+           \param PreferNonVirtual tries to respond with a non-virtual package
+                  and only if this fails returns the best virtual package */
+       PkgIterator FindPreferredPkg(bool const &PreferNonVirtual = true) const;
+       PkgIterator NextPkg(PkgIterator const &Pkg) const;

 
        // Constructors
        inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator<Group, GrpIterator>(Owner, Trg), HashIndex(0) {
 
        // Constructors
        inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator<Group, GrpIterator>(Owner, Trg), HashIndex(0) {


@@ -119,7 +138,7 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
 
        protected:
        inline Package* OwnerPointer() const {
 
        protected:
        inline Package* OwnerPointer() const {

-               return Owner->PkgP;
+               return (Owner != 0) ? Owner->PkgP : 0;

        };
 
        public:
        };
 
        public:


@@ -166,7 +185,7 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
 class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
        protected:
        inline Version* OwnerPointer() const {
 class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
        protected:
        inline Version* OwnerPointer() const {

-               return Owner->VerP;
+               return (Owner != 0) ? Owner->VerP : 0;

        };
 
        public:
        };
 
        public:


@@ -176,20 +195,22 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
 
        // Comparison
        int CompareVer(const VerIterator &B) const;
 
        // Comparison
        int CompareVer(const VerIterator &B) const;

+       /** \brief compares two version and returns if they are similar
+
+           This method should be used to identify if two pseudo versions are
+           refering to the same "real" version */
+       inline bool SimilarVer(const VerIterator &B) const {
+               return (B.end() == false && S->Hash == B->Hash && strcmp(VerStr(), B.VerStr()) == 0);
+       };

 
        // Accessors
        inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;};
        inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;};
        inline const char *Arch() const {
 
        // Accessors
        inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;};
        inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;};
        inline const char *Arch() const {

-               if(S->MultiArch == pkgCache::Version::All)
+               if ((S->MultiArch & pkgCache::Version::All) == pkgCache::Version::All)

                        return "all";
                return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
        };
                        return "all";
                return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
        };

-       inline const char *Arch(bool const pseudo) const {
-               if(pseudo == false)
-                       return Arch();
-               return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
-       };

        inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};
 
        inline DescIterator DescriptionList() const;
        inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};
 
        inline DescIterator DescriptionList() const;


@@ -198,11 +219,11 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
        inline PrvIterator ProvidesList() const;
        inline VerFileIterator FileList() const;
        bool Downloadable() const;
        inline PrvIterator ProvidesList() const;
        inline VerFileIterator FileList() const;
        bool Downloadable() const;

-       inline const char *PriorityType() {return Owner->Priority(S->Priority);};
-       string RelStr();
+       inline const char *PriorityType() const {return Owner->Priority(S->Priority);};
+       const char *MultiArchType() const;
+       std::string RelStr() const;

 
        bool Automatic() const;
 
        bool Automatic() const;

-       bool Pseudo() const;

        VerFileIterator NewestFile() const;
 
        inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Version, VerIterator>(Owner, Trg) {
        VerFileIterator NewestFile() const;
 
        inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Version, VerIterator>(Owner, Trg) {


@@ -216,7 +237,7 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
 class pkgCache::DescIterator : public Iterator<Description, DescIterator> {
        protected:
        inline Description* OwnerPointer() const {
 class pkgCache::DescIterator : public Iterator<Description, DescIterator> {
        protected:
        inline Description* OwnerPointer() const {

-               return Owner->DescP;
+               return (Owner != 0) ? Owner->DescP : 0;

        };
 
        public:
        };
 
        public:


@@ -245,7 +266,7 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
 
        protected:
        inline Dependency* OwnerPointer() const {
 
        protected:
        inline Dependency* OwnerPointer() const {

-               return Owner->DepP;
+               return (Owner != 0) ? Owner->DepP : 0;

        };
 
        public:
        };
 
        public:


@@ -256,17 +277,26 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
 
        // Accessors
        inline const char *TargetVer() const {return S->Version == 0?0:Owner->StrP + S->Version;};
 
        // Accessors
        inline const char *TargetVer() const {return S->Version == 0?0:Owner->StrP + S->Version;};

-       inline PkgIterator TargetPkg() {return PkgIterator(*Owner,Owner->PkgP + S->Package);};
-       inline PkgIterator SmartTargetPkg() {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;};
-       inline VerIterator ParentVer() {return VerIterator(*Owner,Owner->VerP + S->ParentVer);};
-       inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);};
-       inline bool Reverse() {return Type == DepRev;};
-       bool IsCritical();
+       inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->Package);};
+       inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;};
+       inline VerIterator ParentVer() const {return VerIterator(*Owner,Owner->VerP + S->ParentVer);};
+       inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);};
+       inline bool Reverse() const {return Type == DepRev;};
+       bool IsCritical() const;
+       bool IsNegative() const;
+       bool IsIgnorable(PrvIterator const &Prv) const;
+       bool IsIgnorable(PkgIterator const &Pkg) const;
+       bool IsMultiArchImplicit() const;
+       bool IsSatisfied(VerIterator const &Ver) const;
+       bool IsSatisfied(PrvIterator const &Prv) const;

        void GlobOr(DepIterator &Start,DepIterator &End);
        void GlobOr(DepIterator &Start,DepIterator &End);

-       Version **AllTargets();
-       bool SmartTargetPkg(PkgIterator &Result);
-       inline const char *CompType() {return Owner->CompType(S->CompareOp);};
-       inline const char *DepType() {return Owner->DepType(S->Type);};
+       Version **AllTargets() const;
+       bool SmartTargetPkg(PkgIterator &Result) const;
+       inline const char *CompType() const {return Owner->CompType(S->CompareOp);};
+       inline const char *DepType() const {return Owner->DepType(S->Type);};
+
+       //Nice printable representation
+       friend std::ostream& operator <<(std::ostream& out, DepIterator D);

 
        inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) :
                Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepVer) {
 
        inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) :
                Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepVer) {


@@ -287,7 +317,7 @@ class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> {
 
        protected:
        inline Provides* OwnerPointer() const {
 
        protected:
        inline Provides* OwnerPointer() const {

-               return Owner->ProvideP;
+               return (Owner != 0) ? Owner->ProvideP : 0;

        };
 
        public:
        };
 
        public:


@@ -299,12 +329,13 @@ class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> {
        // Accessors
        inline const char *Name() const {return Owner->StrP + Owner->PkgP[S->ParentPkg].Name;};
        inline const char *ProvideVersion() const {return S->ProvideVersion == 0?0:Owner->StrP + S->ProvideVersion;};
        // Accessors
        inline const char *Name() const {return Owner->StrP + Owner->PkgP[S->ParentPkg].Name;};
        inline const char *ProvideVersion() const {return S->ProvideVersion == 0?0:Owner->StrP + S->ProvideVersion;};

-       inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};
-       inline VerIterator OwnerVer() {return VerIterator(*Owner,Owner->VerP + S->Version);};
-       inline PkgIterator OwnerPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);};
+       inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};
+       inline VerIterator OwnerVer() const {return VerIterator(*Owner,Owner->VerP + S->Version);};
+       inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);};

 
 

-       inline PrvIterator() : Iterator<Provides, PrvIterator>(), Type(PrvVer) {};
+       bool IsMultiArchImplicit() const;

 
 

+       inline PrvIterator() : Iterator<Provides, PrvIterator>(), Type(PrvVer) {};

        inline PrvIterator(pkgCache &Owner, Provides *Trg, Version*) :
                Iterator<Provides, PrvIterator>(Owner, Trg), Type(PrvVer) {
                if (S == 0)
        inline PrvIterator(pkgCache &Owner, Provides *Trg, Version*) :
                Iterator<Provides, PrvIterator>(Owner, Trg), Type(PrvVer) {
                if (S == 0)


@@ -321,7 +352,7 @@ class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> {
 class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator> {
        protected:
        inline PackageFile* OwnerPointer() const {
 class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator> {
        protected:
        inline PackageFile* OwnerPointer() const {

-               return Owner->PkgFileP;
+               return (Owner != 0) ? Owner->PkgFileP : 0;

        };
 
        public:
        };
 
        public:


@@ -342,7 +373,7 @@ class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator>
        inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;};
 
        bool IsOk();
        inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;};
 
        bool IsOk();

-       string RelStr();
+       std::string RelStr();

 
        // Constructors
        inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {};
 
        // Constructors
        inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {};


@@ -354,7 +385,7 @@ class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator>
 class pkgCache::VerFileIterator : public pkgCache::Iterator<VerFile, VerFileIterator> {
        protected:
        inline VerFile* OwnerPointer() const {
 class pkgCache::VerFileIterator : public pkgCache::Iterator<VerFile, VerFileIterator> {
        protected:
        inline VerFile* OwnerPointer() const {

-               return Owner->VerFileP;
+               return (Owner != 0) ? Owner->VerFileP : 0;

        };
 
        public:
        };
 
        public:


@@ -373,7 +404,7 @@ class pkgCache::VerFileIterator : public pkgCache::Iterator<VerFile, VerFileIter
 class pkgCache::DescFileIterator : public Iterator<DescFile, DescFileIterator> {
        protected:
        inline DescFile* OwnerPointer() const {
 class pkgCache::DescFileIterator : public Iterator<DescFile, DescFileIterator> {
        protected:
        inline DescFile* OwnerPointer() const {

-               return Owner->DescFileP;
+               return (Owner != 0) ? Owner->DescFileP : 0;

        };
 
        public:
        };
 
        public: