alois31/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Tricky: child processes should not send data to the client since

Browse source 
that might mess up the protocol.  And besides, the socket file
  descriptor is probably closed.
This commit is contained in:
Eelco Dolstra 2006-12-05 18:21:16 +00:00
parent 4c1c37d0b6
commit 6f0d050324
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nix-worker/main.cc
View file

@ -29,6 +29,8 @@ static FdSource from(STDIN_FILENO);
static FdSink to(STDOUT_FILENO); static FdSink to(STDOUT_FILENO);
bool canSendStderr; bool canSendStderr;
pid_t myPid;
/* This function is called anytime we want to write something to /* This function is called anytime we want to write something to
@ -37,7 +39,11 @@ bool canSendStderr;
socket. */ socket. */
static void tunnelStderr(const unsigned char * buf, size_t count) static void tunnelStderr(const unsigned char * buf, size_t count)
{ {
if (canSendStderr) { /* Don't send the message to the client if we're a child of the
process handling the connection. Otherwise we could screw up
the protocol. It's up to the parent to redirect stderr and
send it to the client somehow (e.g., as in build.cc). */
if (canSendStderr && myPid == getpid()) {
try { try {
writeInt(STDERR_NEXT, to); writeInt(STDERR_NEXT, to);
writeString(string((char *) buf, count), to); writeString(string((char *) buf, count), to);
@ -47,7 +53,8 @@ static void tunnelStderr(const unsigned char * buf, size_t count)
canSendStderr = false; canSendStderr = false;
throw; throw;
} }
} } else
writeFull(STDERR_FILENO, buf, count);
} }
@ -344,6 +351,7 @@ static void performOp(Source & from, Sink & to, unsigned int op)
static void processConnection() static void processConnection()
{ {
canSendStderr = false; canSendStderr = false;
myPid = getpid();
writeToStderr = tunnelStderr; writeToStderr = tunnelStderr;
/* Allow us to receive SIGPOLL for events on the client socket. */ /* Allow us to receive SIGPOLL for events on the client socket. */