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

parse-helpers: Add PATH_KEEP_TRAILING_SLASH

Browse Source 
(cherry picked from commit ce60b3a40a)
This commit is contained in:
Daan De Meyer 2023-08-17 13:11:11 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent ff45789ea3
commit 979b2abbdd
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/parse-helpers.c
View File

@ -40,7 +40,7 @@ int path_simplify_and_warn(
lvalue, fatal ? "" : ", ignoring", path);
}
path_simplify(path);
path_simplify_full(path, flag & PATH_KEEP_TRAILING_SLASH ? PATH_SIMPLIFY_KEEP_TRAILING_SLASH : 0);
if (!path_is_valid(path))
return log_syntax(unit, LOG_ERR, filename, line, SYNTHETIC_ERRNO(EINVAL),

7
src/shared/parse-helpers.h
View File

@ -4,9 +4,10 @@
#include <stdint.h>
enum {
PATH_CHECK_FATAL = 1 << 0, /* If not set, then error message is appended with 'ignoring'. */
PATH_CHECK_ABSOLUTE = 1 << 1,
PATH_CHECK_RELATIVE = 1 << 2,
PATH_CHECK_FATAL = 1 << 0, /* If not set, then error message is appended with 'ignoring'. */
PATH_CHECK_ABSOLUTE = 1 << 1,
PATH_CHECK_RELATIVE = 1 << 2,
PATH_KEEP_TRAILING_SLASH = 1 << 3,
};
int path_simplify_and_warn(