*: convert amenable fdopendir() calls to take_fdopendir()

Some fdopendir() calls remain where safe_close() is manually
performed, those could be simplified as well by converting to
use the _cleanup_close_ machinery, but makes things less trivial
to review so left for a future cleanup.
This commit is contained in:
Vito Caputo
2020-03-31 06:48:03 -07:00
parent f61457b0fe
commit 9f81a592c1
3 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -8,6 +8,7 @@
#include "acl-util.h"
#include "dirent-util.h"
#include "fd-util.h"
#include "fileio.h"
#include "fs-util.h"
#include "missing_magic.h"
#include "nspawn-def.h"
@@ -335,12 +336,11 @@ static int recurse_fd(int fd, bool donate_fd, const struct stat *st, uid_t shift
donate_fd = true;
}
d = fdopendir(fd);
d = take_fdopendir(&fd);
if (!d) {
r = -errno;
goto finish;
}
fd = -1;
FOREACH_DIRENT_ALL(de, d, r = -errno; goto finish) {
struct stat fst;