debian/apt-doc.docs: remove README.MultiArch

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 0310b66cd24e2ccf6dd818219cc45de0dc5aafd9..74e2ecc6b632d138e464cb88951449385c6478a9 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -8,16 +8,20 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/acquire-method.h>

+#include <apt-pkg/cdrom.h>

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

+#include <apt-pkg/strutl.h>

 #include <apt-pkg/hashes.h>
 
 #include <apt-pkg/hashes.h>
 

+#include <string>
+#include <vector>

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

-#include <unistd.h>
-#include <dlfcn.h>

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


@@ -25,32 +29,19 @@
 
 using namespace std;
 
 
 using namespace std;
 

-struct udev;
-struct udev_list_entry;
-
-// libudev dlopen stucture
-struct udev_p {
-      struct udev* (*udev_new)(void);
-      int (*udev_enumerate_add_match_property)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
-      int (*udev_enumerate_scan_devices)(struct udev_enumerate *udev_enumerate);
-      struct udev_list_entry *(*udev_enumerate_get_list_entry)(struct udev_enumerate *udev_enumerate);
-      struct udev_device *(*udev_device_new_from_syspath)(struct udev *udev, const char *syspath);
-      struct udev *(*udev_enumerate_get_udev)(struct udev_enumerate *udev_enumerate);
-      const char *(*udev_list_entry_get_name)(struct udev_list_entry *list_entry);
-      const char *(*udev_device_get_devnode)(struct udev_device *udev_device);
-      struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
-      struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry);
-};
-

 class CDROMMethod : public pkgAcqMethod
 {
    bool DatabaseLoaded;
 class CDROMMethod : public pkgAcqMethod
 {
    bool DatabaseLoaded;

+   bool Debug;
+

    ::Configuration Database;
    string CurrentID;
    string CDROM;
    bool MountedByApt;
    ::Configuration Database;
    string CurrentID;
    string CDROM;
    bool MountedByApt;

-   vector<string> CdromDevices;
+   pkgUdevCdromDevices UdevCdroms;

  
  

+   bool IsCorrectCD(URI want, string MountPath, string& NewID);
+   bool AutoDetectAndMount(const URI, string &NewID);

    virtual bool Fetch(FetchItem *Itm);
    string GetID(string Name);
    virtual void Exit();
    virtual bool Fetch(FetchItem *Itm);
    string GetID(string Name);
    virtual void Exit();


@@ -66,48 +57,12 @@ class CDROMMethod : public pkgAcqMethod
 CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
                                          SendConfig | NeedsCleanup |
                                          Removable), 
 CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
                                          SendConfig | NeedsCleanup |
                                          Removable), 

-                                          DatabaseLoaded(false), 
+                                          DatabaseLoaded(false),
+                                         Debug(false),

                                           MountedByApt(false)
 {
                                           MountedByApt(false)
 {

-   // see if we can get libudev
-   void *h = dlopen("libudev.so.0", RTLD_LAZY);
-   if (h) {
-      // the pointers for the udev struct
-      struct udev_p p;
-      p.udev_new = (udev* (*)(void)) dlsym(h, "udev_new");
-      p.udev_enumerate_add_match_property = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_property");
-      p.udev_enumerate_scan_devices = (int (*)(udev_enumerate*))dlsym(h, "udev_enumerate_scan_devices");
-      p.udev_enumerate_get_list_entry = (udev_list_entry* (*)(udev_enumerate*))dlsym(h, "udev_enumerate_get_list_entry");
-      p.udev_device_new_from_syspath = (udev_device* (*)(udev*, const char*))dlsym(h, "udev_device_new_from_syspath");
-      p.udev_enumerate_get_udev = (udev* (*)(udev_enumerate*))dlsym(h, "udev_enumerate_get_udev");
-      p.udev_list_entry_get_name = (const char* (*)(udev_list_entry*))dlsym(h, "udev_list_entry_get_name");
-      p.udev_device_get_devnode = (const char* (*)(udev_device*))dlsym(h, "udev_device_get_devnode");
-      p.udev_enumerate_new = (udev_enumerate* (*)(udev*))dlsym(h, "udev_enumerate_new");
-      p.udev_list_entry_get_next = (udev_list_entry* (*)(udev_list_entry*))dlsym(h, "udev_list_entry_get_next");
-      struct udev_enumerate *enumerate;
-      struct udev_list_entry *l, *devices;
-      struct udev *udev_ctx;
-
-      udev_ctx = p.udev_new();
-      enumerate = p.udev_enumerate_new (udev_ctx);
-      p.udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1");
-
-      p.udev_enumerate_scan_devices (enumerate);
-      devices = p.udev_enumerate_get_list_entry (enumerate);
-      for (l = devices; l != NULL; l = p.udev_list_entry_get_next (l))
-      {
-        struct udev_device *udevice;
-        udevice = p.udev_device_new_from_syspath (p.udev_enumerate_get_udev (enumerate), p.udev_list_entry_get_name (l));
-        if (udevice == NULL)
-           continue;
-        const char* devnode = p.udev_device_get_devnode(udevice);
-        //std::cerr << devnode  << std::endl;
-        CdromDevices.push_back(string(devnode));
-      } 
-   }
-
-
-};
+   UdevCdroms.Dlopen();
+}

                                                                        /*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
 // ---------------------------------------------------------------------


@@ -138,16 +93,93 @@ string CDROMMethod::GetID(string Name)
    return string();
 }
                                                                        /*}}}*/
    return string();
 }
                                                                        /*}}}*/

