More cleanup

Author: jgg
Date: 1998-12-22 08:41:20 GMT
More cleanup

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index a413b109fa46f2b2e4b435a5c6f308d5ea1a0481..c21d0cbc0d41767d7a7a92938ab7f10053a613d3 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.14 1998/12/22 08:41:20 jgg Exp $
 /* ######################################################################
    
    APT CDROM - Tool for handling APT's CDROM database.
@@ -908,15 +908,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;