X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/83d89a9f6a641adccce898eb0bc675d94bc46465..6c9079759285e073024f7e3193c990ede2a17cef:/cmdline/apt-cdrom.cc diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 1839fdab4..cac0f7eff 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -1,8 +1,12 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-cdrom.cc,v 1.1 1998/11/27 01:52:56 jgg Exp $ +// $Id: apt-cdrom.cc,v 1.20 1999/04/03 01:05:25 jgg Exp $ /* ###################################################################### + APT CDROM - Tool for handling APT's CDROM database. + + Currently the only option is 'add' which will take the current CD + in the drive and add it into the database. ##################################################################### */ /*}}}*/ @@ -10,19 +14,17 @@ #include #include #include -#include #include #include #include -#include +#include +#include #include #include +#include #include #include -#include -#include -#include #include #include #include @@ -30,143 +32,16 @@ #include /*}}}*/ -// UnmountCdrom - Unmount a cdrom /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool UnmountCdrom(string Path) -{ - int Child = fork(); - if (Child < -1) - return _error->Errno("fork","Failed to fork"); - - // The child - if (Child == 0) - { - // Make all the fds /dev/null - for (int I = 0; I != 10;) - close(I); - for (int I = 0; I != 3;) - dup2(open("/dev/null",O_RDWR),I); - - 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"); - } - - // Check for an error code. - if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0) - return false; - return true; -} - /*}}}*/ -// MountCdrom - Mount a cdrom /*{{{*/ -// --------------------------------------------------------------------- -/* We fork mount.. */ -bool MountCdrom(string Path) -{ - int Child = fork(); - if (Child < -1) - return _error->Errno("fork","Failed to fork"); - - // The child - if (Child == 0) - { - // Make all the fds /dev/null - for (int I = 0; I != 10;) - close(I); - for (int I = 0; I != 3;) - dup2(open("/dev/null",O_RDWR),I); - - const char *Args[10]; - Args[0] = "mount"; - 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"); - } - - // Check for an error code. - if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0) - return false; - return true; -} - /*}}}*/ -// IdentCdrom - Generate a unique string for this CD /*{{{*/ -// --------------------------------------------------------------------- -/* We convert everything we hash into a string, this prevents byte size/order - from effecting the outcome. */ -bool IdentCdrom(string CD,string &Res) -{ - MD5Summation Hash; - - string StartDir = SafeGetCWD(); - if (chdir(CD.c_str()) != 0) - return _error->Errno("chdir","Unable to change to %s",CD.c_str()); - - DIR *D = opendir("."); - if (D == 0) - return _error->Errno("opendir","Unable to read %s",CD.c_str()); - - // Run over the directory - char S[300]; - for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D)) - { - // Skip some files.. - if (strcmp(Dir->d_name,".") == 0 || - strcmp(Dir->d_name,"..") == 0) - continue; - - sprintf(S,"%lu",Dir->d_ino); - Hash.Add(S); - Hash.Add(Dir->d_name); - }; - - chdir(StartDir.c_str()); - 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"); - - sprintf(S,"%u %u",Buf.f_blocks,Buf.f_bfree); - Hash.Add(S); - - Res = Hash.Result().Value(); - return true; -} - /*}}}*/ - -// FindPackage - Find the package files on the CDROM /*{{{*/ +// FindPackages - Find the package files on the CDROM /*{{{*/ // --------------------------------------------------------------------- /* We look over the cdrom for package files. This is a recursive 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) { - if (Depth >= 5) + static ino_t Inodes[9]; + if (Depth >= 7) return true; if (CD[CD.length()-1] != '/') @@ -179,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("."); @@ -204,14 +81,21 @@ bool FindPackages(string CD,vector &List, int Depth = 0) // See if the name is a sub directory struct stat Buf; if (stat(Dir->d_name,&Buf) != 0) - { - _error->Errno("Stat","Stat failed for %s",Dir->d_name); - break; - } + continue; 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; @@ -225,108 +109,6 @@ bool FindPackages(string CD,vector &List, int Depth = 0) return !_error->PendingError(); } /*}}}*/ -// CopyPackages - Copy the package files from the CD /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool CopyPackages(string CDROM,string Name,vector &List) -{ - OpTextProgress Progress; - - bool NoStat = _config->FindB("APT::CDROM::Fast",false); - - // Prepare the progress indicator - unsigned long TotalSize = 0; - for (vector::iterator I = List.begin(); I != List.end(); I++) - { - struct stat Buf; - if (stat(string(*I + "Packages").c_str(),&Buf) != 0) - return _error->Errno("stat","Stat failed for %s", - string(*I + "Packages").c_str()); - TotalSize += Buf.st_size; - } - - unsigned long CurrentSize = 0; - unsigned int NotFound = 0; - unsigned int WrongSize = 0; - unsigned int Packages = 0; - for (vector::iterator I = List.begin(); I != List.end(); I++) - { - // Open the package file - FileFd Pkg(*I + "Packages",FileFd::ReadOnly); - pkgTagFile Parser(Pkg); - if (_error->PendingError() == true) - return false; - - // Open the output file - char S[400]; - sprintf(S,"cdrom:%s/%sPackages",Name.c_str(),(*I).c_str() + CDROM.length()); - string TargetF = _config->FindDir("Dir::State::lists") + "partial/"; - FileFd Target(TargetF + URItoFileName(S),FileFd::WriteEmpty); - if (_error->PendingError() == true) - return false; - - // Setup the progress meter - Progress.OverallProgress(CurrentSize,TotalSize,Pkg.Size(), - "Reading Package Lists"); - - // Parse - Progress.SubProgress(Pkg.Size()); - pkgTagSection Section; - while (Parser.Step(Section) == true) - { - Progress.Progress(Parser.Offset()); - - string File = Section.FindS("Filename"); - unsigned long Size = Section.FindI("Size"); - if (File.empty() || Size == 0) - return _error->Error("Cannot find filename or size tag"); - - // See if the file exists - if (NoStat == false) - { - struct stat Buf; - File = CDROM + File; - if (stat(File.c_str(),&Buf) != 0) - { - NotFound++; - continue; - } - - // Size match - if ((unsigned)Buf.st_size != Size) - { - WrongSize++; - continue; - } - } - - Packages++; - - // Copy it to the target package file - const char *Start; - const char *Stop; - Section.GetSection(Start,Stop); - if (Target.Write(Start,Stop-Start) == false) - return false; - } - - CurrentSize += Pkg.Size(); - } - Progress.Done(); - - // Some stats - cout << "Wrote " << Packages << " package records" ; - if (NotFound != 0) - cout << " with " << NotFound << " missing files"; - if (NotFound != 0 && WrongSize != 0) - cout << " and"; - if (WrongSize != 0) - cout << " with " << WrongSize << " mismatched files"; - cout << '.' << endl; - if (NotFound + WrongSize > 10) - cout << "Alot of package entires were discarded, perhaps this CD is funny?" << endl; -} - /*}}}*/ // DropBinaryArch - Dump dirs with a string like /binary-/ /*{{{*/ // --------------------------------------------------------------------- /* Here we drop everything that is not this machines arch */ @@ -373,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) @@ -398,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++) { @@ -437,56 +224,370 @@ bool DropRepeats(vector &List) return true; } /*}}}*/ -// ConvertToSourceList - Takes the path list and converts it /*{{{*/ +// ConvertToSourceList - Convert a Path to a sourcelist entry /*{{{*/ // --------------------------------------------------------------------- -/* This looks at each element and decides if it can be expressed using - dists/ form or if it requires an absolute specficiation. It also - strips the leading CDROM path from the paths. */ -bool ConvertToSourcelist(string CD,vector &List) +/* We look for things in dists/ notation and convert them to + form otherwise it is left alone. This also strips + the CD path. */ +void ConvertToSourceList(string CD,string &Path) { char S[300]; sprintf(S,"binary-%s",_config->Find("Apt::Architecture").c_str()); + + // Strip the cdrom base path + Path = string(Path,CD.length()); + if (Path.empty() == true) + Path = "/"; + + // Too short to be a dists/ type + if (Path.length() < strlen("dists/")) + return; + + // Not a dists type. + if (stringcmp(Path.begin(),Path.begin()+strlen("dists/"),"dists/") != 0) + return; - sort(List.begin(),List.end()); + // Isolate the dist + string::size_type Slash = strlen("dists/"); + string::size_type Slash2 = Path.find('/',Slash + 1); + if (Slash2 == string::npos || Slash2 + 2 >= Path.length()) + return; + string Dist = string(Path,Slash,Slash2 - Slash); - // Convert to source list notation - for (vector::iterator I = List.begin(); I != List.end(); I++) - { - // Strip the cdrom base path - *I = string(*I,CD.length()); + // Isolate the component + Slash = Path.find('/',Slash2+1); + if (Slash == string::npos || Slash + 2 >= Path.length()) + return; + string Comp = string(Path,Slash2+1,Slash - Slash2-1); - // Too short to be a dists/ type - if ((*I).length() < strlen("dists/")) - continue; + // Verify the trailing binar - bit + Slash2 = Path.find('/',Slash + 1); + if (Slash == string::npos) + return; + string Binary = string(Path,Slash+1,Slash2 - Slash-1); - // Not a dists type. - if (stringcmp((*I).begin(),(*I).begin()+strlen("dists/"),"dists/") != 0) - continue; + if (Binary != S) + return; + + Path = Dist + ' ' + Comp; +} + /*}}}*/ +// GrabFirst - Return the first Depth path components /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool GrabFirst(string Path,string &To,unsigned int Depth) +{ + string::size_type I = 0; + do + { + I = Path.find('/',I+1); + Depth--; + } + while (I != string::npos && Depth != 0); + + if (I == string::npos) + return false; - // Isolate the dist - string::size_type Slash = strlen("dists/"); - string::size_type Slash2 = (*I).find('/',Slash + 1); - if (Slash2 == string::npos || Slash2 + 2 >= (*I).length()) - continue; - string Dist = string(*I,Slash,Slash2 - Slash); + To = string(Path,0,I+1); + return true; +} + /*}}}*/ +// ChopDirs - Chop off the leading directory components /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string ChopDirs(string Path,unsigned int Depth) +{ + string::size_type I = 0; + do + { + I = Path.find('/',I+1); + Depth--; + } + while (I != string::npos && Depth != 0); + + if (I == string::npos) + return string(); + + return string(Path,I+1); +} + /*}}}*/ +// ReconstructPrefix - Fix strange prefixing /*{{{*/ +// --------------------------------------------------------------------- +/* This prepends dir components from the path to the package files to + the path to the deb until it is found */ +bool ReconstructPrefix(string &Prefix,string OrigPath,string CD, + string File) +{ + bool Debug = _config->FindB("Debug::aptcdrom",false); + unsigned int Depth = 1; + string MyPrefix = Prefix; + while (1) + { + struct stat Buf; + if (stat(string(CD + MyPrefix + File).c_str(),&Buf) != 0) + { + if (Debug == true) + cout << "Failed, " << CD + MyPrefix + File << endl; + if (GrabFirst(OrigPath,MyPrefix,Depth++) == true) + continue; + + return false; + } + else + { + Prefix = MyPrefix; + return true; + } + } + return false; +} + /*}}}*/ +// ReconstructChop - Fixes bad source paths /*{{{*/ +// --------------------------------------------------------------------- +/* This removes path components from the filename and prepends the location + of the package files until a file is found */ +bool ReconstructChop(unsigned long &Chop,string Dir,string File) +{ + // Attempt to reconstruct the filename + unsigned long Depth = 0; + while (1) + { + struct stat Buf; + if (stat(string(Dir + File).c_str(),&Buf) != 0) + { + File = ChopDirs(File,1); + Depth++; + if (File.empty() == false) + continue; + return false; + } + else + { + Chop = Depth; + return true; + } + } + return false; +} + /*}}}*/ - // Isolate the component - Slash = (*I).find('/',Slash2+1); - if (Slash == string::npos || Slash + 2 >= (*I).length()) - continue; - string Comp = string(*I,Slash2+1,Slash - Slash2-1); +// CopyPackages - Copy the package files from the CD /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool CopyPackages(string CDROM,string Name,vector &List) +{ + OpTextProgress Progress; + + bool NoStat = _config->FindB("APT::CDROM::Fast",false); + bool Debug = _config->FindB("Debug::aptcdrom",false); + + // Prepare the progress indicator + unsigned long TotalSize = 0; + for (vector::iterator I = List.begin(); I != List.end(); I++) + { + struct stat Buf; + if (stat(string(*I + "Packages").c_str(),&Buf) != 0) + return _error->Errno("stat","Stat failed for %s", + string(*I + "Packages").c_str()); + TotalSize += Buf.st_size; + } + + unsigned long CurrentSize = 0; + unsigned int NotFound = 0; + unsigned int WrongSize = 0; + unsigned int Packages = 0; + for (vector::iterator I = List.begin(); I != List.end(); I++) + { + string OrigPath = string(*I,CDROM.length()); - // Verify the trailing binar - bit - Slash2 = (*I).find('/',Slash + 1); - if (Slash == string::npos) - continue; - string Binary = string(*I,Slash+1,Slash2 - Slash-1); + // Open the package file + FileFd Pkg(*I + "Packages",FileFd::ReadOnly); + pkgTagFile Parser(Pkg); + if (_error->PendingError() == true) + return false; - if (Binary != S) - continue; + // Open the output file + char S[400]; + sprintf(S,"cdrom:%s/%sPackages",Name.c_str(),(*I).c_str() + CDROM.length()); + string TargetF = _config->FindDir("Dir::State::lists") + "partial/"; + TargetF += URItoFileName(S); + if (_config->FindB("APT::CDROM::NoAct",false) == true) + TargetF = "/dev/null"; + FileFd Target(TargetF,FileFd::WriteEmpty); + if (_error->PendingError() == true) + return false; - *I = Dist + ' ' + Comp; - } + // Setup the progress meter + Progress.OverallProgress(CurrentSize,TotalSize,Pkg.Size(), + "Reading Package Lists"); + + // Parse + Progress.SubProgress(Pkg.Size()); + pkgTagSection Section; + string Prefix; + unsigned long Hits = 0; + unsigned long Chop = 0; + while (Parser.Step(Section) == true) + { + Progress.Progress(Parser.Offset()); + + string File = Section.FindS("Filename"); + unsigned long Size = Section.FindI("Size"); + if (File.empty() || Size == 0) + return _error->Error("Cannot find filename or size tag"); + + if (Chop != 0) + File = OrigPath + ChopDirs(File,Chop); + + // See if the file exists + if (NoStat == false || Hits < 10) + { + // Attempt to fix broken structure + if (Hits == 0) + { + if (ReconstructPrefix(Prefix,OrigPath,CDROM,File) == false && + ReconstructChop(Chop,*I,File) == false) + { + NotFound++; + continue; + } + if (Chop != 0) + File = OrigPath + ChopDirs(File,Chop); + } + + // Get the size + struct stat Buf; + if (stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0) + { + NotFound++; + continue; + } + + // Size match + if ((unsigned)Buf.st_size != Size) + { + WrongSize++; + continue; + } + } + + Packages++; + Hits++; + + // Copy it to the target package file + const char *Start; + const char *Stop; + if (Chop != 0) + { + // Mangle the output filename + const char *Filename; + Section.Find("Filename",Filename,Stop); + + /* We need to rewrite the filename field so we emit + all fields except the filename file and rewrite that one */ + for (unsigned int I = 0; I != Section.Count(); I++) + { + Section.Get(Start,Stop,I); + if (Start <= Filename && Stop > Filename) + { + char S[500]; + sprintf(S,"Filename: %s\n",File.c_str()); + if (I + 1 == Section.Count()) + strcat(S,"\n"); + if (Target.Write(S,strlen(S)) == false) + return false; + } + else + if (Target.Write(Start,Stop-Start) == false) + return false; + } + if (Target.Write("\n",1) == false) + return false; + } + else + { + Section.GetSection(Start,Stop); + if (Target.Write(Start,Stop-Start) == false) + return false; + } + } + + if (Debug == true) + cout << " Processed by using Prefix '" << Prefix << "' and chop " << Chop << endl; + + if (_config->FindB("APT::CDROM::NoAct",false) == false) + { + // Move out of the partial directory + Target.Close(); + string FinalF = _config->FindDir("Dir::State::lists"); + FinalF += URItoFileName(S); + if (rename(TargetF.c_str(),FinalF.c_str()) != 0) + return _error->Errno("rename","Failed to rename"); + + // Copy the release file + sprintf(S,"cdrom:%s/%sRelease",Name.c_str(),(*I).c_str() + CDROM.length()); + string TargetF = _config->FindDir("Dir::State::lists") + "partial/"; + TargetF += URItoFileName(S); + if (FileExists(*I + "Release") == true) + { + FileFd Target(TargetF,FileFd::WriteEmpty); + FileFd Rel(*I + "Release",FileFd::ReadOnly); + if (_error->PendingError() == true) + return false; + + if (CopyFile(Rel,Target) == false) + return false; + } + else + { + // Empty release file + FileFd Target(TargetF,FileFd::WriteEmpty); + } + + // Rename the release file + FinalF = _config->FindDir("Dir::State::lists"); + FinalF += URItoFileName(S); + if (rename(TargetF.c_str(),FinalF.c_str()) != 0) + return _error->Errno("rename","Failed to rename"); + } + + /* Mangle the source to be in the proper notation with + prefix dist [component] */ + *I = string(*I,Prefix.length()); + ConvertToSourceList(CDROM,*I); + *I = Prefix + ' ' + *I; + + CurrentSize += Pkg.Size(); + } + Progress.Done(); + + // Some stats + cout << "Wrote " << Packages << " package records" ; + if (NotFound != 0) + cout << " with " << NotFound << " missing files"; + if (NotFound != 0 && WrongSize != 0) + cout << " and"; + if (WrongSize != 0) + cout << " with " << WrongSize << " mismatched files"; + cout << '.' << endl; + + if (Packages == 0) + return _error->Error("No valid package records were found."); + + if (NotFound + WrongSize > 10) + cout << "Alot of package entires were discarded, perhaps this CD is funny?" << endl; + + return true; +} + /*}}}*/ + +// ReduceSourceList - Takes the path list and reduces it /*{{{*/ +// --------------------------------------------------------------------- +/* This takes the list of source list expressed entires and collects + similar ones to form a single entry for each dist */ +bool ReduceSourcelist(string CD,vector &List) +{ + sort(List.begin(),List.end()); // Collect similar entries for (vector::iterator I = List.begin(); I != List.end(); I++) @@ -495,19 +596,25 @@ bool ConvertToSourcelist(string CD,vector &List) string::size_type Space = (*I).find(' '); if (Space == string::npos) continue; + string::size_type SSpace = (*I).find(' ',Space + 1); + if (SSpace == string::npos) + continue; - string Word1 = string(*I,0,Space); + string Word1 = string(*I,Space,SSpace-Space); for (vector::iterator J = List.begin(); J != I; J++) { // Find a space.. string::size_type Space2 = (*J).find(' '); if (Space2 == string::npos) continue; + string::size_type SSpace2 = (*J).find(' ',Space2 + 1); + if (SSpace2 == string::npos) + continue; - if (string(*J,0,Space2) != Word1) + if (string(*J,Space2,SSpace2-Space2) != Word1) continue; - *J += string(*I,Space); + *J += string(*I,SSpace); *I = string(); } } @@ -522,6 +629,150 @@ bool ConvertToSourcelist(string CD,vector &List) } } /*}}}*/ +// WriteDatabase - Write the CDROM Database file /*{{{*/ +// --------------------------------------------------------------------- +/* We rewrite the configuration class associated with the cdrom database. */ +bool WriteDatabase(Configuration &Cnf) +{ + string DFile = _config->FindFile("Dir::State::cdroms"); + string NewFile = DFile + ".new"; + + unlink(NewFile.c_str()); + ofstream Out(NewFile.c_str()); + if (!Out) + return _error->Errno("ofstream::ofstream", + "Failed to open %s.new",DFile.c_str()); + + /* Write out all of the configuration directives by walking the + configuration tree */ + const Configuration::Item *Top = Cnf.Tree(0); + for (; Top != 0;) + { + // Print the config entry + if (Top->Value.empty() == false) + Out << Top->FullTag() + " \"" << Top->Value << "\";" << endl; + + if (Top->Child != 0) + { + Top = Top->Child; + continue; + } + + while (Top != 0 && Top->Next == 0) + Top = Top->Parent; + if (Top != 0) + Top = Top->Next; + } + + Out.close(); + + rename(DFile.c_str(),string(DFile + '~').c_str()); + if (rename(NewFile.c_str(),DFile.c_str()) != 0) + return _error->Errno("rename","Failed to rename %s.new to %s", + DFile.c_str(),DFile.c_str()); + + return true; +} + /*}}}*/ +// WriteSourceList - Write an updated sourcelist /*{{{*/ +// --------------------------------------------------------------------- +/* This reads the old source list and copies it into the new one. It + appends the new CDROM entires just after the first block of comments. + This places them first in the file. It also removes any old entries + that were the same. */ +bool WriteSourceList(string Name,vector &List) +{ + string File = _config->FindFile("Dir::Etc::sourcelist"); + + // Open the stream for reading + ifstream F(File.c_str(),ios::in | ios::nocreate); + if (!F != 0) + return _error->Errno("ifstream::ifstream","Opening %s",File.c_str()); + + string NewFile = File + ".new"; + unlink(NewFile.c_str()); + ofstream Out(NewFile.c_str()); + if (!Out) + return _error->Errno("ofstream::ofstream", + "Failed to open %s.new",File.c_str()); + + // Create a short uri without the path + string ShortURI = "cdrom:" + Name + "/"; + + char Buffer[300]; + int CurLine = 0; + bool First = true; + while (F.eof() == false) + { + F.getline(Buffer,sizeof(Buffer)); + CurLine++; + _strtabexpand(Buffer,sizeof(Buffer)); + _strstrip(Buffer); + + // Comment or blank + if (Buffer[0] == '#' || Buffer[0] == 0) + { + Out << Buffer << endl; + continue; + } + + if (First == true) + { + for (vector::iterator I = List.begin(); I != List.end(); I++) + { + string::size_type Space = (*I).find(' '); + if (Space == string::npos) + return _error->Error("Internal error"); + + Out << "deb \"cdrom:" << Name << "/" << string(*I,0,Space) << + "\" " << string(*I,Space+1) << endl; + } + } + First = false; + + // Grok it + string Type; + string URI; + char *C = Buffer; + if (ParseQuoteWord(C,Type) == false || + ParseQuoteWord(C,URI) == false) + { + Out << Buffer << endl; + continue; + } + + // Emit lines like this one + if (Type != "deb" || string(URI,0,ShortURI.length()) != ShortURI) + { + Out << Buffer << endl; + continue; + } + } + + // Just in case the file was empty + if (First == true) + { + for (vector::iterator I = List.begin(); I != List.end(); I++) + { + string::size_type Space = (*I).find(' '); + if (Space == string::npos) + return _error->Error("Internal error"); + + Out << "deb \"cdrom:" << Name << "/" << string(*I,0,Space) << + "\" " << string(*I,Space+1) << endl; + } + } + + Out.close(); + + rename(File.c_str(),string(File + '~').c_str()); + if (rename(NewFile.c_str(),File.c_str()) != 0) + return _error->Errno("rename","Failed to rename %s.new to %s", + File.c_str(),File.c_str()); + + return true; +} + /*}}}*/ // Prompt - Simple prompt /*{{{*/ // --------------------------------------------------------------------- @@ -550,13 +801,19 @@ string PromptLine(const char *Text) // DoAdd - Add a new CDROM /*{{{*/ // --------------------------------------------------------------------- -/* */ +/* This does the main add bit.. We show some status and things. The + sequence is to mount/umount the CD, Ident it then scan it for package + files and reduce that list. Then we copy over the package files and + verify them. Then rewrite the database files */ 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"); @@ -572,22 +829,23 @@ bool DoAdd(CommandLine &) { cout << "Unmounting CD-ROM" << endl; UnmountCdrom(CDROM); - + // Mount the new CDROM - Prompt("Please insert a CD-ROM and press any key"); + Prompt("Please insert a Disc in the drive and press enter"); cout << "Mounting CD-ROM" << endl; if (MountCdrom(CDROM) == false) - { - cout << "Failed to mount the cdrom." << endl; - return false; - } + return _error->Error("Failed to mount the cdrom."); } // Hash the CD to get an ID - cout << "Indentifying.. " << flush; + cout << "Identifying.. " << flush; string ID; if (IdentCdrom(CDROM,ID) == false) + { + cout << endl; return false; + } + cout << '[' << ID << ']' << endl; cout << "Scanning Disc for index files.. " << flush; @@ -595,8 +853,21 @@ 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) + { + cout << "I found:" << endl; + for (vector::iterator I = List.begin(); I != List.end(); I++) + { + cout << *I << endl; + } + } // Fix up the list DropBinaryArch(List); @@ -604,31 +875,83 @@ bool DoAdd(CommandLine &) cout << "Found " << List.size() << " package index files." << endl; if (List.size() == 0) - return _error->Error("Unable to locate any package files, perhaps this is not a debian CD-ROM"); + return _error->Error("Unable to locate any package files, perhaps this is not a Debian Disc"); // Check if the CD is in the database string Name; if (Database.Exists("CD::" + ID) == false || _config->FindB("APT::CDROM::Rename",false) == true) { - cout << "Please provide a name for this CD-ROM, such as 'Debian 2.1r1 Disk 1'"; - Name = PromptLine(""); + // Try to use the CDs label if at all possible + if (FileExists(CDROM + "/.disk/info") == true) + { + ifstream F(string(CDROM+ "/.disk/info").c_str()); + if (!F == 0) + getline(F,Name); + + if (Name.empty() == false) + { + cout << "Found label '" << Name << "'" << endl; + Database.Set("CD::" + ID + "::Label",Name); + } + } + + if (_config->FindB("APT::CDROM::Rename",false) == true || + Name.empty() == true) + { + cout << "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"; + while (1) + { + 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; // Copy the package files to the state directory if (CopyPackages(CDROM,Name,List) == false) return false; - ConvertToSourcelist(CDROM,List); + ReduceSourcelist(CDROM,List); + + // Write the database and sourcelist + if (_config->FindB("APT::cdrom::NoAct",false) == false) + { + if (WriteDatabase(Database) == false) + return false; + + cout << "Writing new source list" << endl; + if (WriteSourceList(Name,List) == false) + return false; + } // 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++) - cout << "deb \"cdrom:" << Name << "/\" " << *I << endl; - + { + string::size_type Space = (*I).find(' '); + if (Space == string::npos) + return _error->Error("Internal error"); + + cout << "deb \"cdrom:" << Name << "/" << string(*I,0,Space) << + "\" " << string(*I,Space+1) << endl; + } + return true; } /*}}}*/ @@ -640,6 +963,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; @@ -655,8 +980,10 @@ int ShowHelp() cout << " -d CD-ROM mount point" << endl; 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 << " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp" << endl; cout << "See fstab(5)" << endl; return 100; } @@ -666,10 +993,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',"recon","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}}; @@ -690,6 +1022,10 @@ int main(int argc,const char *argv[]) if (_config->FindB("help") == true || CmdL.FileSize() == 0) return ShowHelp(); + + // Deal with stdout not being a tty + if (ttyname(STDOUT_FILENO) == 0 && _config->FindI("quiet",0) < 1) + _config->Set("quiet","1"); // Match the operation CmdL.DispatchArg(Cmds);