merged r1970 lp:~vorlon/apt/lp.968828

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

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index c96ccfd77e5adf3af1843ac58b7276d6045d62d6..0fddfb45134ada915dfd445c5aa5e5ec4c132ded 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -8,15 +8,19 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include<config.h>
+

 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>

-
-#include <apti18n.h>
+#include <apt-pkg/metaindex.h>
+#include <apt-pkg/indexfile.h>

 
 #include <fstream>
 
 #include <fstream>

+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 using namespace std;
                                                                        /*}}}*/
 
 using namespace std;


@@ -29,7 +33,7 @@ unsigned long pkgSourceList::Type::GlobalListLen = 0;
 // Type::Type - Constructor                                            /*{{{*/
 // ---------------------------------------------------------------------
 /* Link this to the global list of items*/
 // Type::Type - Constructor                                            /*{{{*/
 // ---------------------------------------------------------------------
 /* Link this to the global list of items*/

-pkgSourceList::Type::Type()
+pkgSourceList::Type::Type() : Name(NULL), Label(NULL)

 {
    ItmList[GlobalListLen] = this;
    GlobalListLen++;
 {
    ItmList[GlobalListLen] = this;
    GlobalListLen++;


@@ -173,7 +177,7 @@ pkgSourceList::pkgSourceList(string File)
 /* */
 pkgSourceList::~pkgSourceList()
 {
 /* */
 pkgSourceList::~pkgSourceList()
 {

-   for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); ++I)

       delete *I;
 }
                                                                        /*}}}*/
       delete *I;
 }
                                                                        /*}}}*/


@@ -218,7 +222,7 @@ bool pkgSourceList::ReadMainList()
 /* */
 void pkgSourceList::Reset()
 {
 /* */
 void pkgSourceList::Reset()
 {

-   for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); ++I)

       delete *I;
    SrcList.erase(SrcList.begin(),SrcList.end());
 }
       delete *I;
    SrcList.erase(SrcList.begin(),SrcList.end());
 }


@@ -266,7 +270,7 @@ bool pkgSourceList::ReadAppend(string File)
       // CNC:2003-02-20 - Do not break if '#' is inside [].
       for (I = Buffer; *I != 0 && *I != '#'; I++)
          if (*I == '[')
       // CNC:2003-02-20 - Do not break if '#' is inside [].
       for (I = Buffer; *I != 0 && *I != '#'; I++)
          if (*I == '[')

-           for (I++; *I != 0 && *I != ']'; I++);
+           I = strchr(I + 1, ']');

       *I = 0;
       
       const char *C = _strstrip(Buffer);
       *I = 0;
       
       const char *C = _strstrip(Buffer);


@@ -296,11 +300,11 @@ bool pkgSourceList::ReadAppend(string File)
 bool pkgSourceList::FindIndex(pkgCache::PkgFileIterator File,
                              pkgIndexFile *&Found) const
 {
 bool pkgSourceList::FindIndex(pkgCache::PkgFileIterator File,
                              pkgIndexFile *&Found) const
 {

-   for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); ++I)

    {
       vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
       for (vector<pkgIndexFile *>::const_iterator J = Indexes->begin();
    {
       vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
       for (vector<pkgIndexFile *>::const_iterator J = Indexes->begin();

-          J != Indexes->end(); J++)
+          J != Indexes->end(); ++J)

       {
          if ((*J)->FindInCache(*File.Cache()) == File)
          {
       {
          if ((*J)->FindInCache(*File.Cache()) == File)
          {


@@ -318,7 +322,7 @@ bool pkgSourceList::FindIndex(pkgCache::PkgFileIterator File,
 /* */
 bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const
 {
 /* */
 bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const
 {

-   for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
+   for (const_iterator I = SrcList.begin(); I != SrcList.end(); ++I)

       if ((*I)->GetIndexes(Owner,GetAll) == false)
         return false;
    return true;
       if ((*I)->GetIndexes(Owner,GetAll) == false)
         return false;
    return true;


@@ -334,7 +338,7 @@ bool pkgSourceList::ReadSourceDir(string Dir)
    vector<string> const List = GetListOfFilesInDir(Dir, "list", true);
 
    // Read the files
    vector<string> const List = GetListOfFilesInDir(Dir, "list", true);
 
    // Read the files

-   for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)
+   for (vector<string>::const_iterator I = List.begin(); I != List.end(); ++I)

       if (ReadAppend(*I) == false)
         return false;
    return true;
       if (ReadAppend(*I) == false)
         return false;
    return true;


@@ -346,14 +350,18 @@ bool pkgSourceList::ReadSourceDir(string Dir)
 /* */
 time_t pkgSourceList::GetLastModifiedTime()
 {
 /* */
 time_t pkgSourceList::GetLastModifiedTime()
 {

-   // go over the parts
+   vector<string> List;
+

    string Main = _config->FindFile("Dir::Etc::sourcelist");
    string Parts = _config->FindDir("Dir::Etc::sourceparts");
    string Main = _config->FindFile("Dir::Etc::sourcelist");
    string Parts = _config->FindDir("Dir::Etc::sourceparts");

-   vector<string> const List = GetListOfFilesInDir(Parts, "list", true);
+
+   // go over the parts
+   if (DirectoryExists(Parts) == true)
+      List = GetListOfFilesInDir(Parts, "list", true);

 
    // calculate the time
    time_t mtime_sources = GetModificationTime(Main);
 
    // calculate the time
    time_t mtime_sources = GetModificationTime(Main);

-   for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)
+   for (vector<string>::const_iterator I = List.begin(); I != List.end(); ++I)

       mtime_sources = std::max(mtime_sources, GetModificationTime(*I));
 
    return mtime_sources;
       mtime_sources = std::max(mtime_sources, GetModificationTime(*I));
 
    return mtime_sources;