Deprecate SPtrArray<T> and convert everyone to unique_ptr<T[]>

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 82d806e9dca8cd8a1847896f68ddadc8c8226277..d9ddecb6a1aadca2f4a1ce0f3ff96215599c19e6 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -16,11 +16,12 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>

+#include <apt-pkg/strutl.h>

 #include <apt-pkg/hashes.h>
 
 #include <apt-pkg/hashes.h>
 

+#include <string>
+#include <vector>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <unistd.h>
-#include <dlfcn.h>

 
 #include <iostream>
 #include <apti18n.h>
 
 #include <iostream>
 #include <apti18n.h>


@@ -41,9 +42,9 @@ class CDROMMethod : public pkgAcqMethod
  
    bool IsCorrectCD(URI want, string MountPath, string& NewID);
    bool AutoDetectAndMount(const URI, string &NewID);
  
    bool IsCorrectCD(URI want, string MountPath, string& NewID);
    bool AutoDetectAndMount(const URI, string &NewID);

-   virtual bool Fetch(FetchItem *Itm);
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;

    string GetID(string Name);
    string GetID(string Name);

-   virtual void Exit();
+   virtual void Exit() APT_OVERRIDE;

       
    public:
    
       
    public:
    


@@ -56,11 +57,12 @@ class CDROMMethod : public pkgAcqMethod
 CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
                                          SendConfig | NeedsCleanup |
                                          Removable), 
 CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
                                          SendConfig | NeedsCleanup |
                                          Removable), 

-                                          DatabaseLoaded(false), 
+                                          DatabaseLoaded(false),
+                                         Debug(false),

                                           MountedByApt(false)
 {
    UdevCdroms.Dlopen();
                                           MountedByApt(false)
 {
    UdevCdroms.Dlopen();

-};
+}

                                                                        /*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
 // ---------------------------------------------------------------------


@@ -258,15 +260,16 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    struct stat Buf;
    if (stat(Res.Filename.c_str(),&Buf) != 0)
       return _error->Error(_("File not found"));
    struct stat Buf;
    if (stat(Res.Filename.c_str(),&Buf) != 0)
       return _error->Error(_("File not found"));

-   
+
+   URIStart(Res);

    if (NewID.empty() == false)
       CurrentID = NewID;
    Res.LastModified = Buf.st_mtime;
    Res.Size = Buf.st_size;
 
    if (NewID.empty() == false)
       CurrentID = NewID;
    Res.LastModified = Buf.st_mtime;
    Res.Size = Buf.st_size;
 

-   Hashes Hash;
+   Hashes Hash(Itm->ExpectedHashes);

    FileFd Fd(Res.Filename, FileFd::ReadOnly);
    FileFd Fd(Res.Filename, FileFd::ReadOnly);

-   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Hash.AddFD(Fd);

    Res.TakeHashes(Hash);
 
    URIDone(Res);
    Res.TakeHashes(Hash);
 
    URIDone(Res);