shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

chase-symlinks: Return "." as path from chase_symlinks_at() instead of NULL

Browse Source
This commit is contained in:
Daan De Meyer 2023-02-23 14:24:56 +01:00
parent 577efd82f2
commit 7bf4057d79
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/basic/chase-symlinks.c
View File

@ -215,7 +215,7 @@ int chase_symlinks_at(
return -errno;
if (flags & CHASE_TRAIL_SLASH)
append_trail_slash = endswith(buffer, "/") || endswith(buffer, "/.");
append_trail_slash = ENDSWITH_SET(buffer, "/", "/.");
for (todo = buffer;;) {
_cleanup_free_ char *first = NULL;
@ -380,8 +380,15 @@ int chase_symlinks_at(
close_and_replace(fd, child);
}
if (ret_path)
if (ret_path) {
if (!done) {
done = strdup(append_trail_slash ? "./" : ".");
if (!done)
return -ENOMEM;
}
*ret_path = TAKE_PTR(done);
}
if (ret_fd) {
/* Return the O_PATH fd we currently are looking to the caller. It can translate it to a
@ -400,6 +407,12 @@ chased_one:
if (ret_path) {
const char *e;
if (!done) {
done = strdup(append_trail_slash ? "./" : ".");
if (!done)
return -ENOMEM;
}
/* todo may contain slashes at the beginning. */
r = path_find_first_component(&todo, /* accept_dot_dot= */ true, &e);
if (r < 0)
@ -489,6 +502,12 @@ int chase_symlinks(
if (!q)
return -ENOMEM;
path_simplify(q);
if (FLAGS_SET(flags, CHASE_TRAIL_SLASH) && ENDSWITH_SET(path, "/", "/."))
if (!strextend(&q, "/"))
return -ENOMEM;
*ret_path = TAKE_PTR(q);
}