From 9983591d172ba5ded02b4e697e655429546e4966 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 26 Nov 2007 15:44:46 -0200 Subject: * Applied patch from Aurelien Jarno to avoid CPU getting crazy when /dev/null is redirected to stdin (which breaks buildds), closes: #452858. --- apt-pkg/deb/dpkgpm.cc | 10 ++++++++-- apt-pkg/deb/dpkgpm.h | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 5a7711a90..d796146fa 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -344,7 +344,10 @@ void pkgDPkgPM::DoStdin(int master) { char input_buf[256] = {0,}; int len = read(0, input_buf, sizeof(input_buf)); - write(master, input_buf, len); + if (len) + write(master, input_buf, len); + else + stdin_is_dev_null = true; } /*}}}*/ // DPkgPM::DoTerminalPty - Read the terminal pty and write log /*{{{*/ @@ -639,6 +642,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) } } + stdin_is_dev_null = false; + // create log OpenLog(); @@ -868,7 +873,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) // wait for input or output here FD_ZERO(&rfds); - FD_SET(0, &rfds); + if (!stdin_is_dev_null) + FD_SET(0, &rfds); FD_SET(_dpkgin, &rfds); if(master >= 0) FD_SET(master, &rfds); diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index b7f45b978..81a888f05 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -23,6 +23,8 @@ class pkgDPkgPM : public pkgPackageManager { private: + bool stdin_is_dev_null; + // the buffer we use for the dpkg status-fd reading char dpkgbuf[1024]; int dpkgbuf_pos; -- cgit v1.2.3-70-g09d2