Added wrecked symlink recovery

[apt.git] / cmdline / apt-cdrom.cc

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 459e4a48d7f037ef5beaa9828ed005c84addb2eb..49c7909dc9c9591b39ba27fba2c38d7d96a1f580 100644 (file)
--- 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.18 1999/03/27 01:30:38 jgg Exp $
+// $Id: apt-cdrom.cc,v 1.24 1999/05/29 04:59:52 jgg Exp $
 /* ######################################################################
    
    APT CDROM - Tool for handling APT's CDROM database.
@@ -38,7 +38,8 @@
    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<string> &List, unsigned int Depth = 0)
+bool FindPackages(string CD,vector<string> &List,string &InfoDir,
+                 unsigned int Depth = 0)
 {
    static ino_t Inodes[9];
    if (Depth >= 7)
@@ -50,10 +51,17 @@ bool FindPackages(string CD,vector<string> &List, unsigned int Depth = 0)
    if (chdir(CD.c_str()) != 0)
       return _error->Errno("chdir","Unable to change to %s",CD.c_str());
 
+   // Look for a .disk subdirectory
+   struct stat Buf;
+   if (stat(".disk",&Buf) == 0)
+   {
+      if (InfoDir.empty() == true)
+        InfoDir = CD + ".disk/";
+   }
+
    /* Aha! We found some package files. We assume that everything under 
       this dir is controlled by those package files so we don't look down
       anymore */
-   struct stat Buf;
    if (stat("Packages",&Buf) == 0) 
    {
       List.push_back(CD);
@@ -62,7 +70,7 @@ bool FindPackages(string CD,vector<string> &List, unsigned int Depth = 0)
       if (_config->FindB("APT::CDROM::Thorough",false) == false)
         return true;
    }
-
+   
    DIR *D = opendir(".");
    if (D == 0)
       return _error->Errno("opendir","Unable to read %s",CD.c_str());
@@ -97,7 +105,7 @@ bool FindPackages(string CD,vector<string> &List, unsigned int Depth = 0)
       Inodes[Depth] = Buf.st_ino;
 
       // Descend
-      if (FindPackages(CD + Dir->d_name,List,Depth+1) == false)
+      if (FindPackages(CD + Dir->d_name,List,InfoDir,Depth+1) == false)
         break;
 
       if (chdir(CD.c_str()) != 0)
@@ -440,6 +448,7 @@ bool CopyPackages(string CDROM,string Name,vector<string> &List)
            File = OrigPath + ChopDirs(File,Chop);
         
         // See if the file exists
+        bool Mangled = false;
         if (NoStat == false || Hits < 10)
         {
            // Attempt to fix broken structure
@@ -448,6 +457,8 @@ bool CopyPackages(string CDROM,string Name,vector<string> &List)
               if (ReconstructPrefix(Prefix,OrigPath,CDROM,File) == false &&
                   ReconstructChop(Chop,*I,File) == false)
               {
+                 if (Debug == true)
+                    clog << "Missed: " << File << endl;
                  NotFound++;
                  continue;
               }
@@ -459,13 +470,31 @@ bool CopyPackages(string CDROM,string Name,vector<string> &List)
            struct stat Buf;
            if (stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0)
            {
-              NotFound++;
-              continue;
+              // Attempt to fix busted symlink support for one instance
+              string OrigFile = File;
+              string::size_type Start = File.find("binary-");
+              string::size_type End = File.find("/",Start+3);
+              if (Start != string::npos && End != string::npos)
+              {
+                 File.replace(Start,End-Start,"binary-all");
+                 Mangled = true;
+              }
+              
+              if (Mangled == false ||
+                  stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0)
+              {
+                 if (Debug == true)
+                    clog << "Missed(2): " << OrigFile << endl;
+                 NotFound++;
+                 continue;
+              }               
            }       
                                            
            // Size match
            if ((unsigned)Buf.st_size != Size)
            {
+              if (Debug == true)
+                 clog << "Wrong Size: " << File << endl;
               WrongSize++;
               continue;
            }
@@ -477,7 +506,7 @@ bool CopyPackages(string CDROM,string Name,vector<string> &List)
         // Copy it to the target package file
         const char *Start;
         const char *Stop;
-        if (Chop != 0)
+        if (Chop != 0 || Mangled == true)
         {
            // Mangle the output filename
            const char *Filename;
@@ -498,8 +527,13 @@ bool CopyPackages(string CDROM,string Name,vector<string> &List)
                     return false;
               }
               else
+              {
                  if (Target.Write(Start,Stop-Start) == false)
-                    return false;                
+                    return false;
+                 if (Stop[-1] != '\n')
+                    if (Target.Write("\n",1) == false)
+                       return false;
+              }               
            }
            if (Target.Write("\n",1) == false)
               return false;
@@ -575,7 +609,7 @@ bool CopyPackages(string CDROM,string Name,vector<string> &List)
       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;
+      cout << "Alot of package entries were discarded, perhaps this CD is funny?" << endl;
 
    return true;
 }
@@ -831,13 +865,10 @@ bool DoAdd(CommandLine &)
       UnmountCdrom(CDROM);
 
       // Mount the new CDROM
-      Prompt("Please insert a Disc in the drive 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
@@ -855,7 +886,8 @@ bool DoAdd(CommandLine &)
    // Get the CD structure
    vector<string> List;
    string StartDir = SafeGetCWD();
-   if (FindPackages(CDROM,List) == false)
+   string InfoDir;
+   if (FindPackages(CDROM,List,InfoDir) == false)
    {
       cout << endl;
       return false;
@@ -886,9 +918,10 @@ bool DoAdd(CommandLine &)
        _config->FindB("APT::CDROM::Rename",false) == true)
    {
       // Try to use the CDs label if at all possible
-      if (FileExists(CDROM + "/.disk/info") == true)
+      if (InfoDir.empty() == false &&
+         FileExists(InfoDir + "/info") == true)
       {
-        ifstream F(string(CDROM+ "/.disk/info").c_str());
+        ifstream F(string(InfoDir + "/info").c_str());
         if (!F == 0)
            getline(F,Name);
 
@@ -986,7 +1019,7 @@ int ShowHelp()
    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;
 }