add a way to add packages to generate a dists style environment without

[apt.git] / apt-pkg / contrib / cdromutl.cc

diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index 99eb540ec2a6001bc3039926825e08873e39103f..68b98040722e3b611a03e16d30a227ea015fad40 100644 (file)
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cdromutl.cc,v 1.6 1999/06/05 03:54:29 jgg Exp $
+// $Id: cdromutl.cc,v 1.12 2001/02/20 07:03:17 jgg Exp $

 /* ######################################################################
    
    CDROM Utilities - Some functions to manipulate CDROM mounts.
 /* ######################################################################
    
    CDROM Utilities - Some functions to manipulate CDROM mounts.


@@ -10,18 +10,17 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/cdromutl.h"
-#endif

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

+#include <apti18n.h>
+    

 #include <sys/wait.h>
 #include <sys/errno.h>
 #include <sys/wait.h>
 #include <sys/errno.h>

-#include <sys/vfs.h>
+#include <sys/statvfs.h>

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


@@ -50,7 +49,7 @@ bool IsMounted(string &Path)
    struct stat Buf,Buf2;
    if (stat(Path.c_str(),&Buf) != 0 || 
        stat((Path + "../").c_str(),&Buf2) != 0)
    struct stat Buf,Buf2;
    if (stat(Path.c_str(),&Buf) != 0 || 
        stat((Path + "../").c_str(),&Buf2) != 0)

-      return _error->Errno("stat","Unable to stat the mount point %s",Path.c_str());
+      return _error->Errno("stat",_("Unable to stat the mount point %s"),Path.c_str());

 
    if (Buf.st_dev == Buf2.st_dev)
       return false;
 
    if (Buf.st_dev == Buf2.st_dev)
       return false;


@@ -65,52 +64,50 @@ bool UnmountCdrom(string Path)
 {
    if (IsMounted(Path) == false)
       return true;
 {
    if (IsMounted(Path) == false)
       return true;

-   
-   int Child = ExecFork();

 
 

-   // The child
-   if (Child == 0)
+   for (int i=0;i<3;i++)

    {
    {

-      // Make all the fds /dev/null
-      for (int I = 0; I != 3; I++)
-        dup2(open("/dev/null",O_RDWR),I);
+   
+      int Child = ExecFork();

 
 

-      if (_config->Exists("Acquire::cdrom::"+Path+"::UMount") == true)
+      // The child
+      if (Child == 0)

       {
       {

-        if (system(_config->Find("Acquire::cdrom::"+Path+"::UMount").c_str()) != 0)
+        // Make all the fds /dev/null
+        for (int I = 0; I != 3; I++)
+           dup2(open("/dev/null",O_RDWR),I);
+
+        if (_config->Exists("Acquire::cdrom::"+Path+"::UMount") == true)
+        {
+           if (system(_config->Find("Acquire::cdrom::"+Path+"::UMount").c_str()) != 0)
+              _exit(100);
+           _exit(0);            
+        }
+        else
+        {
+           const char *Args[10];
+           Args[0] = "umount";
+           Args[1] = Path.c_str();
+           Args[2] = 0;
+           execvp(Args[0],(char **)Args);      

            _exit(100);
            _exit(100);

-        _exit(0);               
+        }      

       }
       }

-      else
-      {
-        const char *Args[10];
-        Args[0] = "umount";
-        Args[1] = Path.c_str();
-        Args[2] = 0;
-        execvp(Args[0],(char **)Args);      
-        _exit(100);
-      }      
-   }

 
 

-   // Wait for mount
-   int Status = 0;
-   while (waitpid(Child,&Status,0) != Child)
-   {
-      if (errno == EINTR)
-        continue;
-      return _error->Errno("waitpid","Couldn't wait for subprocess");
+      // if it can not be umounted, give it a bit more time
+      // this can happen when auto-mount magic or fs/cdrom prober attack
+      if (ExecWait(Child,"umount",true) == true)
+        return true;
+      sleep(1);

    }
    }

-   
-   // Check for an error code.
-   if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
-      return false;
-   return true;
+
+   return false;

 }
                                                                        /*}}}*/
 // MountCdrom - Mount a cdrom                                          /*{{{*/
 // ---------------------------------------------------------------------
 /* We fork mount and drop all messages */
 }
                                                                        /*}}}*/
 // MountCdrom - Mount a cdrom                                          /*{{{*/
 // ---------------------------------------------------------------------
 /* We fork mount and drop all messages */

-bool MountCdrom(string Path)
+bool MountCdrom(string Path, string DeviceName)

 {
    if (IsMounted(Path) == true)
       return true;
 {
    if (IsMounted(Path) == true)
       return true;


@@ -134,26 +131,22 @@ bool MountCdrom(string Path)
       {
         const char *Args[10];
         Args[0] = "mount";
       {
         const char *Args[10];
         Args[0] = "mount";

-        Args[1] = Path.c_str();
-        Args[2] = 0;
+        if (DeviceName == "") 
+        {
+           Args[1] = Path.c_str();
+           Args[2] = 0;
+        } else {
+           Args[1] = DeviceName.c_str();
+           Args[2] = Path.c_str();
+           Args[3] = 0;
+        }

         execvp(Args[0],(char **)Args);      
         _exit(100);
       }      
    }
 
    // Wait for mount
         execvp(Args[0],(char **)Args);      
         _exit(100);
       }      
    }
 
    // Wait for mount

