wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 17:51:15 +02:00
Code Activity

Silence some warnings on GCC 4.9

Browse source
This commit is contained in:
Eelco Dolstra 2014-12-12 17:14:28 +01:00
parent 46f3eb6fdd
commit b77037b8fd
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -698,7 +698,8 @@ static PeerInfo getPeerInfo(int remote)
static void daemonLoop(char * * argv)
{
chdir("/");
if (chdir("/") == -1)
throw SysError("cannot change current directory");
/* Get rid of children automatically; don't let them become
zombies. */
@ -728,7 +729,8 @@ static void daemonLoop(char * * argv)
/* Urgh, sockaddr_un allows path names of only 108 characters.
So chdir to the socket directory so that we can pass a
relative path name. */
chdir(dirOf(socketPath).c_str());
if (chdir(dirOf(socketPath).c_str()) == -1)
throw SysError("cannot change current directory");
Path socketPathRel = "./" + baseNameOf(socketPath);
struct sockaddr_un addr;
@ -748,7 +750,8 @@ static void daemonLoop(char * * argv)
if (res == -1)
throw SysError(format("cannot bind to socket ‘%1%’") % socketPath);
chdir("/"); /* back to the root */
if (chdir("/") == -1) /* back to the root */
throw SysError("cannot change current directory");
if (listen(fdSocket, 5) == -1)
throw SysError(format("cannot listen on socket ‘%1%’") % socketPath);