ExecGPGV: Rework file removal on exit()

[apt.git] / apt-pkg / edsp / edspsystem.cc

diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index 0d967863ef86cc6b198a2a685ef5ced99f2df988..1ceb21a17201db28936011f441864d447b99ef95 100644 (file)
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -28,63 +28,25 @@
 
                                                                        /*}}}*/
 
 
                                                                        /*}}}*/
 

-class edspSystemPrivate {
-   std::string tempDir;
-   std::string tempStatesFile;
-   std::string tempPrefsFile;
-
-public:
-   edspSystemPrivate() {}
-
-   void Initialize(Configuration &Cnf)
-   {
-      DeInitialize();
-      Cnf.Set("Dir::State::extended_states", "/dev/null");
-      Cnf.Set("Dir::Etc::preferences", "/dev/null");
-      std::string const tmp = GetTempDir();
-      char tmpname[100];
-      snprintf(tmpname, sizeof(tmpname), "%s/apt-edsp-solver-XXXXXX", tmp.c_str());
-      if (NULL == mkdtemp(tmpname))
-        return;
-      tempDir = tmpname;
-      tempStatesFile = flCombine(tempDir, "extended_states");
-      Cnf.Set("Dir::State::extended_states", tempStatesFile);
-      tempPrefsFile = flCombine(tempDir, "apt_preferences");
-      Cnf.Set("Dir::Etc::preferences", tempPrefsFile);
-   }
-
-   void DeInitialize()
-   {
-      if (tempDir.empty())
-        return;
-
-      RemoveFile("DeInitialize", tempStatesFile);
-      RemoveFile("DeInitialize", tempPrefsFile);
-      rmdir(tempDir.c_str());
-   }
-
-   ~edspSystemPrivate() { DeInitialize(); }
-};
-// System::edspSystem - Constructor                                    /*{{{*/
-edspSystem::edspSystem() : pkgSystem("Debian APT solver interface", &debVS), d(new edspSystemPrivate()), StatusFile(NULL)
+// System::System - Constructor                                                /*{{{*/
+edspLikeSystem::edspLikeSystem(char const * const Label) : pkgSystem(Label, &debVS)

 {
 }
 {
 }

-                                                                       /*}}}*/
-// System::~debSystem - Destructor                                     /*{{{*/
-edspSystem::~edspSystem()
+edspSystem::edspSystem() : edspLikeSystem("Debian APT solver interface")
+{
+}
+eippSystem::eippSystem() : edspLikeSystem("Debian APT planner interface")

 {
 {

-   delete StatusFile;
-   delete d;

 }
                                                                        /*}}}*/
 // System::Lock - Get the lock                                         /*{{{*/
 }
                                                                        /*}}}*/
 // System::Lock - Get the lock                                         /*{{{*/

-bool edspSystem::Lock()
+bool edspLikeSystem::Lock()

 {
    return true;
 }
                                                                        /*}}}*/
 // System::UnLock - Drop a lock                                                /*{{{*/
 {
    return true;
 }
                                                                        /*}}}*/
 // System::UnLock - Drop a lock                                                /*{{{*/

-bool edspSystem::UnLock(bool /*NoErrors*/)
+bool edspLikeSystem::UnLock(bool /*NoErrors*/)

 {
    return true;
 }
 {
    return true;
 }


@@ -93,68 +55,113 @@ bool edspSystem::UnLock(bool /*NoErrors*/)
 // ---------------------------------------------------------------------
 /* we can't use edsp input as input for real installations - just a
    simulation can work, but everything else will fail bigtime */
 // ---------------------------------------------------------------------
 /* we can't use edsp input as input for real installations - just a
    simulation can work, but everything else will fail bigtime */

-pkgPackageManager *edspSystem::CreatePM(pkgDepCache * /*Cache*/) const
+pkgPackageManager *edspLikeSystem::CreatePM(pkgDepCache * /*Cache*/) const

 {
 {

-   return NULL;
+   return nullptr;

 }
                                                                        /*}}}*/
 // System::Initialize - Setup the configuration space..                        /*{{{*/
 }
                                                                        /*}}}*/
 // System::Initialize - Setup the configuration space..                        /*{{{*/

