* remove all the remaining #pragma implementation

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

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 7e194e2532b6527171826862aeecad4136b27a42..9b0568d8f04c179e1904cee5c03ba0d323a25730 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -1,9 +1,6 @@
 /*
  */
 
 /*
  */
 

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/cdrom.h"
-#endif

 #include<apt-pkg/init.h>
 #include<apt-pkg/error.h>
 #include<apt-pkg/cdromutl.h>
 #include<apt-pkg/init.h>
 #include<apt-pkg/error.h>
 #include<apt-pkg/cdromutl.h>


@@ -30,16 +27,12 @@ using namespace std;
    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 pkgCdrom::FindPackages(string CD,
-                           vector<string> &List,
-                           vector<string> &SList, 
-                           vector<string> &SigList,
-                           vector<string> &TransList,
+bool pkgCdrom::FindPackages(string CD,vector<string> &List,
+                           vector<string> &SList, vector<string> &SigList,

                            string &InfoDir, pkgCdromStatus *log,
                            unsigned int Depth)
 {
    static ino_t Inodes[9];
                            string &InfoDir, pkgCdromStatus *log,
                            unsigned int Depth)
 {
    static ino_t Inodes[9];

-   DIR *D;

 
    // if we have a look we "pulse" now
    if(log)
 
    // if we have a look we "pulse" now
    if(log)


@@ -94,28 +87,8 @@ bool pkgCdrom::FindPackages(string CD,
       if (_config->FindB("APT::CDROM::Thorough",false) == false)
         return true;
    }
       if (_config->FindB("APT::CDROM::Thorough",false) == false)
         return true;
    }

-
-   // see if we find translatin indexes
-   if (stat("i18n",&Buf) == 0)
-   {
-      D = opendir("i18n");
-      for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
-      {
-        if(strstr(Dir->d_name,"Translation") != NULL) 
-        {
-           if (_config->FindB("Debug::aptcdrom",false) == true)
-              std::clog << "found translations: " << Dir->d_name << "\n";
-           string file = Dir->d_name;
-           if(file.substr(file.size()-3,file.size()) == ".gz")
-              file = file.substr(0,file.size()-3);
-           TransList.push_back(CD+"i18n/"+ file);
-        }
-      }
-      closedir(D);
-   }
-

    
    

-   D = opendir(".");
+   DIR *D = opendir(".");

    if (D == 0)
       return _error->Errno("opendir","Unable to read %s",CD.c_str());
    
    if (D == 0)
       return _error->Errno("opendir","Unable to read %s",CD.c_str());
    


@@ -151,7 +124,7 @@ bool pkgCdrom::FindPackages(string CD,
       Inodes[Depth] = Buf.st_ino;
 
       // Descend
       Inodes[Depth] = Buf.st_ino;
 
       // Descend

-      if (FindPackages(CD + Dir->d_name,List,SList,SigList,TransList,InfoDir,log,Depth+1) == false)
+      if (FindPackages(CD + Dir->d_name,List,SList,SigList,InfoDir,log,Depth+1) == false)

         break;
 
       if (chdir(CD.c_str()) != 0)
         break;
 
       if (chdir(CD.c_str()) != 0)


@@ -446,6 +419,9 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
    {      
       F.getline(Buffer,sizeof(Buffer));
       CurLine++;
    {      
       F.getline(Buffer,sizeof(Buffer));
       CurLine++;

+      if (F.fail() && !F.eof())
+        return _error->Error(_("Line %u too long in source list %s."),
+                             CurLine,File.c_str());

       _strtabexpand(Buffer,sizeof(Buffer));
       _strstrip(Buffer);
             
       _strtabexpand(Buffer,sizeof(Buffer));
       _strstrip(Buffer);
             


@@ -588,7 +564,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    string DFile = _config->FindFile("Dir::State::cdroms");
    if (FileExists(DFile) == true)
    {
    string DFile = _config->FindFile("Dir::State::cdroms");
    if (FileExists(DFile) == true)
    {

-      if (ReadConfigFile(Database,DFile) == false)
+      if (ReadConfigFile(Database,DFile) == false) 

         return _error->Error("Unable to read the cdrom database %s",
                              DFile.c_str());
    }
         return _error->Error("Unable to read the cdrom database %s",
                              DFile.c_str());
    }


@@ -633,10 +609,9 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    vector<string> List;
    vector<string> SourceList;
    vector<string> SigList;
    vector<string> List;
    vector<string> SourceList;
    vector<string> SigList;

-   vector<string> TransList;

    string StartDir = SafeGetCWD();
    string InfoDir;
    string StartDir = SafeGetCWD();
    string InfoDir;

-   if (FindPackages(CDROM,List,SourceList, SigList,TransList,InfoDir,log) == false)
+   if (FindPackages(CDROM,List,SourceList, SigList,InfoDir,log) == false)

    {
       log->Update("\n");
       return false;
    {
       log->Update("\n");
       return false;


@@ -664,18 +639,19 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    DropRepeats(List,"Packages");
    DropRepeats(SourceList,"Sources");
    DropRepeats(SigList,"Release.gpg");
    DropRepeats(List,"Packages");
    DropRepeats(SourceList,"Sources");
    DropRepeats(SigList,"Release.gpg");

-   DropRepeats(TransList,"");

    if(log) {
       msg.str("");
    if(log) {
       msg.str("");

-      ioprintf(msg, _("Found %i package indexes, %i source indexes, "
-                     "%i translation indexes and %i signatures\n"), 
-              List.size(), SourceList.size(), TransList.size(),
-              SigList.size());
+      ioprintf(msg, _("Found %i package indexes, %i source indexes and "
+                     "%i signatures\n"), 
+              List.size(), SourceList.size(), SigList.size());

       log->Update(msg.str(), STEP_SCAN);
    }
 
       log->Update(msg.str(), STEP_SCAN);
    }
 

-   if (List.size() == 0 && SourceList.size() == 0)
+   if (List.size() == 0 && SourceList.size() == 0) 
+   {
+      UnmountCdrom(CDROM);

       return _error->Error("Unable to locate any package files, perhaps this is not a Debian Disc");
       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;
 
    // Check if the CD is in the database
    string Name;


@@ -711,7 +687,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
          Name.empty() == true)
       {
         if(!log) 
          Name.empty() == true)
       {
         if(!log) 

+         {
+           UnmountCdrom(CDROM);

            return _error->Error("No disc name found and no way to ask for it");
            return _error->Error("No disc name found and no way to ask for it");

+        }

 
         while(true) {
            if(!log->AskCdromName(Name)) {
 
         while(true) {
            if(!log->AskCdromName(Name)) {


@@ -754,10 +733,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    // Copy the package files to the state directory
    PackageCopy Copy;
    SourceCopy SrcCopy;
    // Copy the package files to the state directory
    PackageCopy Copy;
    SourceCopy SrcCopy;

-   TranslationsCopy TransCopy;

    if (Copy.CopyPackages(CDROM,Name,List, log) == false ||
    if (Copy.CopyPackages(CDROM,Name,List, log) == false ||

-       SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false ||
-       TransCopy.CopyTranslations(CDROM,Name,TransList, log) == false)
+       SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false)

       return false;
 
    // reduce the List so that it takes less space in sources.list
       return false;
 
    // reduce the List so that it takes less space in sources.list


@@ -786,7 +763,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
    {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)

+      {
+        UnmountCdrom(CDROM);

         return _error->Error("Internal error");
         return _error->Error("Internal error");

+      }

 
       if(log) {
         msg.str("");
 
       if(log) {
         msg.str("");


@@ -800,7 +780,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
    {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)

+      {
+        UnmountCdrom(CDROM);

         return _error->Error("Internal error");
         return _error->Error("Internal error");

+      }

 
       if(log) {
         msg.str("");
 
       if(log) {
         msg.str("");