merge with my debian-sid branch

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

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 2a914c6654d6dec1f7b1979c1259aaa03b1aaabb..a9c63fd214386624dfcd75f3b3caa8808f104658 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -1,5 +1,6 @@
 /*
  */
 /*
  */

+#include<config.h>

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


@@ -7,11 +8,11 @@
 #include<apt-pkg/strutl.h>
 #include<apt-pkg/cdrom.h>
 #include<apt-pkg/aptconfiguration.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>


@@ -22,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                  /*{{{*/


@@ -310,7 +313,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(' ');


@@ -322,7 +325,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(' ');


@@ -405,7 +408,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");


@@ -455,7 +458,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)


@@ -489,7 +492,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)


@@ -661,13 +664,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;
    }   
 


@@ -688,7 +691,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);


@@ -712,7 +715,7 @@ 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 = '_';
            


@@ -757,7 +760,7 @@ 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 = '_';
    


@@ -804,7 +807,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
    if(log != NULL)
       log->Update(_("Source list entries for this disc are:\n"));
 
    if(log != NULL)
       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)


@@ -823,7 +826,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)


@@ -874,9 +877,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");

-#if 0 // FIXME: uncomment on next ABI break

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

-#endif

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


@@ -890,10 +891,8 @@ pkgUdevCdromDevices::Dlopen()                                      /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-

                                                                         /*{{{*/
                                                                         /*{{{*/

-// compatiblity only with the old API/ABI, can be removed on the next
-// ABI break
+// convenience interface, this will just call ScanForRemovable

 vector<CdromDevice>
 pkgUdevCdromDevices::Scan()
 { 
 vector<CdromDevice>
 pkgUdevCdromDevices::Scan()
 { 


@@ -918,10 +917,6 @@ pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)
    if (CdromOnly)
       udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1");
    else {
    if (CdromOnly)
       udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1");
    else {

-#if 1 // FIXME: remove the next two lines on the next ABI break
-      int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
-      udev_enumerate_add_match_sysattr = (int (*)(udev_enumerate*, const char*, const char*))dlsym(libudev_handle, "udev_enumerate_add_match_sysattr");
-#endif

       udev_enumerate_add_match_sysattr(enumerate, "removable", "1");
    }
 
       udev_enumerate_add_match_sysattr(enumerate, "removable", "1");
    }