X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/4df0b629aca0431f88248ce2e17702ff42367ca1..0d303f1764645284b33924c9be8bf29f0a32ca5c:/methods/cdrom.cc?ds=sidebyside diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 778cc63b1..74e2ecc6b 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cdrom.cc,v 1.8 1999/03/28 01:37:26 jgg Exp $ +// $Id: cdrom.cc,v 1.20.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### CDROM URI method for APT @@ -8,25 +8,44 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include <config.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/strutl.h> +#include <apt-pkg/hashes.h> +#include <string> +#include <vector> #include <sys/stat.h> -#include <unistd.h> + +#include <iostream> +#include <apti18n.h> /*}}}*/ +using namespace std; + class CDROMMethod : public pkgAcqMethod { - Configuration Database; bool DatabaseLoaded; + bool Debug; + + ::Configuration Database; string CurrentID; - + string CDROM; + bool MountedByApt; + 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(); + public: CDROMMethod(); @@ -35,46 +54,117 @@ class CDROMMethod : public pkgAcqMethod // CDROMMethod::CDROMethod - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | - SendConfig), DatabaseLoaded(false) +CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | + SendConfig | NeedsCleanup | + Removable), + DatabaseLoaded(false), + Debug(false), + MountedByApt(false) { -}; + UdevCdroms.Dlopen(); +} /*}}}*/ -// CDROMMethod::GetID - Get the ID hash for /*{{{*/ +// CDROMMethod::Exit - Unmount the disc if necessary /*{{{*/ // --------------------------------------------------------------------- -/* We search the configuration space for the name and then return the ID - tag associated with it. */ +/* */ +void CDROMMethod::Exit() +{ + if (MountedByApt == true) + UnmountCdrom(CDROM); +} + /*}}}*/ +// CDROMMethod::GetID - Search the database for a matching string /*{{{*/ +// --------------------------------------------------------------------- +/* */ string CDROMMethod::GetID(string Name) { - if (DatabaseLoaded == false) + // Search for an ID + const Configuration::Item *Top = Database.Tree("CD"); + if (Top != 0) + Top = Top->Child; + + for (; Top != 0;) + { + if (Top->Value == Name) + return Top->Tag; + + Top = Top->Next; + } + 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++) { - // Read the database - string DFile = _config->FindFile("Dir::State::cdroms"); - if (FileExists(DFile) == true) + if (v[i].Mounted) { - if (ReadConfigFile(Database,DFile) == false) + if (Debug) + clog << "Checking mounted cdrom device " << v[i].DeviceName << endl; + if (IsCorrectCD(Get, v[i].MountPath, NewID)) { - _error->Error("Unable to read the cdrom database %s", - DFile.c_str()); - return string(); - } + CDROM = v[i].MountPath; + return true; + } } - DatabaseLoaded = true; } - - const Configuration::Item *Top = Database.Tree("CD"); - if (Top != 0) - Top = Top->Child; - for (; Top != 0;) + // 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 (Top->Value == Name) - return Top->Tag; + if (!v[i].Mounted) + { + if(MountCdrom(AptMountPoint, v[i].DeviceName)) + { + if (IsCorrectCD(Get, AptMountPoint, NewID)) + { + MountedByApt = true; + CDROM = AptMountPoint; + return true; + } else { + UnmountCdrom(AptMountPoint); + } + } + } + } - Top = Top->Next; - } + 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 string(); + return false; } /*}}}*/ // CDROMMethod::Fetch - Fetch a file /*{{{*/ @@ -82,88 +172,114 @@ string CDROMMethod::GetID(string Name) /* */ bool CDROMMethod::Fetch(FetchItem *Itm) { + FetchResult Res; + URI Get = Itm->Uri; string File = Get.Path; - FetchResult Res; - + 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 */ if (Itm->LastModified != 0) { Res.LastModified = Itm->LastModified; Res.IMSHit = true; + Res.Filename = Itm->DestFile; URIDone(Res); return true; } - - string ID = GetID(Get.Host); - if (_error->PendingError() == true) - return false; - + + // Load the database + if (DatabaseLoaded == false) + { + // Read the database + string DFile = _config->FindFile("Dir::State::cdroms"); + if (FileExists(DFile) == true) + { + if (ReadConfigFile(Database,DFile) == false) + return _error->Error(_("Unable to read the cdrom database %s"), + DFile.c_str()); + } + DatabaseLoaded = true; + } + // All non IMS queries for package files fail. - if (Itm->IndexFile == true || ID.empty() == true) + if (Itm->IndexFile == true || GetID(Get.Host).empty() == true) { - Fail("Please use apt-cdrom to make this CD recognized by APT." - " apt-get update cannot be used to add new CDs"); + Fail(_("Please use apt-cdrom to make this CD-ROM recognized by APT." + " apt-get update cannot be used to add new CD-ROMs")); return true; } // We already have a CD inserted, but it is the wrong one - if (CurrentID.empty() == false && ID != CurrentID) + if (CurrentID.empty() == false && + CurrentID != "FAIL" && + Database.Find("CD::" + CurrentID) != Get.Host) { - Fail("Wrong CD",true); + Fail(_("Wrong CD-ROM"),true); return true; } - - string 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; + string NewID; - while (1) + while (CurrentID.empty() == true) { - if (IdentCdrom(CDROM,NewID) == false) - return false; - - // A hit - if (NewID == ID) - break; + if (AutoDetect) + AutoDetectAndMount(Get, NewID); + if(!IsMounted(CDROM)) + MountedByApt = MountCdrom(CDROM); + + if (IsCorrectCD(Get, CDROM, NewID)) + 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.", + if (_config->FindB("APT::CDROM::NoMount",false) == false && + UnmountCdrom(CDROM) == false) + return _error->Error(_("Unable to unmount the CD-ROM in %s, it may still be in use."), CDROM.c_str()); if (MediaFail(Get.Host,CDROM) == false) { CurrentID = "FAIL"; - Fail("Wrong CD",true); - return true; + return _error->Error(_("Disk not found.")); } - - MountCdrom(CDROM); } - // ID matches - if (NewID == ID) - { - Res.Filename = CDROM + File; - struct stat Buf; - if (stat(Res.Filename.c_str(),&Buf) != 0) - return _error->Error("File not found"); - - CurrentID = ID; - Res.LastModified = Buf.st_mtime; - Res.IMSHit = true; - Res.Size = Buf.st_size; - URIDone(Res); - return true; - } + // Found a CD + Res.Filename = CDROM + File; + struct stat Buf; + if (stat(Res.Filename.c_str(),&Buf) != 0) + return _error->Error(_("File not found")); - return _error->Error("CDROM not found"); + if (NewID.empty() == false) + CurrentID = NewID; + Res.LastModified = Buf.st_mtime; + Res.Size = Buf.st_size; + + Hashes Hash; + FileFd Fd(Res.Filename, FileFd::ReadOnly); + Hash.AddFD(Fd); + Res.TakeHashes(Hash); + + URIDone(Res); + return true; } /*}}}*/ int main() { + setlocale(LC_ALL, ""); + CDROMMethod Mth; return Mth.Run(); }