picnoir/Nix
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

connect(): Propagate errno from the child process

Browse source 
This is necessary on macOS since addTempRoot() relies on errno.
This commit is contained in:
Eelco Dolstra 2024-01-16 15:23:46 +01:00
parent 0b1d93d2ba
commit d005bade7f
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/libutil/unix-domain-socket.cc
View file

@ -1,6 +1,7 @@
#include "file-system.hh" #include "file-system.hh"
#include "processes.hh" #include "processes.hh"
#include "unix-domain-socket.hh" #include "unix-domain-socket.hh"
#include "util.hh"
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
@ -75,21 +76,35 @@ void connect(int fd, const std::string & path)
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
if (path.size() + 1 >= sizeof(addr.sun_path)) { if (path.size() + 1 >= sizeof(addr.sun_path)) {
Pipe pipe;
pipe.create();
Pid pid = startProcess([&]() { Pid pid = startProcess([&]() {
Path dir = dirOf(path); try {
if (chdir(dir.c_str()) == -1) pipe.readSide.close();
throw SysError("chdir to '%s' failed", dir); Path dir = dirOf(path);
std::string base(baseNameOf(path)); if (chdir(dir.c_str()) == -1)
if (base.size() + 1 >= sizeof(addr.sun_path)) throw SysError("chdir to '%s' failed", dir);
throw Error("socket path '%s' is too long", base); std::string base(baseNameOf(path));
memcpy(addr.sun_path, base.c_str(), base.size() + 1); if (base.size() + 1 >= sizeof(addr.sun_path))
if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) throw Error("socket path '%s' is too long", base);
throw SysError("cannot connect to socket at '%s'", path); memcpy(addr.sun_path, base.c_str(), base.size() + 1);
_exit(0); if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
throw SysError("cannot connect to socket at '%s'", path);
writeFull(pipe.writeSide.get(), "0\n");
} catch (SysError & e) {
writeFull(pipe.writeSide.get(), fmt("%d\n", e.errNo));
} catch (...) {
writeFull(pipe.writeSide.get(), "-1\n");
}
}); });
int status = pid.wait(); pipe.writeSide.close();
if (status != 0) auto errNo = string2Int<int>(chomp(drainFD(pipe.readSide.get())));
if (!errNo || *errNo == -1)
throw Error("cannot connect to socket at '%s'", path); throw Error("cannot connect to socket at '%s'", path);
else if (*errNo > 0) {
errno = *errNo;
throw SysError("cannot connect to socket at '%s'", path);
}
} else { } else {
memcpy(addr.sun_path, path.c_str(), path.size() + 1); memcpy(addr.sun_path, path.c_str(), path.size() + 1);
if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)