diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-04-20 18:42:36 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-04-25 14:00:38 +0200 |
| commit | c8ab89e569e156f968b1797aa0abce41f924afb6 (patch) | |
| tree | a32db60c52f25d9f1fd982432cbce0f2b4717728 /src/basic | |
| parent | 9203abf79f1d05fdef9b039e7addf9fc5a27752d (diff) | |
| download | systemd-c8ab89e569e156f968b1797aa0abce41f924afb6.tar.gz | |
mountpoint-util: make path_get_mnt_id_at() work with a NULL path
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/mountpoint-util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c index 7237930a76..3584f31787 100644 --- a/src/basic/mountpoint-util.c +++ b/src/basic/mountpoint-util.c @@ -63,7 +63,7 @@ int name_to_handle_at_loop( h->handle_bytes = n; - if (name_to_handle_at(fd, path, h, &mnt_id, flags) >= 0) { + if (name_to_handle_at(fd, strempty(path), h, &mnt_id, flags) >= 0) { if (ret_handle) *ret_handle = TAKE_PTR(h); @@ -362,11 +362,10 @@ int path_get_mnt_id_at(int dir_fd, const char *path, int *ret) { int r; assert(dir_fd >= 0 || dir_fd == AT_FDCWD); - assert(path); assert(ret); if (statx(dir_fd, - path, + strempty(path), (isempty(path) ? AT_EMPTY_PATH : AT_SYMLINK_NOFOLLOW) | AT_NO_AUTOMOUNT | /* don't trigger automounts, mnt_id is a local concept */ AT_STATX_DONT_SYNC, /* don't go to the network, mnt_id is a local concept */ |