]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tmpfiles: port basename() → path_extract_filename()
authorLennart Poettering <lennart@poettering.net>
Wed, 21 Dec 2022 15:52:07 +0000 (16:52 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 23 Dec 2022 16:35:21 +0000 (17:35 +0100)
src/tmpfiles/offline-passwd.c

index f7d3978c935099eef9ee7258e9021aff85b67dfd..f712099b0b6d3c035e54fd7f4fb62df4be281115 100644 (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;