diff options
| author | Lennart Poettering <lennart@poettering.net> | 2022-12-21 16:52:07 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2022-12-23 17:35:21 +0100 |
| commit | a67bacff34b3e4f3a6387742177536d6ea8773f7 (patch) | |
| tree | 9e23380f146c8dc20dcfd4d9b931f57600bbdd8b /src/tmpfiles | |
| parent | sysv-generator: port basename() → path_extract_filename() (diff) | |
| download | systemd-a67bacff34b3e4f3a6387742177536d6ea8773f7.tar.xz systemd-a67bacff34b3e4f3a6387742177536d6ea8773f7.zip | |
tmpfiles: port basename() → path_extract_filename()
Diffstat (limited to 'src/tmpfiles')
| -rw-r--r-- | src/tmpfiles/offline-passwd.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/tmpfiles/offline-passwd.c b/src/tmpfiles/offline-passwd.c index f7d3978c93..f712099b0b 100644 --- a/src/tmpfiles/offline-passwd.c +++ b/src/tmpfiles/offline-passwd.c @@ -9,8 +9,9 @@ DEFINE_PRIVATE_HASH_OPS_WITH_KEY_DESTRUCTOR(uid_gid_hash_ops, char, string_hash_func, string_compare_func, free); static int open_passwd_file(const char *root, const char *fname, FILE **ret_file) { - _cleanup_free_ char *p = NULL; + _cleanup_free_ char *p = NULL, *bn = NULL; _cleanup_close_ int fd = -EBADF; + int r; fd = chase_symlinks_and_open(fname, root, CHASE_PREFIX_ROOT, O_RDONLY|O_CLOEXEC, &p); if (fd < 0) @@ -22,7 +23,11 @@ static int open_passwd_file(const char *root, const char *fname, FILE **ret_file TAKE_FD(fd); - log_debug("Reading %s entries from %s...", basename(fname), p); + r = path_extract_filename(fname, &bn); + if (r < 0) + return r; + + log_debug("Reading %s entries from %s...", bn, p); *ret_file = f; return 0; |