tests: try to support spaces in TMPDIR

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

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 35b786e1a1556b57d646cf9d3316e9e1279250b6..47a562d1825ad619ca83ae829628468106a716ff 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: sourcelist.h,v 1.12.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    SourceList - Manage a list of sources
 /* ######################################################################
 
    SourceList - Manage a list of sources


@@ -18,10 +17,6 @@
    list all you have is a list of package index files that have the ability
    to be Acquired.
    
    list all you have is a list of package index files that have the ability
    to be Acquired.
    

-   The vendor machanism is similar, except the vendor types are hard 
-   wired. Before loading the source list the vendor list is loaded.
-   This doesn't load key data, just the checks to perform.
-   

    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_SOURCELIST_H
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_SOURCELIST_H


@@ -52,60 +47,59 @@ class pkgAcquire;
 class pkgIndexFile;
 class metaIndex;
 
 class pkgIndexFile;
 class metaIndex;
 

-class pkgSource
-{
-   protected:
-
-   std::vector<metaIndex *> SrcList;
-
-};
-
-class pkgSourceList : public pkgSource
+class pkgSourceList

 {
 {

+   void * const d;
+   std::vector<pkgIndexFile*> VolatileFiles;

    public:
    public:

-   
+

    // List of supported source list types
    class Type
    {
       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) APT_PURE;
 
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;
       static Type *GetType(const char *Type) APT_PURE;
 

-      const char *Name;
-      const char *Label;
+      char const * const Name;
+      char const * const Label;

 
       bool FixupURI(std::string &URI) const;
       virtual bool ParseStanza(std::vector<metaIndex *> &List,
                                pkgTagSection &Tags,
 
       bool FixupURI(std::string &URI) const;
       virtual bool ParseStanza(std::vector<metaIndex *> &List,
                                pkgTagSection &Tags,

-                               int stanza_n,
+                               unsigned int const stanza_n,

                                FileFd &Fd);
       virtual bool ParseLine(std::vector<metaIndex *> &List,
                             const char *Buffer,
                                FileFd &Fd);
       virtual bool ParseLine(std::vector<metaIndex *> &List,
                             const char *Buffer,

-                            unsigned long const &CurLine,std::string const &File) const;
+                            unsigned int 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;
       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() {};
+      Type(char const * const Name, char const * const Label);
+      virtual ~Type();

    };
    };

-   
+

    typedef std::vector<metaIndex *>::const_iterator const_iterator;
    typedef std::vector<metaIndex *>::const_iterator const_iterator;

-   
-   public:

 
 

-   int ParseFileDeb822(std::string File);
-   bool ParseFileOldStyle(std::string File);
+   protected:
+
+   std::vector<metaIndex *> SrcList;
+
+   private:
+   APT_HIDDEN bool ParseFileDeb822(std::string const &File);
+   APT_HIDDEN bool ParseFileOldStyle(std::string const &File);
+
+   public:

 
    bool ReadMainList();
 
    bool ReadMainList();

-   bool Read(std::string File);
+   bool Read(std::string const &File);

 
    // CNC:2003-03-03
    void Reset();
 
    // CNC:2003-03-03
    void Reset();

-   bool ReadAppend(std::string File);
-   bool ReadSourceDir(std::string Dir);
+   bool ReadAppend(std::string const &File);
+   bool ReadSourceDir(std::string const &Dir);

    
    // List accessors
    inline const_iterator begin() const {return SrcList.begin();};
    
    // List accessors
    inline const_iterator begin() const {return SrcList.begin();};


@@ -120,9 +114,26 @@ class pkgSourceList : public pkgSource
    // query last-modified time
    time_t GetLastModifiedTime();
 
    // query last-modified time
    time_t GetLastModifiedTime();
 

+   /** \brief add file for parsing, but not to the cache
+    *
+    *  pkgIndexFiles origining from pkgSourcesList are included in
+    *  srcpkgcache, the status files added via #AddStatusFiles are
+    *  included in pkgcache, but these files here are not included in
+    *  any cache to have the possibility of having a file included just
+    *  for a single run like a local .deb/.dsc file.
+    *
+    *  The volatile files do not count as "normal" sourceslist entries,
+    *  can't be iterated over with #begin and #end and can't be
+    *  downloaded, but they can be found via #FindIndex.
+    *
+    *  @param File is an index file; pointer-ownership is transferred
+    */
+   void AddVolatileFile(pkgIndexFile * const File);
+   /** @return list of files registered with #AddVolatileFile */
+   std::vector<pkgIndexFile*> GetVolatileFiles() const;
+

    pkgSourceList();
    pkgSourceList();

-   pkgSourceList(std::string File);
-   ~pkgSourceList();      
+   virtual ~pkgSourceList();

 };
 
 #endif
 };
 
 #endif