shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-06 13:17:44 +03:00
Code

tmpfiles: port basename() → path_extract_filename()

Browse Source
This commit is contained in:
Lennart Poettering 2022-12-21 16:52:07 +01:00
parent 1d8a8a7dee
commit a67bacff34
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tmpfiles/offline-passwd.c
View File

@ -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;