don't hardcode /var/lib/dpkg/status as dir::state::status

[apt.git] / apt-pkg / deb / debsystem.cc

diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 142f3a6e65dacbdc3fedc322bd30131f4bf014ad..fd702b3c6b340b05f1feed02abe2c3742474ae1d 100644 (file)
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -22,6 +22,8 @@
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
 

+#include <algorithm>
+

 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>


@@ -30,6 +32,10 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>

+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <fcntl.h>

 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/


@@ -38,7 +44,7 @@ using std::string;
 
 debSystem debSys;
 
 
 debSystem debSys;
 

-class debSystemPrivate {
+class APT_HIDDEN debSystemPrivate {

 public:
    debSystemPrivate() : LockFD(-1), LockCount(0), StatusFile(0)
    {
 public:
    debSystemPrivate() : LockFD(-1), LockCount(0), StatusFile(0)
    {


@@ -53,11 +59,8 @@ public:
 // System::debSystem - Constructor                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // System::debSystem - Constructor                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-debSystem::debSystem()
+debSystem::debSystem() : pkgSystem("Debian dpkg interface", &debVS), d(new debSystemPrivate())

 {
 {

-   d = new debSystemPrivate();
-   Label = "Debian dpkg interface";
-   VS = &debVS;

 }
                                                                        /*}}}*/
 // System::~debSystem - Destructor                                     /*{{{*/
 }
                                                                        /*}}}*/
 // System::~debSystem - Destructor                                     /*{{{*/


@@ -83,7 +86,7 @@ bool debSystem::Lock()
    }
 
    // Create the lockfile
    }
 
    // Create the lockfile

-   string AdminDir = flNotFile(_config->Find("Dir::State::status"));
+   string AdminDir = flNotFile(_config->FindFile("Dir::State::status"));

    d->LockFD = GetLock(AdminDir + "lock");
    if (d->LockFD == -1)
    {
    d->LockFD = GetLock(AdminDir + "lock");
    if (d->LockFD == -1)
    {


@@ -142,7 +145,7 @@ bool debSystem::UnLock(bool NoErrors)
 bool debSystem::CheckUpdates()
 {
    // Check for updates.. (dirty)
 bool debSystem::CheckUpdates()
 {
    // Check for updates.. (dirty)

-   string File = flNotFile(_config->Find("Dir::State::status")) + "updates/";
+   string File = flNotFile(_config->FindFile("Dir::State::status")) + "updates/";

    DIR *DirP = opendir(File.c_str());
    if (DirP == 0)
       return false;
    DIR *DirP = opendir(File.c_str());
    if (DirP == 0)
       return false;


@@ -181,13 +184,35 @@ pkgPackageManager *debSystem::CreatePM(pkgDepCache *Cache) const
 // System::Initialize - Setup the configuration space..                        /*{{{*/
 // ---------------------------------------------------------------------
 /* These are the Debian specific configuration variables.. */
 // System::Initialize - Setup the configuration space..                        /*{{{*/
 // ---------------------------------------------------------------------
 /* These are the Debian specific configuration variables.. */

+static std::string getDpkgStatusLocation(Configuration &Cnf) {
+   auto const cnfstatedir = Cnf.Find("Dir::State", "var/lib/apt/");
+   std::string statedir;
+   if (APT::String::Endswith(cnfstatedir, "/apt/"))
+      statedir.assign(cnfstatedir, 0, cnfstatedir.length() - 5);
+   else if (APT::String::Endswith(cnfstatedir, "/apt"))
+      statedir.assign(cnfstatedir, 0, cnfstatedir.length() - 4);
+   if (statedir.empty())
+      Cnf.Set("Dir::State", "var/lib/dpkg");
+   else
+      Cnf.Set("Dir::State", flCombine(statedir, "dpkg"));
+   auto const cnfrootdir = Cnf.Find("RootDir");
+   if (Cnf.Exists("RootDir") == true)
+      Cnf.Set("RootDir", "");
+   Cnf.Set("Dir::State::status", "status");
+   auto const statusfile = Cnf.FindFile("Dir::State::status");
+   if (cnfrootdir.empty() == false)
+      Cnf.Set("RootDir", cnfrootdir);
+   Cnf.Set("Dir::State", cnfstatedir);
+   return statusfile;
+}

 bool debSystem::Initialize(Configuration &Cnf)
 {
    /* These really should be jammed into a generic 'Local Database' engine
       which is yet to be determined. The functions in pkgcachegen should
       be the only users of these */
    Cnf.CndSet("Dir::State::extended_states", "extended_states");
 bool debSystem::Initialize(Configuration &Cnf)
 {
    /* These really should be jammed into a generic 'Local Database' engine
       which is yet to be determined. The functions in pkgcachegen should
       be the only users of these */
    Cnf.CndSet("Dir::State::extended_states", "extended_states");

-   Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
+   if (Cnf.Exists("Dir::State::status") == false)
+      Cnf.Set("Dir::State::status", getDpkgStatusLocation(Cnf));

    Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
 
    if (d->StatusFile) {
    Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
 
    if (d->StatusFile) {


@@ -218,7 +243,7 @@ signed debSystem::Score(Configuration const &Cnf)
    signed Score = 0;
    if (FileExists(Cnf.FindFile("Dir::State::status","/var/lib/dpkg/status")) == true)
        Score += 10;
    signed Score = 0;
    if (FileExists(Cnf.FindFile("Dir::State::status","/var/lib/dpkg/status")) == true)
        Score += 10;

-   if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","/usr/bin/dpkg")) == true)
+   if (FileExists(Cnf.Find("Dir::Bin::dpkg","/usr/bin/dpkg")) == true)

       Score += 10;
    if (FileExists("/etc/debian_version") == true)
       Score += 10;
       Score += 10;
    if (FileExists("/etc/debian_version") == true)
       Score += 10;


@@ -253,3 +278,164 @@ bool debSystem::FindIndex(pkgCache::PkgFileIterator File,
    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

+
+std::string debSystem::GetDpkgExecutable()                             /*{{{*/
+{
+   string Tmp = _config->Find("Dir::Bin::dpkg","dpkg");
+   string const dpkgChrootDir = _config->FindDir("DPkg::Chroot-Directory", "/");
+   size_t dpkgChrootLen = dpkgChrootDir.length();
+   if (dpkgChrootDir != "/" && Tmp.find(dpkgChrootDir) == 0)
+   {
+      if (dpkgChrootDir[dpkgChrootLen - 1] == '/')
+         --dpkgChrootLen;
+      Tmp = Tmp.substr(dpkgChrootLen);
+   }
+   return Tmp;
+}
+                                                                       /*}}}*/
+std::vector<std::string> debSystem::GetDpkgBaseCommand()               /*{{{*/
+{
+   // Generate the base argument list for dpkg
+   std::vector<std::string> Args = { GetDpkgExecutable() };
+   // Stick in any custom dpkg options
+   Configuration::Item const *Opts = _config->Tree("DPkg::Options");
+   if (Opts != 0)
+   {
+      Opts = Opts->Child;
+      for (; Opts != 0; Opts = Opts->Next)
+      {
+        if (Opts->Value.empty() == true)
+           continue;
+        Args.push_back(Opts->Value);
+      }
+   }
+   return Args;
+}
+                                                                       /*}}}*/
+void debSystem::DpkgChrootDirectory()                                  /*{{{*/
+{
+   std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");
+   if (chrootDir == "/")
+      return;
+   std::cerr << "Chrooting into " << chrootDir << std::endl;
+   if (chroot(chrootDir.c_str()) != 0)
+      _exit(100);
+   if (chdir("/") != 0)
+      _exit(100);
+}
+                                                                       /*}}}*/
+pid_t debSystem::ExecDpkg(std::vector<std::string> const &sArgs, int * const inputFd, int * const outputFd, bool const DiscardOutput)/*{{{*/
+{
+   std::vector<const char *> Args(sArgs.size(), NULL);
+   std::transform(sArgs.begin(), sArgs.end(), Args.begin(), [](std::string const &s) { return s.c_str(); });
+   Args.push_back(NULL);
+
+   int external[2] = {-1, -1};
+   if (inputFd != nullptr || outputFd != nullptr)
+      if (pipe(external) != 0)
+      {
+        _error->WarningE("dpkg", "Can't create IPC pipe for dpkg call");
+        return -1;
+      }
+
+   pid_t const dpkg = ExecFork();
+   if (dpkg == 0) {
+      int const nullfd = open("/dev/null", O_RDONLY);
+      if (inputFd == nullptr)
+        dup2(nullfd, STDIN_FILENO);
+      else
+      {
+        close(external[1]);
+        dup2(external[0], STDIN_FILENO);
+      }
+      if (outputFd == nullptr)
+        dup2(nullfd, STDOUT_FILENO);
+      else
+      {
+        close(external[0]);
+        dup2(external[1], STDOUT_FILENO);
+      }
+      if (DiscardOutput == true)
+        dup2(nullfd, STDERR_FILENO);
+      debSystem::DpkgChrootDirectory();
+      execvp(Args[0], (char**) &Args[0]);
+      _error->WarningE("dpkg", "Can't execute dpkg!");
+      _exit(100);
+   }
+   if (outputFd != nullptr)
+   {
+      close(external[1]);
+      *outputFd = external[0];
+   }
+   else if (inputFd != nullptr)
+   {
+      close(external[0]);
+      *inputFd = external[1];
+   }
+   return dpkg;
+}
+                                                                       /*}}}*/
+bool debSystem::SupportsMultiArch()                                    /*{{{*/
+{
+   std::vector<std::string> Args = GetDpkgBaseCommand();
+   Args.push_back("--assert-multi-arch");
+   pid_t const dpkgAssertMultiArch = ExecDpkg(Args, nullptr, nullptr, true);
+   if (dpkgAssertMultiArch > 0)
+   {
+      int Status = 0;
+      while (waitpid(dpkgAssertMultiArch, &Status, 0) != dpkgAssertMultiArch)
+      {
+        if (errno == EINTR)
+           continue;
+        _error->WarningE("dpkgGo", _("Waited for %s but it wasn't there"), "dpkg --assert-multi-arch");
+        break;
+      }
+      if (WIFEXITED(Status) == true && WEXITSTATUS(Status) == 0)
+        return true;
+   }
+   return false;
+}
+                                                                       /*}}}*/
+std::vector<std::string> debSystem::SupportedArchitectures()           /*{{{*/
+{
+   std::vector<std::string> archs;
+   {
+      string const arch = _config->Find("APT::Architecture");
+      if (arch.empty() == false)
+        archs.push_back(std::move(arch));
+   }
+
+   std::vector<std::string> sArgs = GetDpkgBaseCommand();
+   sArgs.push_back("--print-foreign-architectures");
+   int outputFd = -1;
+   pid_t const dpkgMultiArch = ExecDpkg(sArgs, nullptr, &outputFd, true);
+   if (dpkgMultiArch == -1)
+      return archs;
+
+   FILE *dpkg = fdopen(outputFd, "r");
+   if(dpkg != NULL) {
+      char* buf = NULL;
+      size_t bufsize = 0;
+      while (getline(&buf, &bufsize, dpkg) != -1)
+      {
+        char* tok_saveptr;
+        char* arch = strtok_r(buf, " ", &tok_saveptr);
+        while (arch != NULL) {
+           for (; isspace_ascii(*arch) != 0; ++arch);
+           if (arch[0] != '\0') {
+              char const* archend = arch;
+              for (; isspace_ascii(*archend) == 0 && *archend != '\0'; ++archend);
+              string a(arch, (archend - arch));
+              if (std::find(archs.begin(), archs.end(), a) == archs.end())
+                 archs.push_back(a);
+           }
+           arch = strtok_r(NULL, " ", &tok_saveptr);
+        }
+      }
+      free(buf);
+      fclose(dpkg);
+   }
+   ExecWait(dpkgMultiArch, "dpkg --print-foreign-architectures", true);
+   return archs;
+}
+                                                                       /*}}}*/