apt-pkg/contrib/cdromutl.{cc,h}: return string for mountpath; apt-pkg/cdrom.cc: use...

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

diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index 6dce82fe1b757f4983798b50c56d93ff0963bfab..83c324f543bfdadf035ef21dda531eb2c49a41e1 100644 (file)
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -15,6 +15,7 @@
 #include <apt-pkg/md5.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>

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

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


@@ -156,6 +157,19 @@ bool MountCdrom(string Path, string DeviceName)
 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)


@@ -202,10 +216,15 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
       struct statvfs Buf;
       if (statvfs(CD.c_str(),&Buf) != 0)
         return _error->Errno("statfs",_("Failed to stat the cdrom"));
       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
       // 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)));
+      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);
    }
       Hash.Add(S);
       sprintf(S,"-%u",Version);
    }


@@ -216,3 +235,33 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
    return true;   
 }
                                                                        /*}}}*/
    return true;   
 }
                                                                        /*}}}*/

+
+// FindMountPointForDevice - Find mountpoint for the given device      /*{{{*/
+string FindMountPointForDevice(const char *devnode)
+{
+   char buf[255];
+   char *out[10];
+   int i=0;
+
+   // this is the order that mount uses as well
+   const char *mount[] = { "/etc/mtab", 
+                           "/proc/mount", 
+                           NULL };
+
+   for (i=0; mount[i] != NULL; i++) {
+      if (FileExists(mount[i])) {
+         FILE *f=fopen(mount[i], "r");
+         while ( fgets(buf, sizeof(buf), f) != NULL) {
+            if (strncmp(buf, devnode, strlen(devnode)) == 0) {
+               if(TokSplitString(' ', buf, out, 10))
+                  return string(out[1]);
+            }
+         }
+         fclose(f);
+      }
+   }
+   
+   return string();
+}
+
+