SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

basic/fileio: minor modernization for xopendirat()

Browse Source
This commit is contained in:
Mike Yuan
2024-12-11 19:07:20 +01:00
parent 3ca09aa4dd
commit c0cf1c5826
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/fileio.c
+9 -7
View File
@@ -957,19 +957,21 @@ int get_proc_field(const char *filename, const char *pattern, const char *termin
return 0;
}
DIR *xopendirat(int fd, const char *name, int flags) {
_cleanup_close_ int nfd = -EBADF;
DIR* xopendirat(int dir_fd, const char *name, int flags) {
_cleanup_close_ int fd = -EBADF;
assert(!(flags & O_CREAT));
assert(dir_fd >= 0 || dir_fd == AT_FDCWD);
assert(name);
assert(!(flags & (O_CREAT|O_TMPFILE)));
if (fd == AT_FDCWD && flags == 0)
if (dir_fd == AT_FDCWD && flags == 0)
return opendir(name);
nfd = openat(fd, name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|flags, 0);
if (nfd < 0)
fd = openat(dir_fd, name, O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|flags);
if (fd < 0)
return NULL;
return take_fdopendir(&nfd);
return take_fdopendir(&fd);
}
int fopen_mode_to_flags(const char *mode) {