Просмотр исходного кода

drop Dpkg::MaxArgs in favor of Dpkg::MaxArgsBytes

We had an old FIXME saying that it is probably pointless to do this if
we limit by length of the commandline already and I completely agree.
The splitting is bad enough if it must be done, so we should only do it
if we have to (as in absolute length of commandline) and, but that is
just a remark, it is unlikely that we ever have/had a call triggering
this as the default value was ~32000 items…
David Kalnischkies лет назад: 10
Родитель
Сommit
c92ece1a73
1 измененных файлов с 5 добавлено и 27 удалено
  1. 5 27
      apt-pkg/deb/dpkgpm.cc

+ 5 - 27
apt-pkg/deb/dpkgpm.cc

@@ -1231,9 +1231,6 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
    fd_set rfds;
    fd_set rfds;
    struct timespec tv;
    struct timespec tv;
 
 
-   // 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
    // try to figure out the max environment size
    int OSArgMax = sysconf(_SC_ARG_MAX);
    int OSArgMax = sysconf(_SC_ARG_MAX);
    if(OSArgMax < 0)
    if(OSArgMax < 0)
@@ -1305,33 +1302,14 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
 	 for (; J != List.end() && J->Op == I->Op; ++J)
 	 for (; J != List.end() && J->Op == I->Op; ++J)
 	    /* nothing */;
 	    /* nothing */;
 
 
-      // keep track of allocated strings for multiarch package names
-      std::vector<char *> Packages;
+      auto const size = (J - I) + 10;
 
 
       // start with the baseset of arguments
       // start with the baseset of arguments
-      unsigned long Size = StartSize;
+      auto Size = StartSize;
       Args.erase(Args.begin() + BaseArgs, Args.end());
       Args.erase(Args.begin() + BaseArgs, Args.end());
-
-      // Now check if we are within the MaxArgs limit
-      //
-      // this code below is problematic, because it may happen that
-      // the argument list is split in a way that A depends on B
-      // and they are in the same "--configure A B" run
-      // - with the split they may now be configured in different
-      //   runs, using Immediate-Configure-All can help prevent this.
-      if (J - I > (signed)MaxArgs)
-      {
-	 J = I + MaxArgs;
-	 unsigned long const size = MaxArgs + 10;
-	 Args.reserve(size);
-	 Packages.reserve(size);
-      }
-      else
-      {
-	 unsigned long const size = (J - I) + 10;
-	 Args.reserve(size);
-	 Packages.reserve(size);
-      }
+      Args.reserve(size);
+      // keep track of allocated strings for multiarch package names
+      std::vector<char *> Packages(size, nullptr);
 
 
       int fd[2];
       int fd[2];
       if (pipe(fd) != 0)
       if (pipe(fd) != 0)