Make directory paths configurable

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

diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index d6ef49a379e494fdd2ce98e7f61e621901cfe5ad..899f7328ba8122fd28653b4c28f20b2371ae8d26 100644 (file)
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -86,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)
    {


@@ -145,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;


@@ -184,14 +184,34 @@ 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 const &Cnf) {
+   Configuration PathCnf;
+   PathCnf.Set("Dir", Cnf.Find("Dir", "/"));
+   PathCnf.Set("Dir::State::status", "status");
+   auto const cnfstatedir = Cnf.Find("Dir::State", STATE_DIR + 1);
+   // if the state dir ends in apt, replace it with dpkg -
+   // for the default this gives us the same as the fallback below.
+   // This can't be a ../dpkg as that would play bad with symlinks
+   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())
+      PathCnf.Set("Dir::State", "var/lib/dpkg");
+   else
+      PathCnf.Set("Dir::State", flCombine(statedir, "dpkg"));
+   return PathCnf.FindFile("Dir::State::status");
+}

 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");
-   Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
+   if (Cnf.Exists("Dir::State::status") == false)
+      Cnf.Set("Dir::State::status", getDpkgStatusLocation(Cnf));
+   Cnf.CndSet("Dir::Bin::dpkg",BIN_DIR"/dpkg");

 
    if (d->StatusFile) {
      delete d->StatusFile;
 
    if (d->StatusFile) {
      delete d->StatusFile;


@@ -219,9 +239,9 @@ APT_PURE bool debSystem::ArchiveSupported(const char *Type)
 signed debSystem::Score(Configuration const &Cnf)
 {
    signed Score = 0;
 signed debSystem::Score(Configuration const &Cnf)
 {
    signed Score = 0;

-   if (FileExists(Cnf.FindFile("Dir::State::status","/var/lib/dpkg/status")) == true)
+   if (FileExists(Cnf.FindFile("Dir::State::status",getDpkgStatusLocation(Cnf).c_str())) == true)

        Score += 10;
        Score += 10;

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

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


@@ -302,7 +322,7 @@ void debSystem::DpkgChrootDirectory()                                       /*{{{*/
       _exit(100);
 }
                                                                        /*}}}*/
       _exit(100);
 }
                                                                        /*}}}*/

-static pid_t ExecDpkg(std::vector<std::string> const &sArgs, int * const inputFd, int * const outputFd, bool const showStderr)/*{{{*/
+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(); });
 {
    std::vector<const char *> Args(sArgs.size(), NULL);
    std::transform(sArgs.begin(), sArgs.end(), Args.begin(), [](std::string const &s) { return s.c_str(); });


@@ -333,7 +353,7 @@ static pid_t ExecDpkg(std::vector<std::string> const &sArgs, int * const inputFd
         close(external[0]);
         dup2(external[1], STDOUT_FILENO);
       }
         close(external[0]);
         dup2(external[1], STDOUT_FILENO);
       }

-      if (showStderr == false)
+      if (DiscardOutput == true)

         dup2(nullfd, STDERR_FILENO);
       debSystem::DpkgChrootDirectory();
       execvp(Args[0], (char**) &Args[0]);
         dup2(nullfd, STDERR_FILENO);
       debSystem::DpkgChrootDirectory();
       execvp(Args[0], (char**) &Args[0]);


@@ -357,7 +377,7 @@ bool debSystem::SupportsMultiArch()                                 /*{{{*/
 {
    std::vector<std::string> Args = GetDpkgBaseCommand();
    Args.push_back("--assert-multi-arch");
 {
    std::vector<std::string> Args = GetDpkgBaseCommand();
    Args.push_back("--assert-multi-arch");

-   pid_t const dpkgAssertMultiArch = ExecDpkg(Args, nullptr, nullptr, false);
+   pid_t const dpkgAssertMultiArch = ExecDpkg(Args, nullptr, nullptr, true);

    if (dpkgAssertMultiArch > 0)
    {
       int Status = 0;
    if (dpkgAssertMultiArch > 0)
    {
       int Status = 0;


@@ -386,7 +406,7 @@ std::vector<std::string> debSystem::SupportedArchitectures()                /*{{{*/
    std::vector<std::string> sArgs = GetDpkgBaseCommand();
    sArgs.push_back("--print-foreign-architectures");
    int outputFd = -1;
    std::vector<std::string> sArgs = GetDpkgBaseCommand();
    sArgs.push_back("--print-foreign-architectures");
    int outputFd = -1;

-   pid_t const dpkgMultiArch = ExecDpkg(sArgs, nullptr, &outputFd, false);
+   pid_t const dpkgMultiArch = ExecDpkg(sArgs, nullptr, &outputFd, true);

    if (dpkgMultiArch == -1)
       return archs;
 
    if (dpkgMultiArch == -1)
       return archs;
 


@@ -399,10 +419,10 @@ std::vector<std::string> debSystem::SupportedArchitectures()              /*{{{*/
         char* tok_saveptr;
         char* arch = strtok_r(buf, " ", &tok_saveptr);
         while (arch != NULL) {
         char* tok_saveptr;
         char* arch = strtok_r(buf, " ", &tok_saveptr);
         while (arch != NULL) {

-           for (; isspace(*arch) != 0; ++arch);
+           for (; isspace_ascii(*arch) != 0; ++arch);

            if (arch[0] != '\0') {
               char const* archend = arch;
            if (arch[0] != '\0') {
               char const* archend = arch;

-              for (; isspace(*archend) == 0 && *archend != '\0'; ++archend);
+              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);
               string a(arch, (archend - arch));
               if (std::find(archs.begin(), archs.end(), a) == archs.end())
                  archs.push_back(a);