Added subprocess to segfault error

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index a4446576668b7d2de0280f45ce2b2b8c3af67c12..e2eddf19e6b56334c889941aaa1b9fc38bfbf3f9 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cdrom.cc,v 1.9 1999/05/23 05:45:13 jgg Exp $
+// $Id: cdrom.cc,v 1.16 1999/10/18 00:37:36 jgg Exp $

 /* ######################################################################
 
    CDROM URI method for APT
 /* ######################################################################
 
    CDROM URI method for APT


@@ -20,12 +20,15 @@
 
 class CDROMMethod : public pkgAcqMethod
 {
 
 class CDROMMethod : public pkgAcqMethod
 {

-   Configuration Database;

    bool DatabaseLoaded;
    bool DatabaseLoaded;

+   ::Configuration Database;

    string CurrentID;
    string CurrentID;

+   string CDROM;
+   bool Mounted;

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

+   virtual void Exit();

    
    public:
    
    
    public:
    


@@ -36,10 +39,21 @@ class CDROMMethod : public pkgAcqMethod
 // ---------------------------------------------------------------------
 /* */
 CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | 
 // ---------------------------------------------------------------------
 /* */
 CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | 

-                                         SendConfig), DatabaseLoaded(false)
+                                         SendConfig | NeedsCleanup), 
+                                          DatabaseLoaded(false), 
+                                          Mounted(false)

 {
 };
                                                                        /*}}}*/
 {
 };
                                                                        /*}}}*/

+// CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void CDROMMethod::Exit()
+{
+   if (Mounted == true)
+      UnmountCdrom(CDROM);
+}
+                                                                       /*}}}*/

 // CDROMMethod::GetID - Search the database for a matching string      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CDROMMethod::GetID - Search the database for a matching string      /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -68,13 +82,16 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    URI Get = Itm->Uri;
    string File = Get.Path;
    FetchResult Res;
    URI Get = Itm->Uri;
    string File = Get.Path;
    FetchResult Res;

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

    /* All IMS queries are returned as a hit, CDROMs are readonly so 
       time stamps never change */
    if (Itm->LastModified != 0)
    {
       Res.LastModified = Itm->LastModified;
       Res.IMSHit = true;
    /* All IMS queries are returned as a hit, CDROMs are readonly so 
       time stamps never change */
    if (Itm->LastModified != 0)
    {
       Res.LastModified = Itm->LastModified;
       Res.IMSHit = true;

+      Res.Filename = File;

       URIDone(Res);
       return true;
    }
       URIDone(Res);
       return true;
    }


@@ -108,19 +125,32 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
       return true;
    }
    
       return true;
    }
    

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

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

-   while (1)
+   while (CurrentID.empty() == true)

    {
    {

-      if (IdentCdrom(CDROM,NewID) == false)
-        return false;
-   
-      // A hit
-      if (Database.Find("CD::" + NewID) == Get.Host)
-        break;
+      bool Hit = false;
+      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)
+        break;
+        

       // I suppose this should prompt somehow?
       if (UnmountCdrom(CDROM) == false)
         return _error->Error("Unable to unmount the CD-ROM in %s, it may still be in use.",
       // I suppose this should prompt somehow?
       if (UnmountCdrom(CDROM) == false)
         return _error->Error("Unable to unmount the CD-ROM in %s, it may still be in use.",


@@ -133,6 +163,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
       }
       
       MountCdrom(CDROM);
       }
       
       MountCdrom(CDROM);

+      Mounted = true;

    }
    
    // Found a CD
    }
    
    // Found a CD


@@ -141,7 +172,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    if (stat(Res.Filename.c_str(),&Buf) != 0)
       return _error->Error("File not found");
    
    if (stat(Res.Filename.c_str(),&Buf) != 0)
       return _error->Error("File not found");
    

-   CurrentID = NewID;
+   if (NewID.empty() == false)
+      CurrentID = NewID;

    Res.LastModified = Buf.st_mtime;
    Res.IMSHit = true;
    Res.Size = Buf.st_size;
    Res.LastModified = Buf.st_mtime;
    Res.IMSHit = true;
    Res.Size = Buf.st_size;