use fileutl exists-functions instead of doing the stat'ing by hand

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

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 72d8e4d4174af464d9c9c8ddc6f9361f20eb0441..f5c19a4d600e0301eac09aa8c20ba2b347da92f9 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -1,15 +1,18 @@
 /*
  */
 /*
  */

+#include<config.h>

 
 #include<apt-pkg/init.h>
 #include<apt-pkg/error.h>
 #include<apt-pkg/cdromutl.h>
 #include<apt-pkg/strutl.h>
 #include<apt-pkg/cdrom.h>
 
 #include<apt-pkg/init.h>
 #include<apt-pkg/error.h>
 #include<apt-pkg/cdromutl.h>
 #include<apt-pkg/strutl.h>
 #include<apt-pkg/cdrom.h>

+#include<apt-pkg/aptconfiguration.h>
+#include<apt-pkg/configuration.h>
+#include<apt-pkg/fileutl.h>
+

 #include<sstream>
 #include<fstream>
 #include<sstream>
 #include<fstream>

-#include<config.h>
-#include<apti18n.h>

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


@@ -20,6 +23,8 @@
 
 #include "indexcopy.h"
 
 
 #include "indexcopy.h"
 

+#include<apti18n.h>
+

 using namespace std;
 
 // FindPackages - Find the package files on the CDROM                  /*{{{*/
 using namespace std;
 
 // FindPackages - Find the package files on the CDROM                  /*{{{*/


@@ -53,15 +58,14 @@ bool pkgCdrom::FindPackages(string CD,
       return _error->Errno("chdir","Unable to change to %s",CD.c_str());
 
    // Look for a .disk subdirectory
       return _error->Errno("chdir","Unable to change to %s",CD.c_str());
 
    // Look for a .disk subdirectory

-   struct stat Buf;
-   if (stat(".disk",&Buf) == 0)
+   if (DirectoryExists(".disk") == true)

    {
       if (InfoDir.empty() == true)
         InfoDir = CD + ".disk/";
    }
 
    // Don't look into directories that have been marked to ingore.
    {
       if (InfoDir.empty() == true)
         InfoDir = CD + ".disk/";
    }
 
    // Don't look into directories that have been marked to ingore.

-   if (stat(".aptignr",&Buf) == 0)
+   if (RealFileExists(".aptignr") == true)

       return true;
 
 
       return true;
 
 


@@ -69,50 +73,77 @@ bool pkgCdrom::FindPackages(string CD,
       under a Packages/Source file are in control of that file and stops 
       the scanning
    */
       under a Packages/Source file are in control of that file and stops 
       the scanning
    */

-   if (stat("Release.gpg",&Buf) == 0)
+   if (RealFileExists("Release.gpg") == true)

    {
       SigList.push_back(CD);
    }
    {
       SigList.push_back(CD);
    }

+

    /* Aha! We found some package files. We assume that everything under 
       this dir is controlled by those package files so we don't look down
       anymore */
    /* Aha! We found some package files. We assume that everything under 
       this dir is controlled by those package files so we don't look down
       anymore */

-   if (stat("Packages",&Buf) == 0 || stat("Packages.gz",&Buf) == 0)
+   std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors();
+   for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+       c != compressor.end(); ++c)

    {
    {

+      if (RealFileExists(std::string("Packages").append(c->Extension).c_str()) == false)
+        continue;
+
+      if (_config->FindB("Debug::aptcdrom",false) == true)
+        std::clog << "Found Packages in " << CD << std::endl;

       List.push_back(CD);
       List.push_back(CD);

-      
+

       // Continue down if thorough is given
       if (_config->FindB("APT::CDROM::Thorough",false) == false)
         return true;
       // Continue down if thorough is given
       if (_config->FindB("APT::CDROM::Thorough",false) == false)
         return true;

+      break;

    }
    }

-   if (stat("Sources.gz",&Buf) == 0 || stat("Sources",&Buf) == 0)
+   for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+       c != compressor.end(); ++c)

    {
    {

+      if (RealFileExists(std::string("Sources").append(c->Extension).c_str()) == false)
+        continue;
+
+      if (_config->FindB("Debug::aptcdrom",false) == true)
+        std::clog << "Found Sources in " << CD << std::endl;

       SList.push_back(CD);
       SList.push_back(CD);

-      
+

       // Continue down if thorough is given
       if (_config->FindB("APT::CDROM::Thorough",false) == false)
         return true;
       // Continue down if thorough is given
       if (_config->FindB("APT::CDROM::Thorough",false) == false)
         return true;

+      break;

    }
 
    }
 