-   int Status = 0;
-   while (waitpid(Child,&Status,0) != Child)
-   {
-      if (errno == EINTR)
-        continue;
-      return _error->Errno("waitpid","Couldn't wait for subprocess");
-   }
-   
-   // Check for an error code.
-   if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
-      return false;
-   return true;
+   return ExecWait(Child,"mount",true);

 }
                                                                        /*}}}*/
 // IdentCdrom - Generate a unique string for this CD                   /*{{{*/
 }
                                                                        /*}}}*/
 // IdentCdrom - Generate a unique string for this CD                   /*{{{*/


@@ -163,14 +156,27 @@ bool MountCdrom(string Path)
 bool IdentCdrom(string CD,string &Res,unsigned int Version)
 {
    MD5Summation Hash;
 bool IdentCdrom(string CD,string &Res,unsigned int Version)
 {
    MD5Summation Hash;

+   bool writable_media = false;
+
+   // if we are on a writable medium (like a usb-stick) that is just
+   // used like a cdrom don't use "." as it will constantly change,
+   // use .disk instead
+   if (access(CD.c_str(), W_OK) == 0 && DirectoryExists(CD+string("/.disk"))) 
+   {
+      writable_media = true;
+      CD = CD.append("/.disk");
+      if (_config->FindB("Debug::aptcdrom",false) == true)
+         std::clog << "Found writable cdrom, using alternative path: " << CD
+                   << std::endl;
+   }

 
    string StartDir = SafeGetCWD();
    if (chdir(CD.c_str()) != 0)
 
    string StartDir = SafeGetCWD();
    if (chdir(CD.c_str()) != 0)

-      return _error->Errno("chdir","Unable to change to %s",CD.c_str());
+      return _error->Errno("chdir",_("Unable to change to %s"),CD.c_str());

    
    DIR *D = opendir(".");
    if (D == 0)
    
    DIR *D = opendir(".");
    if (D == 0)

-      return _error->Errno("opendir","Unable to read %s",CD.c_str());
+      return _error->Errno("opendir",_("Unable to read %s"),CD.c_str());

       
    /* Run over the directory, we assume that the reader order will never
       change as the media is read-only. In theory if the kernel did
       
    /* Run over the directory, we assume that the reader order will never
       change as the media is read-only. In theory if the kernel did


@@ -185,34 +191,45 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
 
       if (Version <= 1)
       {
 
       if (Version <= 1)
       {

-        sprintf(S,"%lu",Dir->d_ino);
+        sprintf(S,"%lu",(unsigned long)Dir->d_ino);

       }
       else
       {
         struct stat Buf;
         if (stat(Dir->d_name,&Buf) != 0)
            continue;
       }
       else
       {
         struct stat Buf;
         if (stat(Dir->d_name,&Buf) != 0)
            continue;

-        sprintf(S,"%lu",Buf.st_mtime);
+        sprintf(S,"%lu",(unsigned long)Buf.st_mtime);

       }
       
       Hash.Add(S);
       Hash.Add(Dir->d_name);
    };
    
       }
       
       Hash.Add(S);
       Hash.Add(Dir->d_name);
    };
    

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

    closedir(D);
    
    // Some stats from the fsys
    closedir(D);
    
    // Some stats from the fsys

-   struct statfs Buf;
-   if (statfs(CD.c_str(),&Buf) != 0)
-      return _error->Errno("statfs","Failed to stat the cdrom");
+   if (_config->FindB("Debug::identcdrom",false) == false)
+   {
+      struct statvfs Buf;
+      if (statvfs(CD.c_str(),&Buf) != 0)
+        return _error->Errno("statfs",_("Failed to stat the cdrom"));

 
 

-   // We use a kilobyte block size to advoid overflow
-   sprintf(S,"%lu %lu",(long)(Buf.f_blocks*(Buf.f_bsize/1024)),
-          (long)(Buf.f_bfree*(Buf.f_bsize/1024)));
-   Hash.Add(S);
+      // We use a kilobyte block size to advoid overflow
+      if (writable_media)
+      {
+         sprintf(S,"%lu",(long)(Buf.f_blocks*(Buf.f_bsize/1024)));
+      } else {
+         sprintf(S,"%lu %lu",(long)(Buf.f_blocks*(Buf.f_bsize/1024)),
+                 (long)(Buf.f_bfree*(Buf.f_bsize/1024)));
+      }
+      Hash.Add(S);
+      sprintf(S,"-%u",Version);
+   }
+   else
+      sprintf(S,"-%u.debug",Version);

    
    

-   sprintf(S,"-%u",Version);

    Res = Hash.Result().Value() + S;
    return true;   
 }
    Res = Hash.Result().Value() + S;
    return true;   
 }