+// CDROMMethod::AutoDetectAndMount                                      /*{{{*/
+// ---------------------------------------------------------------------
+/* Modifies class varaiable CDROM to the mountpoint */
+bool CDROMMethod::AutoDetectAndMount(const URI Get, string &NewID)
+{
+   vector<struct CdromDevice> v = UdevCdroms.Scan();
+
+   // first check if its mounted somewhere already
+   for (unsigned int i=0; i < v.size(); i++)
+   {
+      if (v[i].Mounted)
+      {
+        if (Debug)
+           clog << "Checking mounted cdrom device " << v[i].DeviceName << endl;
+        if (IsCorrectCD(Get, v[i].MountPath, NewID))
+        {
+           CDROM = v[i].MountPath;
+           return true;
+        }
+      }
+   }
+
+   // we are not supposed to mount, exit
+   if (_config->FindB("APT::CDROM::NoMount",false) == true)
+      return false;
+
+   // check if we have the mount point
+   string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+   if (!FileExists(AptMountPoint))
+      mkdir(AptMountPoint.c_str(), 0750);
+
+   // now try mounting
+   for (unsigned int i=0; i < v.size(); i++)
+   {
+      if (!v[i].Mounted)
+      {
+        if(MountCdrom(AptMountPoint, v[i].DeviceName)) 
+        {
+           if (IsCorrectCD(Get, AptMountPoint, NewID))
+           {
+              MountedByApt = true;
+              CDROM = AptMountPoint;
+              return true;
+           } else {
+              UnmountCdrom(AptMountPoint);
+           }
+        }
+      }
+   }
+
+   return false;
+}
+                                                                       /*}}}*/
+// CDROMMethod::IsCorrectCD                                             /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CDROMMethod::IsCorrectCD(URI want, string MountPath, string& NewID)
+{
+   for (unsigned int Version = 2; Version != 0; Version--)
+   {
+      if (IdentCdrom(MountPath,NewID,Version) == false)
+        return false;
+      
+      if (Debug)
+        clog << "ID " << Version << " " << NewID << endl;
+      
+      // A hit
+      if (Database.Find("CD::" + NewID) == want.Host)
+        return true;
+   }
+   
+   return false;
+}
+                                                                       /*}}}*/

 // CDROMMethod::Fetch - Fetch a file                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool CDROMMethod::Fetch(FetchItem *Itm)
 {
 // CDROMMethod::Fetch - Fetch a file                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool CDROMMethod::Fetch(FetchItem *Itm)
 {

+   FetchResult Res;
+

    URI Get = Itm->Uri;
    string File = Get.Path;
    URI Get = Itm->Uri;
    string File = Get.Path;

-   FetchResult Res;
+   Debug = _config->FindB("Debug::Acquire::cdrom", false);

 
 

-   bool Debug = _config->FindB("Debug::Acquire::cdrom",false);
+   if (Debug)
+      clog << "CDROMMethod::Fetch " << Itm->Uri << endl;

 
    /* All IMS queries are returned as a hit, CDROMs are readonly so 
       time stamps never change */
 
    /* All IMS queries are returned as a hit, CDROMs are readonly so 
       time stamps never change */


@@ -183,38 +215,32 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    }
 
    // We already have a CD inserted, but it is the wrong one
    }
 
    // We already have a CD inserted, but it is the wrong one

-   if (CurrentID.empty() == false && Database.Find("CD::" + CurrentID) != Get.Host)
+   if (CurrentID.empty() == false && 
+       CurrentID != "FAIL" &&
+       Database.Find("CD::" + CurrentID) != Get.Host)

    {
       Fail(_("Wrong CD-ROM"),true);
       return true;
    }
    {
       Fail(_("Wrong CD-ROM"),true);
       return true;
    }

-   
-   CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+
+   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);
+   CDROM = _config->FindDir("Acquire::cdrom::mount");
+   if (Debug)
+      clog << "Looking for CDROM at " << CDROM << endl;
+

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

+

    string NewID;
    while (CurrentID.empty() == true)
    {
    string NewID;
    while (CurrentID.empty() == true)
    {

-      bool Hit = false;
+      if (AutoDetect)
+        AutoDetectAndMount(Get, NewID);
+

       if(!IsMounted(CDROM))
         MountedByApt = MountCdrom(CDROM);
       if(!IsMounted(CDROM))
         MountedByApt = MountCdrom(CDROM);

-      for (unsigned int Version = 2; Version != 0; Version--)
-      {
-        if (IdentCdrom(CDROM,NewID,Version) == false)
-           return false;
-        
-        if (Debug == true)
-           clog << "ID " << Version << " " << NewID << endl;

       
       

-        // A hit
-        if (Database.Find("CD::" + NewID) == Get.Host)
-        {
-           Hit = true;
-           break;
-        }       
-      }
-
-      if (Hit == true)
+      if (IsCorrectCD(Get, CDROM, NewID))

         break;
         
       // I suppose this should prompt somehow?
         break;
         
       // I suppose this should prompt somehow?


@@ -242,7 +268,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
    Hashes Hash;
    FileFd Fd(Res.Filename, FileFd::ReadOnly);
 
    Hashes Hash;
    FileFd Fd(Res.Filename, FileFd::ReadOnly);

-   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Hash.AddFD(Fd);

    Res.TakeHashes(Hash);
 
    URIDone(Res);
    Res.TakeHashes(Hash);
 
    URIDone(Res);