summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-08-06 15:13:30 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2007-08-06 15:13:30 +0200
commit917832191acb189705762e13aab3b7c5e6e26653 (patch)
treee86e87b35d79e7141f946f8b3eae90d0ad77d3a4
parent3538cecfed48b351ed3f18ba60f8f18731cc4740 (diff)
parenta4cf3665915b79ef6dcafd9d1e12b722e0ee5342 (diff)
* merged with dpkg-log branch
-rw-r--r--apt-pkg/deb/dpkgpm.cc49
1 files changed, 30 insertions, 19 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 168c31483..e017c1a5b 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -13,6 +13,7 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/strutl.h>
+#include <apti18n.h>
#include <unistd.h>
#include <stdlib.h>
@@ -706,15 +707,19 @@ bool pkgDPkgPM::Go(int OutStatusFd)
ioctl(0, TIOCGWINSZ, (char *)&win);
if (openpty(&master, &slave, NULL, &tt, &win) < 0)
{
- fprintf(stderr, _("openpty failed\n"));
+ const char *s = _("Can not write log, openpty() "
+ "failed (/dev/pts not mounted?)\n");
+ fprintf(stderr, "%s",s);
+ fprintf(term_out, "%s",s);
+ master = slave = -1;
+ } else {
+ struct termios rtt;
+ rtt = tt;
+ cfmakeraw(&rtt);
+ rtt.c_lflag &= ~ECHO;
+ tcsetattr(0, TCSAFLUSH, &rtt);
}
- struct termios rtt;
- rtt = tt;
- cfmakeraw(&rtt);
- rtt.c_lflag &= ~ECHO;
- tcsetattr(0, TCSAFLUSH, &rtt);
-
// Fork dpkg
pid_t Child;
_config->Set("APT::Keep-Fds::",fd[1]);
@@ -723,13 +728,16 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// This is the child
if (Child == 0)
{
- setsid();
- ioctl(slave, TIOCSCTTY, 0);
- close(master);
- dup2(slave, 0);
- dup2(slave, 1);
- dup2(slave, 2);
- close(slave);
+ if(slave >= 0 && master >= 0)
+ {
+ setsid();
+ ioctl(slave, TIOCSCTTY, 0);
+ close(master);
+ dup2(slave, 0);
+ dup2(slave, 1);
+ dup2(slave, 2);
+ close(slave);
+ }
close(fd[0]); // close the read end of the pipe
if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0)
@@ -772,7 +780,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// the result of the waitpid call
int res;
- close(slave);
+ if(slave > 0)
+ close(slave);
// setups fds
fd_set rfds;
@@ -796,7 +805,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
FD_ZERO(&rfds);
FD_SET(0, &rfds);
FD_SET(_dpkgin, &rfds);
- FD_SET(master, &rfds);
+ if(master >= 0)
+ FD_SET(master, &rfds);
tv.tv_sec = 1;
tv.tv_usec = 0;
select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv);
@@ -805,9 +815,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
else if (select_ret == 0)
continue;
- if(FD_ISSET(master, &rfds))
+ if(master >= 0 && FD_ISSET(master, &rfds))
DoTerminalPty(master, term_out);
- if(FD_ISSET(0, &rfds))
+ if(master >= 0 && FD_ISSET(0, &rfds))
DoStdin(master);
if(FD_ISSET(_dpkgin, &rfds))
DoDpkgStatusFd(_dpkgin, OutStatusFd);
@@ -818,7 +828,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
signal(SIGQUIT,old_SIGQUIT);
signal(SIGINT,old_SIGINT);
- tcsetattr(0, TCSAFLUSH, &tt);
+ if(master >= 0 && slave >= 0)
+ tcsetattr(0, TCSAFLUSH, &tt);
// Check for an error code.
if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)