X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b7d9b68ecea1fb31744f42929192e04e56c53d44..b84fa7158d04f8b2136f01dda106ba0272027887:/methods/cdrom.cc diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 3049e5ba8..601bc11c9 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cdrom.cc,v 1.7 1998/12/22 08:20:55 jgg Exp $ +// $Id: cdrom.cc,v 1.20.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### CDROM URI method for APT @@ -13,19 +13,28 @@ #include #include #include +#include #include #include + +#include +#include /*}}}*/ +using namespace std; + class CDROMMethod : public pkgAcqMethod { - Configuration Database; bool DatabaseLoaded; + ::Configuration Database; string CurrentID; + string CDROM; + bool MountedByApt; virtual bool Fetch(FetchItem *Itm); string GetID(string Name); + virtual void Exit(); public: @@ -35,45 +44,40 @@ 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), + MountedByApt(false) { }; /*}}}*/ -// CDROMMethod::GetID - Get the ID hash for /*{{{*/ +// CDROMMethod::Exit - Unmount the disc if necessary /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void CDROMMethod::Exit() +{ + if (MountedByApt == true) + UnmountCdrom(CDROM); +} + /*}}}*/ +// CDROMMethod::GetID - Search the database for a matching string /*{{{*/ // --------------------------------------------------------------------- -/* We search the configuration space for the name and then return the ID - tag associated with it. */ +/* */ string CDROMMethod::GetID(string Name) { - if (DatabaseLoaded == false) - { - // Read the database - string DFile = _config->FindFile("Dir::State::cdroms"); - if (FileExists(DFile) == true) - { - if (ReadConfigFile(Database,DFile) == false) - { - _error->Error("Unable to read the cdrom database %s", - DFile.c_str()); - return string(); - } - } - DatabaseLoaded = true; - } - + // 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(); } /*}}}*/ @@ -85,82 +89,114 @@ bool CDROMMethod::Fetch(FetchItem *Itm) 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; + 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 && 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/"); + CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/"); 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; + bool Hit = false; + 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; - UnmountCdrom(CDROM); + // A hit + if (Database.Find("CD::" + NewID) == Get.Host) + { + Hit = true; + break; + } + } + + if (Hit == true) + break; + + // I suppose this should prompt somehow? + 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.Fd(), Fd.Size()); + Res.TakeHashes(Hash); + + URIDone(Res); + return true; } /*}}}*/ int main() { + setlocale(LC_ALL, ""); + CDROMMethod Mth; return Mth.Run(); }