Fixed espy's bug with experimental

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

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index a413b109fa46f2b2e4b435a5c6f308d5ea1a0481..e1847be6eb3fd9e6c2bfbbfe49a8b69e4a20088a 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.13 1998/12/09 05:57:17 jgg Exp $
+// $Id: apt-cdrom.cc,v 1.22 1999/04/07 06:00:20 jgg Exp $
 /* ######################################################################
    
    APT CDROM - Tool for handling APT's CDROM database.
@@ -18,7 +18,7 @@
 #include <apt-pkg/progress.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/cdromutl.h>
-#include <strutl.h>
+#include <apt-pkg/strutl.h>
 #include <config.h>
 
 #include <iostream>
@@ -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)
@@ -54,8 +55,7 @@ bool FindPackages(string CD,vector<string> &List, unsigned 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);
       
@@ -64,6 +64,13 @@ bool FindPackages(string CD,vector<string> &List, unsigned int Depth = 0)
         return true;
    }
 
+   // Look for a .disk subdirectory
+   if (stat(".disk",&Buf) == 0)
+   {
+      if (InfoDir.empty() == true)
+        InfoDir = CD + ".disk/";
+   }
+   
    DIR *D = opendir(".");
    if (D == 0)
       return _error->Errno("opendir","Unable to read %s",CD.c_str());
@@ -92,16 +99,13 @@ bool FindPackages(string CD,vector<string> &List, unsigned int Depth = 0)
         if (Inodes[I] == Buf.st_ino)
            break;
       if (I != Depth)
-      {
-        cout << "Inode throw away " <<  Dir->d_name << endl;
         continue;
-      }
       
       // Store the inodes weve seen
       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)
@@ -187,10 +191,13 @@ bool DropRepeats(vector<string> &List)
    {
       struct stat Buf;
       if (stat((List[I] + "Packages").c_str(),&Buf) != 0)
-        _error->Errno("stat","Failed to stat %s",List[I].c_str());
+        _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++)
    {
@@ -832,13 +839,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
@@ -856,7 +860,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;
@@ -887,9 +892,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);
 
@@ -908,15 +914,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;
    
@@ -960,6 +973,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;
@@ -978,7 +993,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;
 }
@@ -988,6 +1003,7 @@ 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},
@@ -1016,6 +1032,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);