report warnings&errors consistently in edit-sources

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

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 392cd890e648d0d520741277f886ffc05ff0419a..d83d05f9e3c356b5f41045f2cdc99dbf73502eba 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -1,25 +1,30 @@
 /*
  */
 /*
  */

-#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/aptconfiguration.h>
-
-#include<sstream>
-#include<fstream>
+#include <config.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 <apt-pkg/indexcopy.h>
+
+
+#include <string.h>
+#include <iostream>
+#include <string>
+#include <vector>

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

-#include <fcntl.h>

 #include <dirent.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <algorithm>
 #include <dlfcn.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <algorithm>
 #include <dlfcn.h>

-
-#include "indexcopy.h"
+#include <iostream>
+#include <sstream>
+#include <fstream>

 
 #include<apti18n.h>
 
 
 #include<apti18n.h>
 


@@ -56,66 +61,91 @@ 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 (InfoDir.empty() == true)

    {
    {

-      if (InfoDir.empty() == true)
-        InfoDir = CD + ".disk/";
+      if (DirectoryExists(".disk") == true)
+        InfoDir = InfoDir + CD + ".disk/";

    }
 
    // Don't look into directories that have been marked to ingore.
    }
 
    // Don't look into directories that have been marked to ingore.

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

       return true;
 
       return true;
 

-

    /* Check _first_ for a signature file as apt-cdrom assumes that all files
       under a Packages/Source file are in control of that file and stops 
       the scanning
    */
    /* Check _first_ for a signature file as apt-cdrom assumes that all files
       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 || RealFileExists("InRelease") == 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());


@@ -126,10 +156,7 @@ bool pkgCdrom::FindPackages(string CD,
       // Skip some files..
       if (strcmp(Dir->d_name,".") == 0 ||
          strcmp(Dir->d_name,"..") == 0 ||
       // Skip some files..
       if (strcmp(Dir->d_name,".") == 0 ||
          strcmp(Dir->d_name,"..") == 0 ||

-         //strcmp(Dir->d_name,"source") == 0 ||

          strcmp(Dir->d_name,".disk") == 0 ||
          strcmp(Dir->d_name,".disk") == 0 ||

-         strcmp(Dir->d_name,"experimental") == 0 ||
-         strcmp(Dir->d_name,"binary-all") == 0 ||

           strcmp(Dir->d_name,"debian-installer") == 0)
         continue;
 
           strcmp(Dir->d_name,"debian-installer") == 0)
         continue;
 


@@ -242,6 +269,29 @@ bool pkgCdrom::DropBinaryArch(vector<string> &List)
       --I; // the next entry is at the same index after the erase
    }
    
       --I; // the next entry is at the same index after the erase
    }
    

+   return true;
+}
+                                                                       /*}}}*/
+// DropTranslation - Dump unwanted Translation-<lang> files            /*{{{*/
+// ---------------------------------------------------------------------
+/* Here we drop everything that is not configured in Acquire::Languages */
+bool pkgCdrom::DropTranslation(vector<string> &List)
+{
+   for (unsigned int I = 0; I < List.size(); I++)
+   {
+      const char *Start;
+      if ((Start = strstr(List[I].c_str(), "/Translation-")) == NULL)
+        continue;
+      Start += strlen("/Translation-");
+
+      if (APT::Configuration::checkLanguage(Start, true) == true)
+        continue;
+
+      // not accepted -> Erase it
+      List.erase(List.begin() + I);
+      --I; // the next entry is at the same index after the erase
+   }
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -250,30 +300,43 @@ bool pkgCdrom::DropBinaryArch(vector<string> &List)
 /* Here we go and stat every file that we found and strip dup inodes. */
 bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
 {
 /* Here we go and stat every file that we found and strip dup inodes. */
 bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
 {

+   bool couldFindAllFiles = true;

    // 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;
-   }
-   
-   if (_error->PendingError() == true) {
-      delete[] Inodes;
-      return false;
+      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);
+        couldFindAllFiles = false;
+        Inodes[I] = 0;
+      }

    }
    }

