Merge branch 'debian/jessie' into debian/experimental

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

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 4509e54b9bbc7afde6e6a0c2c0e79e3c437fd99f..9983575092f25d4fbb337104b28c028464b680b3 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -27,15 +27,27 @@
 #ifndef PKGLIB_SOURCELIST_H
 #define PKGLIB_SOURCELIST_H
 
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
+
+#include <time.h>
+
 #include <string>
 #include <vector>
 #include <map>
-#include <apt-pkg/pkgcache.h>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/tagfile.h>
+#endif
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/metaindex.h>
 using std::string;
 using std::vector;
-    
+#endif
 
+class FileFd;
+class pkgTagSection;
 class pkgAcquire;
 class pkgIndexFile;
 class metaIndex;
@@ -43,46 +55,53 @@ class metaIndex;
 class pkgSourceList
 {
    public:
-   
+
    // List of supported source list types
    class Type
    {
       public:
-      
+
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;
-      static Type *GetType(const char *Type);
+      static Type *GetType(const char *Type) APT_PURE;
 
       const char *Name;
       const char *Label;
 
-      bool FixupURI(string &URI) const;
-      virtual bool ParseLine(vector<metaIndex *> &List,
+      bool FixupURI(std::string &URI) const;
+      virtual bool ParseStanza(std::vector<metaIndex *> &List,
+                               pkgTagSection &Tags,
+                               int stanza_n,
+                               FileFd &Fd);
+      virtual bool ParseLine(std::vector<metaIndex *> &List,
                             const char *Buffer,
-                            unsigned long const &CurLine,string const &File) const;
-      virtual bool CreateItem(vector<metaIndex *> &List,string const &URI,
-                             string const &Dist,string const &Section,
-                             std::map<string, string> const &Options) const = 0;
+                            unsigned long const &CurLine,std::string const &File) const;
+      virtual bool CreateItem(std::vector<metaIndex *> &List,std::string const &URI,
+                             std::string const &Dist,std::string const &Section,
+                             std::map<std::string, std::string> const &Options) const = 0;
       Type();
       virtual ~Type() {};
    };
-   
-   typedef vector<metaIndex *>::const_iterator const_iterator;
-   
+
+   typedef std::vector<metaIndex *>::const_iterator const_iterator;
+
    protected:
 
-   vector<metaIndex *> SrcList;
-   
+   std::vector<metaIndex *> SrcList;
+
+   int ParseFileDeb822(std::string File);
+   bool ParseFileOldStyle(std::string File);
+
    public:
 
    bool ReadMainList();
-   bool Read(string File);
+   bool Read(std::string File);
 
    // CNC:2003-03-03
    void Reset();
-   bool ReadAppend(string File);
-   bool ReadSourceDir(string Dir);
+   bool ReadAppend(std::string File);
+   bool ReadSourceDir(std::string Dir);
    
    // List accessors
    inline const_iterator begin() const {return SrcList.begin();};
@@ -98,7 +117,7 @@ class pkgSourceList
    time_t GetLastModifiedTime();
 
    pkgSourceList();
-   pkgSourceList(string File);
+   pkgSourceList(std::string File);
    ~pkgSourceList();      
 };