-   // see if we find translatin indexes
-   if (stat("i18n",&Buf) == 0)
+   // see if we find translation indices
+   if (DirectoryExists("i18n") == true)

    {
       D = opendir("i18n");
       for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
       {
    {
       D = opendir("i18n");
       for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
       {

-        if(strstr(Dir->d_name,"Translation") != NULL) 
+        if(strncmp(Dir->d_name, "Translation-", strlen("Translation-")) != 0)
+           continue;
+        string file = Dir->d_name;
+        for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+             c != compressor.end(); ++c)

         {
         {

-           if (_config->FindB("Debug::aptcdrom",false) == true)
-              std::clog << "found translations: " << Dir->d_name << "\n";
-           string file = Dir->d_name;
-           if(file.substr(file.size()-3,file.size()) == ".gz")
-              file = file.substr(0,file.size()-3);
-           TransList.push_back(CD+"i18n/"+ file);
+           string fileext = flExtension(file);
+           if (file == fileext)
+              fileext.clear();
+           else if (fileext.empty() == false)
+              fileext = "." + fileext;
+
+           if (c->Extension == fileext)
+           {
+              if (_config->FindB("Debug::aptcdrom",false) == true)
+                 std::clog << "Found translation " << Dir->d_name << " in " << CD << "i18n/" << std::endl;
+              file.erase(file.size() - fileext.size());
+              TransList.push_back(CD + "i18n/" + file);
+              break;
+           }

         }
       }
       closedir(D);
    }
 
         }
       }
       closedir(D);
    }
 

-   

    D = opendir(".");
    if (D == 0)
       return _error->Errno("opendir","Unable to read %s",CD.c_str());
    D = opendir(".");
    if (D == 0)
       return _error->Errno("opendir","Unable to read %s",CD.c_str());


@@ -153,7 +184,11 @@ bool pkgCdrom::FindPackages(string CD,
         break;
 
       if (chdir(CD.c_str()) != 0)
         break;
 
       if (chdir(CD.c_str()) != 0)

-        return _error->Errno("chdir","Unable to change to %s",CD.c_str());
+      {
+        _error->Errno("chdir","Unable to change to %s", CD.c_str());
+        closedir(D);
+        return false;
+      }

    };
 
    closedir(D);
    };
 
    closedir(D);


@@ -196,7 +231,7 @@ int pkgCdrom::Score(string Path)
    // a symlink gets a big penalty
    struct stat Buf;
    string statPath = flNotFile(Path);
    // a symlink gets a big penalty
    struct stat Buf;
    string statPath = flNotFile(Path);

