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

deletePath(): Return ENFILE instead of EBADF when out of file descriptors

Browse source 
Also remove an erroneous comment.
This commit is contained in:
Eelco Dolstra 2021-07-20 20:59:45 +02:00
parent c5fafca5a4
commit 140ccf1368
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libutil/util.cc
View file

@ -413,7 +413,7 @@ static void _deletePath(int parentfd, const Path & path, uint64_t & bytesFreed)
} }
int fd = openat(parentfd, path.c_str(), O_RDONLY); int fd = openat(parentfd, path.c_str(), O_RDONLY);
if (!fd) if (fd == -1)
throw SysError("opening directory '%1%'", path); throw SysError("opening directory '%1%'", path);
AutoCloseDir dir(fdopendir(fd)); AutoCloseDir dir(fdopendir(fd));
if (!dir) if (!dir)
@ -437,10 +437,7 @@ static void _deletePath(const Path & path, uint64_t & bytesFreed)
AutoCloseFD dirfd(open(dir.c_str(), O_RDONLY)); AutoCloseFD dirfd(open(dir.c_str(), O_RDONLY));
if (!dirfd) { if (!dirfd) {
// This really shouldn't fail silently, but it's left this way
// for backwards compatibility.
if (errno == ENOENT) return; if (errno == ENOENT) return;
throw SysError("opening directory '%1%'", path); throw SysError("opening directory '%1%'", path);
} }