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

Merge pull request #28869 from DaanDeMeyer/repart-trailing

Browse Source 
repart: Make sure we keep trailing slashes in ExcludeFiles=
This commit is contained in:
Daan De Meyer
2023-08-17 14:55:03 +02:00
committed by GitHub
parent 13f008272a d10eccbd77
commit be7d808c1c
6 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/path-util.c
+7 -2
View File
@@ -344,8 +344,8 @@ char **path_strv_resolve_uniq(char **l, const char *root) {
return strv_uniq(l);
}
char *path_simplify(char *path) {
bool add_slash = false;
char *path_simplify_full(char *path, PathSimplifyFlags flags) {
bool add_slash = false, keep_trailing_slash;
char *f = ASSERT_PTR(path);
int r;
@@ -359,6 +359,8 @@ char *path_simplify(char *path) {
if (isempty(path))
return path;
keep_trailing_slash = FLAGS_SET(flags, PATH_SIMPLIFY_KEEP_TRAILING_SLASH) && endswith(path, "/");
if (path_is_absolute(path))
f++;
@@ -388,6 +390,9 @@ char *path_simplify(char *path) {
if (f == path)
*f++ = '.';
if (*(f-1) != '/' && keep_trailing_slash)
*f++ = '/';
*f = '\0';
return path;
}
src/basic/path-util.h
+8 -1
View File
@@ -76,7 +76,14 @@ char* path_extend_internal(char **x, ...);
#define path_extend(x, ...) path_extend_internal(x, __VA_ARGS__, POINTER_MAX)
#define path_join(...) path_extend_internal(NULL, __VA_ARGS__, POINTER_MAX)
char* path_simplify(char *path);
typedef enum PathSimplifyFlags {
PATH_SIMPLIFY_KEEP_TRAILING_SLASH = 1 << 0,
} PathSimplifyFlags;
char *path_simplify_full(char *path, PathSimplifyFlags flags);
static inline char* path_simplify(char *path) {
return path_simplify_full(path, 0);
}
static inline bool path_equal_ptr(const char *a, const char *b) {
return !!a == !!b && (!a || path_equal(a, b));
src/partition/repart.c
+1 -1
View File
@@ -1477,7 +1477,7 @@ static int config_parse_exclude_files(
return 0;
}
r = path_simplify_and_warn(resolved, PATH_CHECK_ABSOLUTE, unit, filename, line, lvalue);
r = path_simplify_and_warn(resolved, PATH_CHECK_ABSOLUTE|PATH_KEEP_TRAILING_SLASH, unit, filename, line, lvalue);
if (r < 0)
return 0;
src/shared/parse-helpers.c
+1 -1
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),
src/shared/parse-helpers.h
+4 -3
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(
src/test/test-path-util.c
+23 -20
View File
@@ -48,11 +48,11 @@ TEST(path) {
assert_se(!path_equal_ptr(NULL, "/a"));
}
static void test_path_simplify_one(const char *in, const char *out) {
static void test_path_simplify_one(const char *in, const char *out, PathSimplifyFlags flags) {
char *p;
p = strdupa_safe(in);
path_simplify(p);
path_simplify_full(p, flags);
log_debug("/* test_path_simplify(%s) → %s (expected: %s) */", in, p, out);
assert_se(streq(p, out));
}
@@ -61,34 +61,37 @@ TEST(path_simplify) {
_cleanup_free_ char *hoge = NULL, *hoge_out = NULL;
char foo[NAME_MAX * 2];
test_path_simplify_one("", "");
test_path_simplify_one("aaa/bbb////ccc", "aaa/bbb/ccc");
test_path_simplify_one("//aaa/.////ccc", "/aaa/ccc");
test_path_simplify_one("///", "/");
test_path_simplify_one("///.//", "/");
test_path_simplify_one("///.//.///", "/");
test_path_simplify_one("////.././///../.", "/../..");
test_path_simplify_one(".", ".");
test_path_simplify_one("./", ".");
test_path_simplify_one(".///.//./.", ".");
test_path_simplify_one(".///.//././/", ".");
test_path_simplify_one("", "", 0);
test_path_simplify_one("aaa/bbb////ccc", "aaa/bbb/ccc", 0);
test_path_simplify_one("//aaa/.////ccc", "/aaa/ccc", 0);
test_path_simplify_one("///", "/", 0);
test_path_simplify_one("///", "/", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("///.//", "/", 0);
test_path_simplify_one("///.//.///", "/", 0);
test_path_simplify_one("////.././///../.", "/../..", 0);
test_path_simplify_one(".", ".", 0);
test_path_simplify_one("./", ".", 0);
test_path_simplify_one("./", "./", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one(".///.//./.", ".", 0);
test_path_simplify_one(".///.//././/", ".", 0);
test_path_simplify_one("//./aaa///.//./.bbb/..///c.//d.dd///..eeee/.",
"/aaa/.bbb/../c./d.dd/..eeee");
"/aaa/.bbb/../c./d.dd/..eeee", 0);
test_path_simplify_one("//./aaa///.//./.bbb/..///c.//d.dd///..eeee/..",
"/aaa/.bbb/../c./d.dd/..eeee/..");
"/aaa/.bbb/../c./d.dd/..eeee/..", 0);
test_path_simplify_one(".//./aaa///.//./.bbb/..///c.//d.dd///..eeee/..",
"aaa/.bbb/../c./d.dd/..eeee/..");
"aaa/.bbb/../c./d.dd/..eeee/..", 0);
test_path_simplify_one("..//./aaa///.//./.bbb/..///c.//d.dd///..eeee/..",
"../aaa/.bbb/../c./d.dd/..eeee/..");
"../aaa/.bbb/../c./d.dd/..eeee/..", 0);
test_path_simplify_one("abc///", "abc/", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
memset(foo, 'a', sizeof(foo) -1);
char_array_0(foo);
test_path_simplify_one(foo, foo);
test_path_simplify_one(foo, foo, 0);
hoge = strjoin("/", foo);
assert_se(hoge);
test_path_simplify_one(hoge, hoge);
test_path_simplify_one(hoge, hoge, 0);
hoge = mfree(hoge);
hoge = strjoin("a////.//././//./b///././/./c/////././//./", foo, "//.//////d/e/.//f/");
@@ -97,7 +100,7 @@ TEST(path_simplify) {
hoge_out = strjoin("a/b/c/", foo, "//.//////d/e/.//f/");
assert_se(hoge_out);
test_path_simplify_one(hoge, hoge_out);
test_path_simplify_one(hoge, hoge_out, 0);
}
static void test_path_compare_one(const char *a, const char *b, int expected) {