wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00
Code Activity

Merge pull request #10905 from obsidiansystems/platform-namespace

Browse source 
Put some file descriptor functions in unix and windows namespaces
This commit is contained in:
John Ericson 2024-06-14 08:45:31 -04:00 • committed by GitHub
commit 2f5fdab06c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libutil/unix/file-descriptor.cc
View file

@ -110,8 +110,8 @@ void Pipe::create()
if (pipe2(fds, O_CLOEXEC) != 0) throw SysError("creating pipe");
#else
if (pipe(fds) != 0) throw SysError("creating pipe");
closeOnExec(fds[0]);
closeOnExec(fds[1]);
unix::closeOnExec(fds[0]);
unix::closeOnExec(fds[1]);
#endif
readSide = fds[0];
writeSide = fds[1];
@ -120,7 +120,7 @@ void Pipe::create()
//////////////////////////////////////////////////////////////////////
void closeMostFDs(const std::set<int> & exceptions)
void unix::closeMostFDs(const std::set<int> & exceptions)
{
#if __linux__
try {
@ -148,7 +148,7 @@ void closeMostFDs(const std::set<int> & exceptions)
}
void closeOnExec(int fd)
void unix::closeOnExec(int fd)
{
int prev;
if ((prev = fcntl(fd, F_GETFD, 0)) == -1 ||