From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 17 Aug 2023 11:11:11 +0000 (+0200)
Subject: parse-helpers: Add PATH_KEEP_TRAILING_SLASH
X-Git-Tag: v255-rc1~699^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce60b3a40a89bb5d116003343c56c55a0da9f8fb;p=thirdparty%2Fsystemd.git

parse-helpers: Add PATH_KEEP_TRAILING_SLASH
---

diff --git a/src/shared/parse-helpers.c b/src/shared/parse-helpers.c
index f48baf7146e..9664b9c773b 100644
--- a/src/shared/parse-helpers.c
+++ b/src/shared/parse-helpers.c
@@ -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),
diff --git a/src/shared/parse-helpers.h b/src/shared/parse-helpers.h
index 38a47e85c33..3e4ad3c0a1d 100644
--- a/src/shared/parse-helpers.h
+++ b/src/shared/parse-helpers.h
@@ -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(