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

dirent-util: Expose dirent_ensure_type()

Browse Source
This commit is contained in:
Daan De Meyer
2022-11-24 13:18:00 +01:00
parent ca4249847b
commit 06da125ea1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/dirent-util.c
+4 -4
View File
@@ -8,11 +8,11 @@
#include "stat-util.h"
#include "string-util.h"
static int dirent_ensure_type(DIR *d, struct dirent *de) {
int dirent_ensure_type(int dir_fd, struct dirent *de) {
STRUCT_STATX_DEFINE(sx);
int r;
assert(d);
assert(dir_fd >= 0);
assert(de);
if (de->d_type != DT_UNKNOWN)
@@ -24,7 +24,7 @@ static int dirent_ensure_type(DIR *d, struct dirent *de) {
}
/* Let's ask only for the type, nothing else. */
r = statx_fallback(dirfd(d), de->d_name, AT_SYMLINK_NOFOLLOW|AT_NO_AUTOMOUNT, STATX_TYPE, &sx);
r = statx_fallback(dir_fd, de->d_name, AT_SYMLINK_NOFOLLOW|AT_NO_AUTOMOUNT, STATX_TYPE, &sx);
if (r < 0)
return r;
@@ -80,7 +80,7 @@ struct dirent *readdir_ensure_type(DIR *d) {
if (!de)
return NULL;
r = dirent_ensure_type(d, de);
r = dirent_ensure_type(dirfd(d), de);
if (r >= 0)
return de;
if (r != -ENOENT) {
src/basic/dirent-util.h
+1
View File
@@ -10,6 +10,7 @@
bool dirent_is_file(const struct dirent *de) _pure_;
bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) _pure_;
int dirent_ensure_type(int dir_fd, struct dirent *de);
struct dirent *readdir_ensure_type(DIR *d);
struct dirent *readdir_no_dot(DIR *dirp);