copy uri doc

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

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 1985c22a6b2fd3ecf046327e707f4e148904c406..0b909a769fd76743b5ee3cf1484627653ef61cbf 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-cdrom.cc,v 1.7 1998/12/04 23:33:18 jgg Exp $
+// $Id: apt-cdrom.cc,v 1.15 1998/12/30 06:26:00 jgg Exp $

 /* ######################################################################
    
    APT CDROM - Tool for handling APT's CDROM database.
 /* ######################################################################
    
    APT CDROM - Tool for handling APT's CDROM database.


@@ -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. */
    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, int Depth = 0)
+bool FindPackages(string CD,vector<string> &List, unsigned int Depth = 0)

 {
 {

+   static ino_t Inodes[9];

    if (Depth >= 7)
       return true;
 
    if (Depth >= 7)
       return true;
 


@@ -53,11 +54,13 @@ bool FindPackages(string CD,vector<string> &List, int Depth = 0)
       this dir is controlled by those package files so we don't look down
       anymore */
    struct stat Buf;
       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);
    {
       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(".");
    }
 
    DIR *D = opendir(".");


@@ -83,6 +86,16 @@ bool FindPackages(string CD,vector<string> &List, int Depth = 0)
       if (S_ISDIR(Buf.st_mode) == 0)
         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;
       // 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;
    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)
    if (Path.find("frozen/") != string::npos)
       Res += 2;
    if (Path.find("/dists/") != string::npos)


@@ -167,11 +182,14 @@ bool DropRepeats(vector<string> &List)
    for (unsigned int I = 0; I != List.size(); I++)
    {
       struct stat Buf;
    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;
    }
    
       Inodes[I] = Buf.st_ino;
    }
    

+   if (_error->PendingError() == true)
+      return false;
+   

    // Look for dups
    for (unsigned int I = 0; I != List.size(); I++)
    {
    // Look for dups
    for (unsigned int I = 0; I != List.size(); I++)
    {


@@ -889,15 +907,22 @@ bool DoAdd(CommandLine &)
         {
            Name = PromptLine("");
            if (Name.empty() == false &&
         {
            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;
                Name.find('/') == string::npos)
               break;
            cout << "That is not a valid name, try again " << endl;

-        }
-        
+        }       

       }      
    }
    else
       Name = Database.Find("CD::" + ID);
       }      
    }
    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;
    
    Database.Set("CD::" + ID,Name);
    cout << "This Disc is called '" << Name << "'" << endl;
    


@@ -919,7 +944,7 @@ bool DoAdd(CommandLine &)
    }
 
    // Print the sourcelist entries
    }
 
    // Print the sourcelist entries

-   cout << "Source List entires for this Disc are:" << endl;
+   cout << "Source List entries for this Disc are:" << endl;

    for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
    {
       string::size_type Space = (*I).find(' ');
    for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
    {
       string::size_type Space = (*I).find(' ');


@@ -957,6 +982,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 << "  -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;
    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;


@@ -972,9 +998,10 @@ int main(int argc,const char *argv[])
       {'r',"rename","APT::CDROM::Rename",0},
       {'m',"no-mount","APT::CDROM::NoMount",0},
       {'f',"fast","APT::CDROM::Fast",0},
       {'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',"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}};
       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
       {0,0,0,0}};