X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/65ae8fab065de81a777e679528a3859c621836da..f3bcc38396ab3a7ad5c2e299a5f4e036b2cd06b3:/cmdline/apt-cdrom.cc diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 5a0ace8b6..85d2fa3e8 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-cdrom.cc,v 1.6 1998/11/29 01:19:20 jgg Exp $ +// $Id: apt-cdrom.cc,v 1.17 1999/01/30 02:12:53 jgg Exp $ /* ###################################################################### APT CDROM - Tool for handling APT's CDROM database. @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include @@ -38,8 +38,9 @@ search that short circuits when it his a package file in the dir. This speeds it up greatly as the majority of the size is in the binary-* sub dirs. */ -bool FindPackages(string CD,vector &List, int Depth = 0) +bool FindPackages(string CD,vector &List, unsigned int Depth = 0) { + static ino_t Inodes[9]; if (Depth >= 7) return true; @@ -53,11 +54,13 @@ bool FindPackages(string CD,vector &List, int Depth = 0) this dir is controlled by those package files so we don't look down anymore */ struct stat Buf; - if (stat("Packages",&Buf) == 0 || - stat("Packages.gz",&Buf) == 0) + if (stat("Packages",&Buf) == 0) { List.push_back(CD); - return true; + + // Continue down if thorough is given + if (_config->FindB("APT::CDROM::Thorough",false) == false) + return true; } DIR *D = opendir("."); @@ -83,6 +86,16 @@ bool FindPackages(string CD,vector &List, int Depth = 0) if (S_ISDIR(Buf.st_mode) == 0) continue; + unsigned int I; + for (I = 0; I != Depth; I++) + if (Inodes[I] == Buf.st_ino) + break; + if (I != Depth) + continue; + + // Store the inodes weve seen + Inodes[Depth] = Buf.st_ino; + // Descend if (FindPackages(CD + Dir->d_name,List,Depth+1) == false) break; @@ -142,6 +155,8 @@ int Score(string Path) int Res = 0; if (Path.find("stable/") != string::npos) Res += 2; + if (Path.find("/binary-") != string::npos) + Res += 2; if (Path.find("frozen/") != string::npos) Res += 2; if (Path.find("/dists/") != string::npos) @@ -167,11 +182,14 @@ bool DropRepeats(vector &List) for (unsigned int I = 0; I != List.size(); I++) { struct stat Buf; - if (stat(List[I].c_str(),&Buf) != 0) - _error->Errno("stat","Failed to stat %s",List[I].c_str()); + if (stat((List[I] + "Packages").c_str(),&Buf) != 0) + _error->Errno("stat","Failed to stat %sPackages",List[I].c_str()); Inodes[I] = Buf.st_ino; } + if (_error->PendingError() == true) + return false; + // Look for dups for (unsigned int I = 0; I != List.size(); I++) { @@ -791,8 +809,11 @@ bool DoAdd(CommandLine &) { // Startup string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/"); - cout << "Using CD-ROM mount point " << CDROM << endl; + if (CDROM[0] == '.') + CDROM= SafeGetCWD() + '/' + CDROM; + cout << "Using CD-ROM mount point " << CDROM << endl; + // Read the database Configuration Database; string DFile = _config->FindFile("Dir::State::cdroms"); @@ -823,7 +844,11 @@ bool DoAdd(CommandLine &) cout << "Identifying.. " << flush; string ID; if (IdentCdrom(CDROM,ID) == false) + { + cout << endl; return false; + } + cout << '[' << ID << ']' << endl; cout << "Scanning Disc for index files.. " << flush; @@ -831,7 +856,11 @@ bool DoAdd(CommandLine &) vector List; string StartDir = SafeGetCWD(); if (FindPackages(CDROM,List) == false) + { + cout << endl; return false; + } + chdir(StartDir.c_str()); if (_config->FindB("Debug::aptcdrom",false) == true) @@ -878,15 +907,22 @@ bool DoAdd(CommandLine &) { Name = PromptLine(""); if (Name.empty() == false && + Name.find('"') == string::npos && + Name.find(':') == string::npos && Name.find('/') == string::npos) break; cout << "That is not a valid name, try again " << endl; - } - + } } } else Name = Database.Find("CD::" + ID); + + string::iterator J = Name.begin(); + for (; J != Name.end(); J++) + if (*J == '/' || *J == '"' || *J == ':') + *J = '_'; + Database.Set("CD::" + ID,Name); cout << "This Disc is called '" << Name << "'" << endl; @@ -908,7 +944,7 @@ bool DoAdd(CommandLine &) } // Print the sourcelist entries - cout << "Source List entires for this Disc are:" << endl; + cout << "Source List entries for this Disc are:" << endl; for (vector::iterator I = List.begin(); I != List.end(); I++) { string::size_type Space = (*I).find(' '); @@ -930,6 +966,8 @@ int ShowHelp() { cout << PACKAGE << ' ' << VERSION << " for " << ARCHITECTURE << " compiled on " << __DATE__ << " " << __TIME__ << endl; + if (_config->FindB("version") == true) + return 100; cout << "Usage: apt-cdrom [options] command" << endl; cout << endl; @@ -946,6 +984,7 @@ int ShowHelp() cout << " -r Rename a recognized CD-ROM" << endl; cout << " -m No mounting" << endl; cout << " -f Fast mode, don't check package files" << endl; + cout << " -a Thorough scan mode" << endl; cout << " -c=? Read this configuration file" << endl; cout << " -o=? Set an arbitary configuration option, ie -o dir::cache=/tmp" << endl; cout << "See fstab(5)" << endl; @@ -957,13 +996,15 @@ int main(int argc,const char *argv[]) { CommandLine::Args Args[] = { {'h',"help","help",0}, + {'v',"version","version",0}, {'d',"cdrom","Acquire::cdrom::mount",CommandLine::HasArg}, {'r',"rename","APT::CDROM::Rename",0}, {'m',"no-mount","APT::CDROM::NoMount",0}, {'f',"fast","APT::CDROM::Fast",0}, - {'n',"just-print","APT::CDROM::NoAct",0}, + {'n',"just-print","APT::CDROM::NoAct",0}, {'n',"recon","APT::CDROM::NoAct",0}, - {'n',"no-act","APT::CDROM::NoAct",0}, + {'n',"no-act","APT::CDROM::NoAct",0}, + {'a',"thorough","APT::CDROM::Thorough",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,0,0,0}};