-   string cdromPath = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+   string cdromPath = _config->FindDir("Acquire::cdrom::mount");

    while(statPath != cdromPath && statPath != "./") {
       statPath.resize(statPath.size()-1);  // remove the trailing '/'
       if (lstat(statPath.c_str(),&Buf) == 0) {
    while(statPath != cdromPath && statPath != "./") {
       statPath.resize(statPath.size()-1);  // remove the trailing '/'
       if (lstat(statPath.c_str(),&Buf) == 0) {


@@ -216,33 +251,23 @@ int pkgCdrom::Score(string Path)
 /* Here we drop everything that is not this machines arch */
 bool pkgCdrom::DropBinaryArch(vector<string> &List)
 {
 /* Here we drop everything that is not this machines arch */
 bool pkgCdrom::DropBinaryArch(vector<string> &List)
 {

-   char S[300];
-   snprintf(S,sizeof(S),"/binary-%s/",
-           _config->Find("Apt::Architecture").c_str());
-   
+

    for (unsigned int I = 0; I < List.size(); I++)
    {
       const char *Str = List[I].c_str();
    for (unsigned int I = 0; I < List.size(); I++)
    {
       const char *Str = List[I].c_str();

-      
-      const char *Res;
-      if ((Res = strstr(Str,"/binary-")) == 0)
+      const char *Start, *End;
+      if ((Start = strstr(Str,"/binary-")) == 0)

         continue;
 
         continue;
 

-      // Weird, remove it.
-      if (strlen(Res) < strlen(S))
-      {
-        List.erase(List.begin() + I);
-        I--;
-        continue;
-      }
-         
-      // See if it is our arch
-      if (stringcmp(Res,Res + strlen(S),S) == 0)
-        continue;
-      
-      // Erase it
+      // Between Start and End is the architecture
+      Start += 8;
+      if ((End = strstr(Start,"/")) != 0 && Start != End &&
+          APT::Configuration::checkArchitecture(string(Start, End)) == true)
+        continue; // okay, architecture is accepted
+
+      // not accepted -> Erase it

       List.erase(List.begin() + I);
       List.erase(List.begin() + I);

-      I--;
+      --I; // the next entry is at the same index after the erase

    }
    
    return true;
    }
    
    return true;


@@ -255,18 +280,31 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
 {
    // Get a list of all the inodes
    ino_t *Inodes = new ino_t[List.size()];
 {
    // Get a list of all the inodes
    ino_t *Inodes = new ino_t[List.size()];

-   for (unsigned int I = 0; I != List.size(); I++)
+   for (unsigned int I = 0; I != List.size(); ++I)

    {
       struct stat Buf;
    {
       struct stat Buf;

-      if (stat((List[I] + Name).c_str(),&Buf) != 0 &&
-         stat((List[I] + Name + ".gz").c_str(),&Buf) != 0)
-        _error->Errno("stat","Failed to stat %s%s",List[I].c_str(),
-                      Name);
-      Inodes[I] = Buf.st_ino;
+      bool found = false;
+
+      std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors();
+      for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+          c != compressor.end(); ++c)
+      {
+        std::string filename = std::string(List[I]).append(Name).append(c->Extension);
+         if (stat(filename.c_str(), &Buf) != 0)
+           continue;
+        Inodes[I] = Buf.st_ino;
+        found = true;
+        break;
+      }
+
+      if (found == false)
+         _error->Errno("stat","Failed to stat %s%s",List[I].c_str(), Name);

    }
    }

-   
-   if (_error->PendingError() == true)
+
+   if (_error->PendingError() == true) {
+      delete[] Inodes;

       return false;
       return false;

+   }

    
    // Look for dups
    for (unsigned int I = 0; I != List.size(); I++)
    
    // Look for dups
    for (unsigned int I = 0; I != List.size(); I++)


@@ -289,7 +327,8 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
         List[J] = string();
       }
    }  
         List[J] = string();
       }
    }  

- 
+   delete[] Inodes;
+

    // Wipe erased entries
    for (unsigned int I = 0; I < List.size();)
    {
    // Wipe erased entries
    for (unsigned int I = 0; I < List.size();)
    {


@@ -311,7 +350,7 @@ void pkgCdrom::ReduceSourcelist(string CD,vector<string> &List)
    sort(List.begin(),List.end());
    
    // Collect similar entries
    sort(List.begin(),List.end());
    
    // Collect similar entries

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

    {
       // Find a space..
       string::size_type Space = (*I).find(' ');
    {
       // Find a space..
       string::size_type Space = (*I).find(' ');


@@ -323,7 +362,7 @@ void pkgCdrom::ReduceSourcelist(string CD,vector<string> &List)
 
       string Word1 = string(*I,Space,SSpace-Space);
       string Prefix = string(*I,0,Space);
 
       string Word1 = string(*I,Space,SSpace-Space);
       string Prefix = string(*I,0,Space);

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

       {
         // Find a space..
         string::size_type Space2 = (*J).find(' ');
       {
         // Find a space..
         string::size_type Space2 = (*J).find(' ');


@@ -390,7 +429,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
 
    Out.close();
    
 
    Out.close();
    

-   rename(DFile.c_str(),string(DFile + '~').c_str());
+   link(DFile.c_str(),string(DFile + '~').c_str());

    if (rename(NewFile.c_str(),DFile.c_str()) != 0)
       return _error->Errno("rename","Failed to rename %s.new to %s",
                           DFile.c_str(),DFile.c_str());
    if (rename(NewFile.c_str(),DFile.c_str()) != 0)
       return _error->Errno("rename","Failed to rename %s.new to %s",
                           DFile.c_str(),DFile.c_str());


@@ -406,7 +445,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
    that were the same. */
 bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
 {
    that were the same. */
 bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
 {

-   if (List.size() == 0)
+   if (List.empty() == true)

       return true;
 
    string File = _config->FindFile("Dir::Etc::sourcelist");
       return true;
 
    string File = _config->FindFile("Dir::Etc::sourcelist");


@@ -456,7 +495,7 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
 
       if (First == true)
       {
 
       if (First == true)
       {

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

         {
            string::size_type Space = (*I).find(' ');
            if (Space == string::npos)
         {
            string::size_type Space = (*I).find(' ');
            if (Space == string::npos)


@@ -490,7 +529,7 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
    // Just in case the file was empty
    if (First == true)
    {
    // Just in case the file was empty
    if (First == true)
    {

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

       {
         string::size_type Space = (*I).find(' ');
         if (Space == string::npos)
       {
         string::size_type Space = (*I).find(' ');
         if (Space == string::npos)


@@ -516,11 +555,12 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)          /*{{{*/
    stringstream msg;
 
    // Startup
    stringstream msg;
 
    // Startup

-   string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+   string CDROM = _config->FindDir("Acquire::cdrom::mount");

    if (CDROM[0] == '.')
       CDROM= SafeGetCWD() + '/' + CDROM;
 
    if (CDROM[0] == '.')
       CDROM= SafeGetCWD() + '/' + CDROM;
 

-   if(log) {
+   if (log != NULL)
+   {

       msg.str("");
       ioprintf(msg, _("Using CD-ROM mount point %s\nMounting CD-ROM\n"),
                      CDROM.c_str());
       msg.str("");
       ioprintf(msg, _("Using CD-ROM mount point %s\nMounting CD-ROM\n"),
                      CDROM.c_str());


@@ -530,7 +570,7 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)            /*{{{*/
       return _error->Error("Failed to mount the cdrom.");
 
    // Hash the CD to get an ID
       return _error->Error("Failed to mount the cdrom.");
 
    // Hash the CD to get an ID

-   if(log) 
+   if (log != NULL)

       log->Update(_("Identifying.. "));
    
 
       log->Update(_("Identifying.. "));
    
 


@@ -540,10 +580,12 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)          /*{{{*/
       return false;
    }
 
       return false;
    }
 

-   msg.str("");
-   ioprintf(msg, "[%s]\n",ident.c_str());
-   log->Update(msg.str());
-
+   if (log != NULL)
+   {
+      msg.str("");
+      ioprintf(msg, "[%s]\n",ident.c_str());
+      log->Update(msg.str());
+   }

 
    // Read the database
    Configuration Database;
 
    // Read the database
    Configuration Database;


@@ -554,7 +596,8 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)            /*{{{*/
         return _error->Error("Unable to read the cdrom database %s",
                              DFile.c_str());
    }
         return _error->Error("Unable to read the cdrom database %s",
                              DFile.c_str());
    }

-   if(log) {
+   if (log != NULL)
+   {

       msg.str("");
       ioprintf(msg, _("Stored label: %s\n"),
       Database.Find("CD::"+ident).c_str());
       msg.str("");
       ioprintf(msg, _("Stored label: %s\n"),
       Database.Find("CD::"+ident).c_str());


@@ -562,8 +605,10 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)           /*{{{*/
    }
 
    // Unmount and finish
    }
 
    // Unmount and finish

-   if (_config->FindB("APT::CDROM::NoMount",false) == false) {
-      log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
+   if (_config->FindB("APT::CDROM::NoMount",false) == false)
+   {
+      if (log != NULL)
+        log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);

       UnmountCdrom(CDROM);
    }
 
       UnmountCdrom(CDROM);
    }
 


@@ -575,11 +620,12 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
    stringstream msg;
 
    // Startup
    stringstream msg;
 
    // Startup

-   string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+   string CDROM = _config->FindDir("Acquire::cdrom::mount");

    if (CDROM[0] == '.')
       CDROM= SafeGetCWD() + '/' + CDROM;
    
    if (CDROM[0] == '.')
       CDROM= SafeGetCWD() + '/' + CDROM;
    

-   if(log) {
+   if(log != NULL)
+   {

       log->SetTotal(STEP_LAST);
       msg.str("");
       ioprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str());
       log->SetTotal(STEP_LAST);
       msg.str("");
       ioprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str());


@@ -599,11 +645,12 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
    // Unmount the CD and get the user to put in the one they want
    if (_config->FindB("APT::CDROM::NoMount",false) == false)
    {
    // Unmount the CD and get the user to put in the one they want
    if (_config->FindB("APT::CDROM::NoMount",false) == false)
    {

-      if(log)
+      if(log != NULL)

         log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT);
       UnmountCdrom(CDROM);
 
         log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT);
       UnmountCdrom(CDROM);
 

-      if(log) {
+      if(log != NULL)
+      {

         log->Update(_("Waiting for disc...\n"), STEP_WAIT);
         if(!log->ChangeCdrom()) {
            // user aborted
         log->Update(_("Waiting for disc...\n"), STEP_WAIT);
         if(!log->ChangeCdrom()) {
            // user aborted


@@ -612,26 +659,29 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
       }
 
       // Mount the new CDROM
       }
 
       // Mount the new CDROM

-      log->Update(_("Mounting CD-ROM...\n"), STEP_MOUNT);
+      if(log != NULL)
+        log->Update(_("Mounting CD-ROM...\n"), STEP_MOUNT);
+

       if (MountCdrom(CDROM) == false)
         return _error->Error("Failed to mount the cdrom.");
    }
    
    // Hash the CD to get an ID
       if (MountCdrom(CDROM) == false)
         return _error->Error("Failed to mount the cdrom.");
    }
    
    // Hash the CD to get an ID

-   if(log)
+   if(log != NULL)

       log->Update(_("Identifying.. "), STEP_IDENT);
    string ID;
    if (IdentCdrom(CDROM,ID) == false)
    {
       log->Update(_("Identifying.. "), STEP_IDENT);
    string ID;
    if (IdentCdrom(CDROM,ID) == false)
    {

-      log->Update("\n");
+      if (log != NULL)
+        log->Update("\n");

       return false;
    }
       return false;
    }

-   if(log) 
+   if(log != NULL)
+   {

       log->Update("["+ID+"]\n");
       log->Update("["+ID+"]\n");

-
-   if(log) 

       log->Update(_("Scanning disc for index files..\n"),STEP_SCAN);
       log->Update(_("Scanning disc for index files..\n"),STEP_SCAN);

-   
+   }
+

    // Get the CD structure
    vector<string> List;
    vector<string> SourceList;
    // Get the CD structure
    vector<string> List;
    vector<string> SourceList;


@@ -641,7 +691,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
    string InfoDir;
    if (FindPackages(CDROM,List,SourceList, SigList,TransList,InfoDir,log) == false)
    {
    string InfoDir;
    if (FindPackages(CDROM,List,SourceList, SigList,TransList,InfoDir,log) == false)
    {

-      log->Update("\n");
+      if (log != NULL)
+        log->Update("\n");

       return false;
    }
 
       return false;
    }
 


@@ -650,13 +701,13 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
    if (_config->FindB("Debug::aptcdrom",false) == true)
    {
       cout << "I found (binary):" << endl;
    if (_config->FindB("Debug::aptcdrom",false) == true)
    {
       cout << "I found (binary):" << endl;

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

         cout << *I << endl;
       cout << "I found (source):" << endl;
         cout << *I << endl;
       cout << "I found (source):" << endl;

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

         cout << *I << endl;
       cout << "I found (Signatures):" << endl;
         cout << *I << endl;
       cout << "I found (Signatures):" << endl;

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

         cout << *I << endl;
    }   
 
         cout << *I << endl;
    }   
 


@@ -668,7 +719,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
    DropRepeats(SourceList,"Sources");
    DropRepeats(SigList,"Release.gpg");
    DropRepeats(TransList,"");
    DropRepeats(SourceList,"Sources");
    DropRepeats(SigList,"Release.gpg");
    DropRepeats(TransList,"");

-   if(log) {
+   if(log != NULL) {

       msg.str("");
       ioprintf(msg, _("Found %zu package indexes, %zu source indexes, "
                      "%zu translation indexes and %zu signatures\n"), 
       msg.str("");
       ioprintf(msg, _("Found %zu package indexes, %zu source indexes, "
                      "%zu translation indexes and %zu signatures\n"), 


@@ -677,7 +728,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
       log->Update(msg.str(), STEP_SCAN);
    }
 
       log->Update(msg.str(), STEP_SCAN);
    }
 

-   if (List.size() == 0 && SourceList.size() == 0) 
+   if (List.empty() == true && SourceList.empty() == true) 

    {
       if (_config->FindB("APT::CDROM::NoMount",false) == false) 
         UnmountCdrom(CDROM);
    {
       if (_config->FindB("APT::CDROM::NoMount",false) == false) 
         UnmountCdrom(CDROM);


@@ -701,11 +752,12 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
         {
            // Escape special characters
            string::iterator J = Name.begin();
         {
            // Escape special characters
            string::iterator J = Name.begin();

-           for (; J != Name.end(); J++)
+           for (; J != Name.end(); ++J)

               if (*J == '"' || *J == ']' || *J == '[')
                  *J = '_';
            
               if (*J == '"' || *J == ']' || *J == '[')
                  *J = '_';
            

-           if(log) {
+           if(log != NULL)
+           {

               msg.str("");
               ioprintf(msg, _("Found label '%s'\n"), Name.c_str());
               log->Update(msg.str());
               msg.str("");
               ioprintf(msg, _("Found label '%s'\n"), Name.c_str());
               log->Update(msg.str());


@@ -717,7 +769,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
       if (_config->FindB("APT::CDROM::Rename",false) == true ||
          Name.empty() == true)
       {
       if (_config->FindB("APT::CDROM::Rename",false) == true ||
          Name.empty() == true)
       {

-        if(!log) 
+        if(log == NULL) 

          {
            if (_config->FindB("APT::CDROM::NoMount",false) == false) 
               UnmountCdrom(CDROM);
          {
            if (_config->FindB("APT::CDROM::NoMount",false) == false) 
               UnmountCdrom(CDROM);


@@ -745,18 +797,18 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
 
    // Escape special characters
    string::iterator J = Name.begin();
 
    // Escape special characters
    string::iterator J = Name.begin();

-   for (; J != Name.end(); J++)
+   for (; J != Name.end(); ++J)

       if (*J == '"' || *J == ']' || *J == '[')
         *J = '_';
    
    Database.Set("CD::" + ID,Name);
       if (*J == '"' || *J == ']' || *J == '[')
         *J = '_';
    
    Database.Set("CD::" + ID,Name);

-   if(log) {
+   if(log != NULL)
+   {

       msg.str("");
       ioprintf(msg, _("This disc is called: \n'%s'\n"), Name.c_str());
       log->Update(msg.str());
       msg.str("");
       ioprintf(msg, _("This disc is called: \n'%s'\n"), Name.c_str());
       log->Update(msg.str());

+      log->Update(_("Copying package lists..."), STEP_COPY);

    }
    }

-
-   log->Update(_("Copying package lists..."), STEP_COPY);

    // take care of the signatures and copy them if they are ok
    // (we do this before PackageCopy as it modifies "List" and "SourceList")
    SigVerify SignVerify;
    // take care of the signatures and copy them if they are ok
    // (we do this before PackageCopy as it modifies "List" and "SourceList")
    SigVerify SignVerify;


@@ -781,19 +833,18 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
       if (WriteDatabase(Database) == false)
         return false;
       
       if (WriteDatabase(Database) == false)
         return false;
       

-      if(log) {
+      if(log != NULL)

         log->Update(_("Writing new source list\n"), STEP_WRITE);
         log->Update(_("Writing new source list\n"), STEP_WRITE);

-      }

       if (WriteSourceList(Name,List,false) == false ||
          WriteSourceList(Name,SourceList,true) == false)
         return false;
    }
 
    // Print the sourcelist entries
       if (WriteSourceList(Name,List,false) == false ||
          WriteSourceList(Name,SourceList,true) == false)
         return false;
    }
 
    // Print the sourcelist entries

-   if(log) 
+   if(log != NULL)

       log->Update(_("Source list entries for this disc are:\n"));
 
       log->Update(_("Source list entries for this disc are:\n"));
 

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

    {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
    {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)


@@ -803,7 +854,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
         return _error->Error("Internal error");
       }
 
         return _error->Error("Internal error");
       }
 

-      if(log) {
+      if(log != NULL)
+      {

         msg.str("");
         msg << "deb cdrom:[" << Name << "]/" << string(*I,0,Space) << 
            " " << string(*I,Space+1) << endl;
         msg.str("");
         msg << "deb cdrom:[" << Name << "]/" << string(*I,0,Space) << 
            " " << string(*I,Space+1) << endl;


@@ -811,7 +863,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
       }
    }
 
       }
    }
 

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

    {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
    {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)


@@ -821,7 +873,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
         return _error->Error("Internal error");
       }
 
         return _error->Error("Internal error");
       }
 

-      if(log) {
+      if(log != NULL) {

         msg.str("");
         msg << "deb-src cdrom:[" << Name << "]/" << string(*I,0,Space) << 
            " " << string(*I,Space+1) << endl;
         msg.str("");
         msg << "deb-src cdrom:[" << Name << "]/" << string(*I,0,Space) << 
            " " << string(*I,Space+1) << endl;


@@ -829,11 +881,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
       }
    }
 
       }
    }
 

-   
-

    // Unmount and finish
    if (_config->FindB("APT::CDROM::NoMount",false) == false) {
    // Unmount and finish
    if (_config->FindB("APT::CDROM::NoMount",false) == false) {

-      log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
+      if (log != NULL)
+        log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);

       UnmountCdrom(CDROM);
    }
 
       UnmountCdrom(CDROM);
    }
 


@@ -863,6 +914,7 @@ pkgUdevCdromDevices::Dlopen()                                       /*{{{*/
    libudev_handle = h;
    udev_new = (udev* (*)(void)) dlsym(h, "udev_new");
    udev_enumerate_add_match_property = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_property");
    libudev_handle = h;
    udev_new = (udev* (*)(void)) dlsym(h, "udev_new");
    udev_enumerate_add_match_property = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_property");

+   udev_enumerate_add_match_sysattr = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_sysattr");

    udev_enumerate_scan_devices = (int (*)(udev_enumerate*))dlsym(h, "udev_enumerate_scan_devices");
    udev_enumerate_get_list_entry = (udev_list_entry* (*)(udev_enumerate*))dlsym(h, "udev_enumerate_get_list_entry");
    udev_device_new_from_syspath = (udev_device* (*)(udev*, const char*))dlsym(h, "udev_device_new_from_syspath");
    udev_enumerate_scan_devices = (int (*)(udev_enumerate*))dlsym(h, "udev_enumerate_scan_devices");
    udev_enumerate_get_list_entry = (udev_list_entry* (*)(udev_enumerate*))dlsym(h, "udev_enumerate_get_list_entry");
    udev_device_new_from_syspath = (udev_device* (*)(udev*, const char*))dlsym(h, "udev_device_new_from_syspath");


@@ -876,8 +928,18 @@ pkgUdevCdromDevices::Dlopen()                                      /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+                                                                        /*{{{*/
+// convenience interface, this will just call ScanForRemovable

 vector<CdromDevice>
 vector<CdromDevice>

-pkgUdevCdromDevices::Scan()                                             /*{{{*/
+pkgUdevCdromDevices::Scan()
+{ 
+   bool CdromOnly = _config->FindB("APT::cdrom::CdromOnly", true);
+   return ScanForRemovable(CdromOnly); 
+};
+                                                                       /*}}}*/
+                                                                        /*{{{*/
+vector<CdromDevice>
+pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)

 {
    vector<CdromDevice> cdrom_devices;
    struct udev_enumerate *enumerate;
 {
    vector<CdromDevice> cdrom_devices;
    struct udev_enumerate *enumerate;


@@ -889,7 +951,11 @@ pkgUdevCdromDevices::Scan()                                             /*{{{*/
 
    udev_ctx = udev_new();
    enumerate = udev_enumerate_new (udev_ctx);
 
    udev_ctx = udev_new();
    enumerate = udev_enumerate_new (udev_ctx);

-   udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1");
+   if (CdromOnly)
+      udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1");
+   else {
+      udev_enumerate_add_match_sysattr(enumerate, "removable", "1");
+   }

 
    udev_enumerate_scan_devices (enumerate);
    devices = udev_enumerate_get_list_entry (enumerate);
 
    udev_enumerate_scan_devices (enumerate);
    devices = udev_enumerate_get_list_entry (enumerate);


@@ -901,11 +967,18 @@ pkgUdevCdromDevices::Scan()                                             /*{{{*/
       if (udevice == NULL)
         continue;
       const char* devnode = udev_device_get_devnode(udevice);
       if (udevice == NULL)
         continue;
       const char* devnode = udev_device_get_devnode(udevice);

-      const char* mountpath = udev_device_get_property_value(udevice, "FSTAB_DIR");
+
+      // try fstab_dir first
+      string mountpath;
+      const char* mp = udev_device_get_property_value(udevice, "FSTAB_DIR");
+      if (mp)
+         mountpath = string(mp);
+      else
+         mountpath = FindMountPointForDevice(devnode);

 
       // fill in the struct
       cdrom.DeviceName = string(devnode);
 
       // fill in the struct
       cdrom.DeviceName = string(devnode);

-      if (mountpath) {
+      if (mountpath != "") {

         cdrom.MountPath = mountpath;
         string s = string(mountpath);
         cdrom.Mounted = IsMounted(s);
         cdrom.MountPath = mountpath;
         string s = string(mountpath);
         cdrom.Mounted = IsMounted(s);


@@ -921,6 +994,7 @@ pkgUdevCdromDevices::Scan()                                             /*{{{*/
 
 pkgUdevCdromDevices::~pkgUdevCdromDevices()                             /*{{{*/
 { 
 
 pkgUdevCdromDevices::~pkgUdevCdromDevices()                             /*{{{*/
 { 

-   dlclose(libudev_handle);
+   if (libudev_handle != NULL)
+      dlclose(libudev_handle);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/