shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

chase: prefix with the root directory only when it is not "/"

Browse Source
This commit is contained in:
Yu Watanabe 2023-04-17 15:28:42 +09:00
parent 237bf933de
commit 9a0dcf03fa
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/basic/chase.c
View File

@ -551,19 +551,27 @@ int chase(const char *path, const char *root, ChaseFlags flags, char **ret_path,
if (ret_path) {
if (!FLAGS_SET(flags, CHASE_EXTRACT_FILENAME)) {
_cleanup_free_ char *q = NULL;
q = path_join(root, p);
if (!q)
return -ENOMEM;
/* When "root" points to the root directory, the result of chaseat() is always
* absolute, hence it is not necessary to prefix with the root. When "root" points to
* a non-root directory, the result path is always normalized and relative, hence
* we can simply call path_join() and not necessary to call path_simplify().
* Note that the result of chaseat() may start with "." (more specifically, it may be
* "." or "./"), and we need to drop "." in that case. */
path_simplify(q);
if (empty_or_root(root))
assert(path_is_absolute(p));
else {
char *q;
if (FLAGS_SET(flags, CHASE_TRAIL_SLASH) && ENDSWITH_SET(path, "/", "/."))
if (!strextend(&q, "/"))
assert(!path_is_absolute(p));
q = path_join(root, p + (*p == '.'));
if (!q)
return -ENOMEM;
free_and_replace(p, q);
free_and_replace(p, q);
}
}
*ret_path = TAKE_PTR(p);