-   
+

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

+      if (Inodes[I] == 0)
+        continue;

       for (unsigned int J = I+1; J < List.size(); J++)
       {
         // No match
       for (unsigned int J = I+1; J < List.size(); J++)
       {
         // No match

-        if (Inodes[J] != Inodes[I])
+        if (Inodes[J] == 0 || Inodes[J] != Inodes[I])

            continue;
         
         // We score the two paths.. and erase one
            continue;
         
         // We score the two paths.. and erase one


@@ -299,14 +362,14 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
         List.erase(List.begin()+I);
    }
    
         List.erase(List.begin()+I);
    }
    

-   return true;
+   return couldFindAllFiles;

 }
                                                                        /*}}}*/
 // ReduceSourceList - Takes the path list and reduces it               /*{{{*/
 // ---------------------------------------------------------------------
 }
                                                                        /*}}}*/
 // ReduceSourceList - Takes the path list and reduces it               /*{{{*/
 // ---------------------------------------------------------------------

-/* This takes the list of source list expressed entires and collects
+/* This takes the list of source list expressed entries and collects

    similar ones to form a single entry for each dist */
    similar ones to form a single entry for each dist */

-void pkgCdrom::ReduceSourcelist(string CD,vector<string> &List)
+void pkgCdrom::ReduceSourcelist(string /*CD*/,vector<string> &List)

 {
    sort(List.begin(),List.end());
    
 {
    sort(List.begin(),List.end());
    


@@ -323,6 +386,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);

+      string Component = string(*I,SSpace);

       for (vector<string>::iterator J = List.begin(); J != I; ++J)
       {
         // Find a space..
       for (vector<string>::iterator J = List.begin(); J != I; ++J)
       {
         // Find a space..


@@ -337,9 +401,11 @@ void pkgCdrom::ReduceSourcelist(string CD,vector<string> &List)
            continue;
         if (string(*J,Space2,SSpace2-Space2) != Word1)
            continue;
            continue;
         if (string(*J,Space2,SSpace2-Space2) != Word1)
            continue;

-        
-        *J += string(*I,SSpace);
-        *I = string();
+
+        string Component2 = string(*J, SSpace2) + " ";
+        if (Component2.find(Component + " ") == std::string::npos)
+           *J += Component;
+        I->clear();

       }
    }   
 
       }
    }   
 


