diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch index 4a60ee32ef..28846935e0 100644 --- a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +++ b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bca73ff2fbff2dc311040a87a4f536f89af07ad6 Mon Sep 17 00:00:00 2001 | 1 | From e2d70a1735fc6b9d3c079814831ab0b1b2a9d1e0 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 14:56:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:56:21 +0800 |
4 | Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined | 4 | Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined |
@@ -23,6 +23,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
23 | src/tmpfiles/tmpfiles.c | 10 ++++++++++ | 23 | src/tmpfiles/tmpfiles.c | 10 ++++++++++ |
24 | 3 files changed, 38 insertions(+) | 24 | 3 files changed, 38 insertions(+) |
25 | 25 | ||
26 | diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c | ||
27 | index e026b29478..815e56ef68 100644 | ||
26 | --- a/src/basic/glob-util.c | 28 | --- a/src/basic/glob-util.c |
27 | +++ b/src/basic/glob-util.c | 29 | +++ b/src/basic/glob-util.c |
28 | @@ -12,6 +12,12 @@ | 30 | @@ -12,6 +12,12 @@ |
@@ -46,7 +48,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
46 | /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ | 48 | /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ |
47 | assert(!(flags & GLOB_ALTDIRFUNC)); | 49 | assert(!(flags & GLOB_ALTDIRFUNC)); |
48 | 50 | ||
49 | @@ -32,9 +39,14 @@ int safe_glob(const char *path, int flag | 51 | @@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { |
50 | pglob->gl_lstat = lstat; | 52 | pglob->gl_lstat = lstat; |
51 | if (!pglob->gl_stat) | 53 | if (!pglob->gl_stat) |
52 | pglob->gl_stat = stat; | 54 | pglob->gl_stat = stat; |
@@ -61,6 +63,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
61 | if (k == GLOB_NOMATCH) | 63 | if (k == GLOB_NOMATCH) |
62 | return -ENOENT; | 64 | return -ENOENT; |
63 | if (k == GLOB_NOSPACE) | 65 | if (k == GLOB_NOSPACE) |
66 | diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c | ||
67 | index 50b4924679..09c0a20aee 100644 | ||
64 | --- a/src/test/test-glob-util.c | 68 | --- a/src/test/test-glob-util.c |
65 | +++ b/src/test/test-glob-util.c | 69 | +++ b/src/test/test-glob-util.c |
66 | @@ -12,6 +12,12 @@ | 70 | @@ -12,6 +12,12 @@ |
@@ -110,6 +114,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
110 | assert_se(r == GLOB_NOMATCH); | 114 | assert_se(r == GLOB_NOMATCH); |
111 | 115 | ||
112 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); | 116 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); |
117 | diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c | ||
118 | index 7e85c50634..145c48a685 100644 | ||
113 | --- a/src/tmpfiles/tmpfiles.c | 119 | --- a/src/tmpfiles/tmpfiles.c |
114 | +++ b/src/tmpfiles/tmpfiles.c | 120 | +++ b/src/tmpfiles/tmpfiles.c |
115 | @@ -66,6 +66,12 @@ | 121 | @@ -66,6 +66,12 @@ |
@@ -135,7 +141,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
135 | }; | 141 | }; |
136 | int r = 0, k; | 142 | int r = 0, k; |
137 | char **fn; | 143 | char **fn; |
138 | @@ -2010,7 +2018,9 @@ static int glob_item(Item *i, action_t a | 144 | @@ -2010,7 +2018,9 @@ static int glob_item(Item *i, action_t action) { |
139 | 145 | ||
140 | static int glob_item_recursively(Item *i, fdaction_t action) { | 146 | static int glob_item_recursively(Item *i, fdaction_t action) { |
141 | _cleanup_globfree_ glob_t g = { | 147 | _cleanup_globfree_ glob_t g = { |