From a3cada6abc42a2966c427a3b0731977ecfa7edcb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Oct 2014 14:19:32 -0400 Subject: Use sysconf(_SC_ARG_MAX) to find the size of Dpkg::MaxArgBytes Instead of hardcoding Dpkg::MaxArgBytes find out about it using the sysconf(_SC_ARG_MAX) call. --- apt-pkg/deb/dpkgpm.cc | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 04a13a86c..2d26493f0 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -55,6 +55,18 @@ using namespace std; +APT_PURE static unsigned int +EnvironmentSize() +{ + unsigned int size = 0; + char **envp = environ; + + while (*envp != NULL) + size += strlen (*envp++) + 1; + + return size; +} + class pkgDPkgPMPrivate { public: @@ -1236,8 +1248,15 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress) fd_set rfds; struct timespec tv; - unsigned int const MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024); - unsigned int const MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024); + // FIXME: do we really need this limit when we have MaxArgBytes? + unsigned int const MaxArgs = _config->FindI("Dpkg::MaxArgs",32*1024); + + // try to figure out the max environment size + unsigned int OSArgMax = sysconf(_SC_ARG_MAX); + if(OSArgMax < 0) + OSArgMax = 32*1024; + OSArgMax -= EnvironmentSize() - 2*1024; + unsigned int const MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes", OSArgMax); bool const NoTriggers = _config->FindB("DPkg::NoTriggers", false); if (RunScripts("DPkg::Pre-Invoke") == false) -- cgit v1.2.3 From 28460cb27846b2437010b08adf10bde18e370974 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Oct 2014 14:32:01 -0400 Subject: Fix incorrect comparison between signed/unsigned Git-Dch: ignore --- apt-pkg/deb/dpkgpm.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-pkg') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 2d26493f0..7bbf18cba 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1252,7 +1252,7 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress) unsigned int const MaxArgs = _config->FindI("Dpkg::MaxArgs",32*1024); // try to figure out the max environment size - unsigned int OSArgMax = sysconf(_SC_ARG_MAX); + int OSArgMax = sysconf(_SC_ARG_MAX); if(OSArgMax < 0) OSArgMax = 32*1024; OSArgMax -= EnvironmentSize() - 2*1024; -- cgit v1.2.3