@@ -360,8 +426,8 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
 {
    string DFile = _config->FindFile("Dir::State::cdroms");
    string NewFile = DFile + ".new";
 {
    string DFile = _config->FindFile("Dir::State::cdroms");
    string NewFile = DFile + ".new";

-   
-   unlink(NewFile.c_str());
+
+   RemoveFile("WriteDatabase", NewFile);

    ofstream Out(NewFile.c_str());
    if (!Out)
       return _error->Errno("ofstream::ofstream",
    ofstream Out(NewFile.c_str());
    if (!Out)
       return _error->Errno("ofstream::ofstream",


@@ -369,28 +435,12 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
    
    /* Write out all of the configuration directives by walking the
       configuration tree */
    
    /* Write out all of the configuration directives by walking the
       configuration tree */

-   const Configuration::Item *Top = Cnf.Tree(0);
-   for (; Top != 0;)
-   {
-      // Print the config entry
-      if (Top->Value.empty() == false)
-        Out <<  Top->FullTag() + " \"" << Top->Value << "\";" << endl;
-      
-      if (Top->Child != 0)
-      {
-        Top = Top->Child;
-        continue;
-      }
-      
-      while (Top != 0 && Top->Next == 0)
-        Top = Top->Parent;
-      if (Top != 0)
-        Top = Top->Next;
-   }   
+   Cnf.Dump(Out, NULL, "%f \"%v\";\n", false);

 
    Out.close();
 
    Out.close();

-   
-   link(DFile.c_str(),string(DFile + '~').c_str());
+
+   if (FileExists(DFile) == true)
+      rename(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());
    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());


@@ -401,7 +451,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
 // WriteSourceList - Write an updated sourcelist                       /*{{{*/
 // ---------------------------------------------------------------------
 /* This reads the old source list and copies it into the new one. It 
 // WriteSourceList - Write an updated sourcelist                       /*{{{*/
 // ---------------------------------------------------------------------
 /* This reads the old source list and copies it into the new one. It 

-   appends the new CDROM entires just after the first block of comments.
+   appends the new CDROM entries just after the first block of comments.

    This places them first in the file. It also removes any old entries
    that were the same. */
 bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
    This places them first in the file. It also removes any old entries
    that were the same. */
 bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)


@@ -414,18 +464,18 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
    // Open the stream for reading
    ifstream F((FileExists(File)?File.c_str():"/dev/null"),
              ios::in );
    // Open the stream for reading
    ifstream F((FileExists(File)?File.c_str():"/dev/null"),
              ios::in );

-   if (!F != 0)
+   if (F.fail() == true)

       return _error->Errno("ifstream::ifstream","Opening %s",File.c_str());
 
    string NewFile = File + ".new";
       return _error->Errno("ifstream::ifstream","Opening %s",File.c_str());
 
    string NewFile = File + ".new";

-   unlink(NewFile.c_str());
+   RemoveFile("WriteDatabase", NewFile);

    ofstream Out(NewFile.c_str());
    if (!Out)
       return _error->Errno("ofstream::ofstream",
                           "Failed to open %s.new",File.c_str());
 
    // Create a short uri without the path
    ofstream Out(NewFile.c_str());
    if (!Out)
       return _error->Errno("ofstream::ofstream",
                           "Failed to open %s.new",File.c_str());
 
    // Create a short uri without the path

-   string ShortURI = "cdrom:[" + Name + "]/";   
+   string ShortURI = "cdrom:[" + Name + "]/";

    string ShortURI2 = "cdrom:" + Name + "/";     // For Compatibility
 
    string Type;
    string ShortURI2 = "cdrom:" + Name + "/";     // For Compatibility
 
    string Type;


@@ -433,12 +483,12 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
       Type = "deb-src";
    else
       Type = "deb";
       Type = "deb-src";
    else
       Type = "deb";

-   
+

    char Buffer[300];
    int CurLine = 0;
    bool First = true;
    while (F.eof() == false)
    char Buffer[300];
    int CurLine = 0;
    bool First = true;
    while (F.eof() == false)

-   {      
+   {

       F.getline(Buffer,sizeof(Buffer));
       CurLine++;
       if (F.fail() && !F.eof())
       F.getline(Buffer,sizeof(Buffer));
       CurLine++;
       if (F.fail() && !F.eof())


@@ -503,7 +553,7 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
    
    Out.close();
 
    
    Out.close();
 

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

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


@@ -511,137 +561,121 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)               /*{{{*/
+bool pkgCdrom::UnmountCDROM(std::string const &CDROM, pkgCdromStatus * const log)/*{{{*/
+{
+   if (_config->FindB("APT::CDROM::NoMount",false) == true)
+      return true;
+   if (log != NULL)
+      log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
+   return UnmountCdrom(CDROM);
+}
+                                                                       /*}}}*/
+bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log, bool const interactive)/*{{{*/

 {
 {

-   stringstream msg;
-

    // Startup
    // Startup

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

    if (CDROM[0] == '.')
       CDROM= SafeGetCWD() + '/' + CDROM;
 
    if (log != NULL)
    {
    if (CDROM[0] == '.')
       CDROM= SafeGetCWD() + '/' + CDROM;
 
    if (log != NULL)
    {

-      msg.str("");
-      ioprintf(msg, _("Using CD-ROM mount point %s\nMounting CD-ROM\n"),
-                     CDROM.c_str());
-      log->Update(msg.str());
+      string msg;
+      log->SetTotal(STEP_LAST);
+      strprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str());
+      log->Update(msg, STEP_PREPARE);
+   }
+
+   // Unmount the CD and get the user to put in the one they want
+   if (_config->FindB("APT::CDROM::NoMount", false) == false)
+   {
+      if (interactive == true)
+      {
+        UnmountCDROM(CDROM, log);
+
+        if(log != NULL)
+        {
+           log->Update(_("Waiting for disc...\n"), STEP_WAIT);
+           if(!log->ChangeCdrom()) {
+              // user aborted
+              return false;
+           }
+        }
+      }
+
+      // Mount the new CDROM
+      if(log != NULL)
+        log->Update(_("Mounting CD-ROM...\n"), STEP_MOUNT);
+
+      if (MountCdrom(CDROM) == false)
+        return _error->Error("Failed to mount the cdrom.");

    }
    }

-   if (MountCdrom(CDROM) == false)
+
+   if (IsMounted(CDROM) == false)

       return _error->Error("Failed to mount the cdrom.");
 
    // Hash the CD to get an ID
    if (log != NULL)
       return _error->Error("Failed to mount the cdrom.");
 
    // Hash the CD to get an ID
    if (log != NULL)

-      log->Update(_("Identifying.. "));
-   
+      log->Update(_("Identifying... "), STEP_IDENT);

 
    if (IdentCdrom(CDROM,ident) == false)
    {
       ident = "";
 
    if (IdentCdrom(CDROM,ident) == false)
    {
       ident = "";

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

       return false;
    }
 
    if (log != NULL)
    {
       return false;
    }
 
    if (log != NULL)
    {

-      msg.str("");
-      ioprintf(msg, "[%s]\n",ident.c_str());
-      log->Update(msg.str());
+      string msg;
+      strprintf(msg, "[%s]\n", ident.c_str());
+      log->Update(msg);

    }
 
    // Read the database
    }
 
    // Read the database

-   Configuration Database;

    string DFile = _config->FindFile("Dir::State::cdroms");
    if (FileExists(DFile) == true)
    {
       if (ReadConfigFile(Database,DFile) == false)
    string DFile = _config->FindFile("Dir::State::cdroms");
    if (FileExists(DFile) == true)
    {
       if (ReadConfigFile(Database,DFile) == false)

+      {
+        UnmountCDROM(CDROM, NULL);

         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());

+      }

    }
    }

+   return true;
+}
+                                                                       /*}}}*/
+bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)               /*{{{*/
+{
+   Configuration Database;
+   std::string CDROM;
+   if (MountAndIdentCDROM(Database, CDROM, ident, log, false) == false)
+      return false;
+

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

-      msg.str("");
-      ioprintf(msg, _("Stored label: %s\n"),
-      Database.Find("CD::"+ident).c_str());
-      log->Update(msg.str());
+      string msg;
+      strprintf(msg, _("Stored label: %s\n"),
+           Database.Find("CD::"+ident).c_str());
+      log->Update(msg);

    }
 
    // Unmount and finish
    }
 
    // Unmount and finish

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

    return true;
 }
                                                                        /*}}}*/
 bool pkgCdrom::Add(pkgCdromStatus *log)                                        /*{{{*/
 {
    return true;
 }
                                                                        /*}}}*/
 bool pkgCdrom::Add(pkgCdromStatus *log)                                        /*{{{*/
 {

-   stringstream msg;
-
-   // Startup
-   string CDROM = _config->FindDir("Acquire::cdrom::mount");
-   if (CDROM[0] == '.')
-      CDROM= SafeGetCWD() + '/' + CDROM;
-   
-   if(log != NULL)
-   {
-      log->SetTotal(STEP_LAST);
-      msg.str("");
-      ioprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str());
-      log->Update(msg.str(), STEP_PREPARE);
-   }
-
-   // Read the database

    Configuration Database;
    Configuration Database;

