lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge branch 'fix/errno-sighandler' of git://github.com/dtzWill/nix

Browse source
This commit is contained in:
Shea Levy 2018-03-14 23:45:35 -04:00
parent e2088febf3 d98755b0c2
commit d25d9f7cec
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/nix-daemon/nix-daemon.cc
View file

@ -816,8 +816,11 @@ static void processConnection(bool trusted)
static void sigChldHandler(int sigNo) static void sigChldHandler(int sigNo)
{ {
// Ensure we don't modify errno of whatever we've interrupted
auto saved_errno = errno;
/* Reap all dead children. */ /* Reap all dead children. */
while (waitpid(-1, 0, WNOHANG) > 0) ; while (waitpid(-1, 0, WNOHANG) > 0) ;
errno = saved_errno;
} }