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

tmpfile: make failure in path_extract_filename() non-critical

Browse Source
This commit is contained in:
Yu Watanabe
2023-01-09 10:57:50 +09:00
parent 8a555dcbf7
commit da8f9c4661
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tmpfiles/offline-passwd.c
+6 -6
View File
@@ -9,10 +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, *bn = NULL;
_cleanup_free_ char *p = NULL;
_cleanup_close_ int fd = -EBADF;
_cleanup_fclose_ FILE *f = NULL;
int r;
fd = chase_symlinks_and_open(fname, root, CHASE_PREFIX_ROOT, O_RDONLY|O_CLOEXEC, &p);
if (fd < 0)
@@ -24,11 +23,12 @@ static int open_passwd_file(const char *root, const char *fname, FILE **ret_file
TAKE_FD(fd);
r = path_extract_filename(fname, &bn);
if (r < 0)
return r;
if (DEBUG_LOGGING) {
_cleanup_free_ char *bn = NULL;
log_debug("Reading %s entries from %s...", bn, p);
(void) path_extract_filename(fname, &bn);
log_debug("Reading %s entries from %s...", strna(bn), p);
}
*ret_file = TAKE_PTR(f);
return 0;