-   string DFile = _config->FindFile("Dir::State::cdroms");
-   if (FileExists(DFile) == true)
-   {
-      if (ReadConfigFile(Database,DFile) == false) 
-        return _error->Error("Unable to read the cdrom database %s",
-                             DFile.c_str());
-   }
-   
-   // Unmount the CD and get the user to put in the one they want
-   if (_config->FindB("APT::CDROM::NoMount",false) == false)
-   {
-      if(log != NULL)
-        log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT);
-      UnmountCdrom(CDROM);
-
-      if(log != NULL)
-      {
-        log->Update(_("Waiting for disc...\n"), STEP_WAIT);
-        if(!log->ChangeCdrom()) {
-           // user aborted
-           return false; 
-        }
-      }
-
-      // Mount the new CDROM
-      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(log != NULL)
-      log->Update(_("Identifying.. "), STEP_IDENT);
-   string ID;
-   if (IdentCdrom(CDROM,ID) == false)
-   {
-      if (log != NULL)
-        log->Update("\n");
+   std::string ID, CDROM;
+   if (MountAndIdentCDROM(Database, CDROM, ID, log, true) == false)

       return false;
       return false;

-   }
+

    if(log != NULL)
    if(log != NULL)

-   {
-      log->Update("["+ID+"]\n");
-      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;
 
    // Get the CD structure
    vector<string> List;


@@ -654,10 +688,15 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
    {
       if (log != NULL)
         log->Update("\n");
    {
       if (log != NULL)
         log->Update("\n");

+      UnmountCDROM(CDROM, NULL);

       return false;
    }
 
       return false;
    }
 

-   chdir(StartDir.c_str());
+   if (chdir(StartDir.c_str()) != 0)
+   {
+      UnmountCDROM(CDROM, NULL);
+      return _error->Errno("chdir","Unable to change to %s", StartDir.c_str());
+   }

 
    if (_config->FindB("Debug::aptcdrom",false) == true)
    {
 
    if (_config->FindB("Debug::aptcdrom",false) == true)
    {


@@ -678,21 +717,28 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
    DropBinaryArch(List);
    DropRepeats(List,"Packages");
    DropRepeats(SourceList,"Sources");
    DropBinaryArch(List);
    DropRepeats(List,"Packages");
    DropRepeats(SourceList,"Sources");

+   // FIXME: We ignore stat() errors here as we usually have only one of those in use
+   // This has little potencial to drop 'valid' stat() errors as we know that one of these
+   // files need to exist, but it would be better if we would check it here
+   _error->PushToStack();

    DropRepeats(SigList,"Release.gpg");
    DropRepeats(SigList,"Release.gpg");

+   DropRepeats(SigList,"InRelease");
+   _error->RevertToStack();

    DropRepeats(TransList,"");
    DropRepeats(TransList,"");

+   if (_config->FindB("APT::CDROM::DropTranslation", true) == true)
+      DropTranslation(TransList);

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

-      msg.str("");
-      ioprintf(msg, _("Found %zu package indexes, %zu source indexes, "
+      string msg;
+      strprintf(msg, _("Found %zu package indexes, %zu source indexes, "

                      "%zu translation indexes and %zu signatures\n"), 
               List.size(), SourceList.size(), TransList.size(),
               SigList.size());
                      "%zu translation indexes and %zu signatures\n"), 
               List.size(), SourceList.size(), TransList.size(),
               SigList.size());

-      log->Update(msg.str(), STEP_SCAN);
+      log->Update(msg, STEP_SCAN);

    }
 
    if (List.empty() == true && SourceList.empty() == true) 
    {
    }
 
    if (List.empty() == true && SourceList.empty() == true) 
    {

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

       return _error->Error(_("Unable to locate any package files, perhaps this is not a Debian Disc or the wrong architecture?"));
    }
 
       return _error->Error(_("Unable to locate any package files, perhaps this is not a Debian Disc or the wrong architecture?"));
    }
 


@@ -705,8 +751,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
       if (InfoDir.empty() == false &&
          FileExists(InfoDir + "/info") == true)
       {
       if (InfoDir.empty() == false &&
          FileExists(InfoDir + "/info") == true)
       {

-        ifstream F(string(InfoDir + "/info").c_str());
-        if (!F == 0)
+        ifstream F((InfoDir + "/info").c_str());
+        if (F.good() == true)

            getline(F,Name);
 
         if (Name.empty() == false)
            getline(F,Name);
 
         if (Name.empty() == false)


@@ -719,9 +765,9 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
            
            if(log != NULL)
            {
            
            if(log != NULL)
            {

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

            }
            Database.Set("CD::" + ID + "::Label",Name);
         }       
            }
            Database.Set("CD::" + ID + "::Label",Name);
         }       


@@ -732,14 +778,14 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
       {
         if(log == NULL) 
          {
       {
         if(log == NULL) 
          {

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

            return _error->Error("No disc name found and no way to ask for it");
         }
 
         while(true) {
            if(!log->AskCdromName(Name)) {
               // user canceld
            return _error->Error("No disc name found and no way to ask for it");
         }
 
         while(true) {
            if(!log->AskCdromName(Name)) {
               // user canceld

+              UnmountCDROM(CDROM, NULL);

               return false; 
            }
            cout << "Name: '" << Name << "'" << endl;
               return false; 
            }
            cout << "Name: '" << Name << "'" << endl;


@@ -765,11 +811,25 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
    Database.Set("CD::" + ID,Name);
    if(log != NULL)
    {
    Database.Set("CD::" + ID,Name);
    if(log != NULL)
    {

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

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

+
+   // check for existence and possibly create state directory for copying
+   string const listDir = _config->FindDir("Dir::State::lists");
+   string const partialListDir = listDir + "partial/";
+   mode_t const mode = umask(S_IWGRP | S_IWOTH);
+   bool const creation_fail = (CreateAPTDirectoryIfNeeded(_config->FindDir("Dir::State"), partialListDir) == false &&
+        CreateAPTDirectoryIfNeeded(listDir, partialListDir) == false);
+   umask(mode);
+   if (creation_fail == true)
+   {
+      UnmountCDROM(CDROM, NULL);
+      return _error->Errno("cdrom", _("List directory %spartial is missing."), listDir.c_str());
+   }
+

    // 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;


@@ -782,7 +842,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                    /*{{{*/
    if (Copy.CopyPackages(CDROM,Name,List, log) == false ||
        SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false ||
        TransCopy.CopyTranslations(CDROM,Name,TransList, log) == false)
    if (Copy.CopyPackages(CDROM,Name,List, log) == false ||
        SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false ||
        TransCopy.CopyTranslations(CDROM,Name,TransList, log) == false)

+   {
+      UnmountCDROM(CDROM, NULL);

       return false;
       return false;

+   }

 
    // reduce the List so that it takes less space in sources.list
    ReduceSourcelist(CDROM,List);
 
    // reduce the List so that it takes less space in sources.list
    ReduceSourcelist(CDROM,List);


@@ -792,13 +855,19 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
    if (_config->FindB("APT::cdrom::NoAct",false) == false)
    {
       if (WriteDatabase(Database) == false)
    if (_config->FindB("APT::cdrom::NoAct",false) == false)
    {
       if (WriteDatabase(Database) == false)

+      {
+        UnmountCDROM(CDROM, NULL);

         return false;
         return false;

-      
+      }
+

       if(log != NULL)
         log->Update(_("Writing new source list\n"), STEP_WRITE);
       if (WriteSourceList(Name,List,false) == false ||
          WriteSourceList(Name,SourceList,true) == false)
       if(log != NULL)
         log->Update(_("Writing new source list\n"), STEP_WRITE);
       if (WriteSourceList(Name,List,false) == false ||
          WriteSourceList(Name,SourceList,true) == false)

+      {
+        UnmountCDROM(CDROM, NULL);

         return false;
         return false;

+      }

    }
 
    // Print the sourcelist entries
    }
 
    // Print the sourcelist entries


@@ -810,14 +879,13 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
       {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
       {

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

         return _error->Error("Internal error");
       }
 
       if(log != NULL)
       {
         return _error->Error("Internal error");
       }
 
       if(log != NULL)
       {

-        msg.str("");
+        stringstream msg;

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


@@ -829,13 +897,12 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
       {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
       {

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

         return _error->Error("Internal error");
       }
 
       if(log != NULL) {
         return _error->Error("Internal error");
       }
 
       if(log != NULL) {

-        msg.str("");
+        stringstream msg;

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


@@ -843,24 +910,22 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
    }
 
    // Unmount and finish
    }
 
    // Unmount and finish

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

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-pkgUdevCdromDevices::pkgUdevCdromDevices()                                     /*{{{*/
-   : libudev_handle(NULL)
+pkgUdevCdromDevices::pkgUdevCdromDevices()                             /*{{{*/
+: d(NULL), libudev_handle(NULL), udev_new(NULL), udev_enumerate_add_match_property(NULL),
+   udev_enumerate_scan_devices(NULL), udev_enumerate_get_list_entry(NULL),
+   udev_device_new_from_syspath(NULL), udev_enumerate_get_udev(NULL),
+   udev_list_entry_get_name(NULL), udev_device_get_devnode(NULL),
+   udev_enumerate_new(NULL), udev_list_entry_get_next(NULL),
+   udev_device_get_property_value(NULL), udev_enumerate_add_match_sysattr(NULL)

 {
 {

-

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

-bool
-pkgUdevCdromDevices::Dlopen()                                          /*{{{*/
+bool pkgUdevCdromDevices::Dlopen()                                     /*{{{*/

 {
    // alread open
    if(libudev_handle != NULL)
 {
    // alread open
    if(libudev_handle != NULL)


@@ -889,18 +954,14 @@ pkgUdevCdromDevices::Dlopen()                                             /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-                                                                        /*{{{*/
-// convenience interface, this will just call ScanForRemovable
-vector<CdromDevice>
-pkgUdevCdromDevices::Scan()
-{ 
+// convenience interface, this will just call ScanForRemovable         /*{{{*/
+vector<CdromDevice> pkgUdevCdromDevices::Scan()
+{

    bool CdromOnly = _config->FindB("APT::cdrom::CdromOnly", true);
    bool CdromOnly = _config->FindB("APT::cdrom::CdromOnly", true);

-   return ScanForRemovable(CdromOnly); 
-};
+   return ScanForRemovable(CdromOnly);
+}

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

-                                                                        /*{{{*/
-vector<CdromDevice>
-pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)
+vector<CdromDevice> pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)/*{{{*/

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


@@ -941,7 +1002,7 @@ pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)
       cdrom.DeviceName = string(devnode);
       if (mountpath != "") {
         cdrom.MountPath = mountpath;
       cdrom.DeviceName = string(devnode);
       if (mountpath != "") {
         cdrom.MountPath = mountpath;

-        string s = string(mountpath);
+        string s = mountpath;

         cdrom.Mounted = IsMounted(s);
       } else {
         cdrom.Mounted = false;
         cdrom.Mounted = IsMounted(s);
       } else {
         cdrom.Mounted = false;


@@ -959,3 +1020,9 @@ pkgUdevCdromDevices::~pkgUdevCdromDevices()                             /*{{{*/
       dlclose(libudev_handle);
 }
                                                                        /*}}}*/
       dlclose(libudev_handle);
 }
                                                                        /*}}}*/

+
+pkgCdromStatus::pkgCdromStatus() : d(NULL), totalSteps(0) {}
+pkgCdromStatus::~pkgCdromStatus() {}
+
+pkgCdrom::pkgCdrom() : d(NULL) {}
+pkgCdrom::~pkgCdrom() {}