-bool edspSystem::Initialize(Configuration &Cnf)
+bool edspLikeSystem::Initialize(Configuration &Cnf)

 {
 {

-   d->Initialize(Cnf);
+   Cnf.Set("Dir::Log", "/dev/null");
+   // state is included completely in the input files
+   Cnf.Set("Dir::Etc::preferences", "/dev/null");

    Cnf.Set("Dir::Etc::preferencesparts", "/dev/null");
    Cnf.Set("Dir::State::status","/dev/null");
    Cnf.Set("Dir::Etc::preferencesparts", "/dev/null");
    Cnf.Set("Dir::State::status","/dev/null");

+   Cnf.Set("Dir::State::extended_states","/dev/null");

    Cnf.Set("Dir::State::lists","/dev/null");
    Cnf.Set("Dir::State::lists","/dev/null");

-
+   // do not store an mmap cache
+   Cnf.Set("Dir::Cache::pkgcache", "");
+   Cnf.Set("Dir::Cache::srcpkgcache", "");
+   // the protocols only propose actions, not do them

    Cnf.Set("Debug::NoLocking", "true");
    Cnf.Set("APT::Get::Simulate", "true");
 
    Cnf.Set("Debug::NoLocking", "true");
    Cnf.Set("APT::Get::Simulate", "true");
 

-   if (StatusFile) {
-     delete StatusFile;
-     StatusFile = 0;
-   }
+   StatusFile.reset(nullptr);
+   return true;
+}
+bool edspSystem::Initialize(Configuration &Cnf)
+{
+   if (edspLikeSystem::Initialize(Cnf) == false)
+      return false;
+   std::string const tmp = GetTempDir();
+   char tmpname[300];
+   snprintf(tmpname, sizeof(tmpname), "%s/apt-edsp-solver-XXXXXX", tmp.c_str());
+   if (nullptr == mkdtemp(tmpname))
+      return false;
+   tempDir = tmpname;
+   tempStatesFile = flCombine(tempDir, "extended_states");
+   Cnf.Set("Dir::State::extended_states", tempStatesFile);
+   tempPrefsFile = flCombine(tempDir, "apt_preferences");
+   Cnf.Set("Dir::Etc::preferences", tempPrefsFile);

    return true;
 }
                                                                        /*}}}*/
 // System::ArchiveSupported - Is a file format supported               /*{{{*/
    return true;
 }
                                                                        /*}}}*/
 // System::ArchiveSupported - Is a file format supported               /*{{{*/

-bool edspSystem::ArchiveSupported(const char * /*Type*/)
+bool edspLikeSystem::ArchiveSupported(const char * /*Type*/)

 {
    return false;
 }
                                                                        /*}}}*/
 // System::Score - Never use the EDSP system automatically             /*{{{*/
 {
    return false;
 }
                                                                        /*}}}*/
 // System::Score - Never use the EDSP system automatically             /*{{{*/

-signed edspSystem::Score(Configuration const &)
+signed edspLikeSystem::Score(Configuration const &)

 {
    return -1000;
 }
                                                                        /*}}}*/
 {
    return -1000;
 }
                                                                        /*}}}*/

-bool edspSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List)     /*{{{*/
+// System::FindIndex - Get an index file for status files              /*{{{*/
+bool edspLikeSystem::FindIndex(pkgCache::PkgFileIterator File,
+                         pkgIndexFile *&Found) const

 {
    if (StatusFile == 0)
 {
    if (StatusFile == 0)

+      return false;
+   if (StatusFile->FindInCache(*File.Cache()) == File)
+   {
+      Found = StatusFile.get();
+      return true;
+   }
+
+   return false;
+}
+                                                                       /*}}}*/
+bool edspSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List)     /*{{{*/
+{
+   if (StatusFile == nullptr)

    {
       if (_config->Find("edsp::scenario", "") == "/nonexistent/stdin")
    {
       if (_config->Find("edsp::scenario", "") == "/nonexistent/stdin")

-        StatusFile = new edspIndex("/nonexistent/stdin");
+        StatusFile.reset(new edspIndex("/nonexistent/stdin"));

       else
       else

-        StatusFile = new edspIndex(_config->FindFile("edsp::scenario"));
+        StatusFile.reset(new edspIndex(_config->FindFile("edsp::scenario")));

    }
    }

-   List.push_back(StatusFile);
+   List.push_back(StatusFile.get());

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-// System::FindIndex - Get an index file for status files              /*{{{*/
-bool edspSystem::FindIndex(pkgCache::PkgFileIterator File,
-                         pkgIndexFile *&Found) const
+bool eippSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List)     /*{{{*/

 {
 {

-   if (StatusFile == 0)
-      return false;
-   if (StatusFile->FindInCache(*File.Cache()) == File)
+   if (StatusFile == nullptr)

    {
    {

-      Found = StatusFile;
-      return true;
+      if (_config->Find("eipp::scenario", "") == "/nonexistent/stdin")
+        StatusFile.reset(new eippIndex("/nonexistent/stdin"));
+      else
+        StatusFile.reset(new eippIndex(_config->FindFile("eipp::scenario")));

    }
    }

-
-   return false;
+   List.push_back(StatusFile.get());
+   return true;

 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

+edspLikeSystem::~edspLikeSystem() {}
+edspSystem::~edspSystem()
+{
+   if (tempDir.empty())
+      return;
+
+   RemoveFile("~edspSystem", tempStatesFile);
+   RemoveFile("~edspSystem", tempPrefsFile);
+   rmdir(tempDir.c_str());
+}
+eippSystem::~eippSystem() {}
+

 APT_HIDDEN edspSystem edspSys;
 APT_HIDDEN edspSystem edspSys;

+APT_HIDDEN eippSystem eippSys;