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 | 26 |
1 files changed, 12 insertions, 14 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 aa2b4cbcf1..34f7f5fb74 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 | |||
@@ -15,17 +15,19 @@ Upstream-Status: Inappropriate [musl specific] | |||
15 | 15 | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
17 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 17 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
18 | [rebased for systemd 243] | ||
19 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | ||
18 | --- | 20 | --- |
19 | src/basic/glob-util.c | 13 ++++++++++++- | 21 | src/basic/glob-util.c | 12 ++++++++++++ |
20 | src/test/test-glob-util.c | 16 ++++++++++++++++ | 22 | src/test/test-glob-util.c | 16 ++++++++++++++++ |
21 | src/tmpfiles/tmpfiles.c | 10 ++++++++++ | 23 | src/tmpfiles/tmpfiles.c | 10 ++++++++++ |
22 | 3 files changed, 38 insertions(+), 1 deletion(-) | 24 | 3 files changed, 38 insertions(+) |
23 | 25 | ||
24 | diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c | 26 | diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c |
25 | index 32c53f8..ae358d9 100644 | 27 | index b335af8d97..2cdfc11f16 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 | @@ -13,6 +13,12 @@ | 30 | @@ -14,6 +14,12 @@ |
29 | #include "path-util.h" | 31 | #include "path-util.h" |
30 | #include "strv.h" | 32 | #include "strv.h" |
31 | 33 | ||
@@ -38,7 +40,7 @@ index 32c53f8..ae358d9 100644 | |||
38 | static void closedir_wrapper(void* v) { | 40 | static void closedir_wrapper(void* v) { |
39 | (void) closedir(v); | 41 | (void) closedir(v); |
40 | } | 42 | } |
41 | @@ -20,6 +26,7 @@ static void closedir_wrapper(void* v) { | 43 | @@ -21,6 +27,7 @@ static void closedir_wrapper(void* v) { |
42 | int safe_glob(const char *path, int flags, glob_t *pglob) { | 44 | int safe_glob(const char *path, int flags, glob_t *pglob) { |
43 | int k; | 45 | int k; |
44 | 46 | ||
@@ -46,7 +48,7 @@ index 32c53f8..ae358d9 100644 | |||
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 | @@ -33,10 +40,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { | 51 | @@ -34,9 +41,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; |
@@ -55,7 +57,6 @@ index 32c53f8..ae358d9 100644 | |||
55 | errno = 0; | 57 | errno = 0; |
56 | +#ifdef GLOB_ALTDIRFUNC | 58 | +#ifdef GLOB_ALTDIRFUNC |
57 | k = glob(path, flags | GLOB_ALTDIRFUNC, NULL, pglob); | 59 | k = glob(path, flags | GLOB_ALTDIRFUNC, NULL, pglob); |
58 | - | ||
59 | +#else | 60 | +#else |
60 | + k = glob(path, flags, NULL, pglob); | 61 | + k = glob(path, flags, NULL, pglob); |
61 | +#endif | 62 | +#endif |
@@ -63,7 +64,7 @@ index 32c53f8..ae358d9 100644 | |||
63 | return -ENOENT; | 64 | return -ENOENT; |
64 | if (k == GLOB_NOSPACE) | 65 | if (k == GLOB_NOSPACE) |
65 | diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c | 66 | diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c |
66 | index b4f4144..f0d474e 100644 | 67 | index b4f41445fe..f0d474ed14 100644 |
67 | --- a/src/test/test-glob-util.c | 68 | --- a/src/test/test-glob-util.c |
68 | +++ b/src/test/test-glob-util.c | 69 | +++ b/src/test/test-glob-util.c |
69 | @@ -13,6 +13,12 @@ | 70 | @@ -13,6 +13,12 @@ |
@@ -114,7 +115,7 @@ index b4f4144..f0d474e 100644 | |||
114 | 115 | ||
115 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); | 116 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); |
116 | diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c | 117 | diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c |
117 | index d9d1cc1..477d1e3 100644 | 118 | index 3c30612af1..14bc428085 100644 |
118 | --- a/src/tmpfiles/tmpfiles.c | 119 | --- a/src/tmpfiles/tmpfiles.c |
119 | +++ b/src/tmpfiles/tmpfiles.c | 120 | +++ b/src/tmpfiles/tmpfiles.c |
120 | @@ -63,6 +63,12 @@ | 121 | @@ -63,6 +63,12 @@ |
@@ -130,7 +131,7 @@ index d9d1cc1..477d1e3 100644 | |||
130 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates | 131 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates |
131 | * them in the file system. This is intended to be used to create | 132 | * them in the file system. This is intended to be used to create |
132 | * properly owned directories beneath /tmp, /var/tmp, /run, which are | 133 | * properly owned directories beneath /tmp, /var/tmp, /run, which are |
133 | @@ -1839,7 +1845,9 @@ finish: | 134 | @@ -1853,7 +1859,9 @@ finish: |
134 | 135 | ||
135 | static int glob_item(Item *i, action_t action) { | 136 | static int glob_item(Item *i, action_t action) { |
136 | _cleanup_globfree_ glob_t g = { | 137 | _cleanup_globfree_ glob_t g = { |
@@ -140,7 +141,7 @@ index d9d1cc1..477d1e3 100644 | |||
140 | }; | 141 | }; |
141 | int r = 0, k; | 142 | int r = 0, k; |
142 | char **fn; | 143 | char **fn; |
143 | @@ -1859,7 +1867,9 @@ static int glob_item(Item *i, action_t action) { | 144 | @@ -1873,7 +1881,9 @@ static int glob_item(Item *i, action_t action) { |
144 | 145 | ||
145 | static int glob_item_recursively(Item *i, fdaction_t action) { | 146 | static int glob_item_recursively(Item *i, fdaction_t action) { |
146 | _cleanup_globfree_ glob_t g = { | 147 | _cleanup_globfree_ glob_t g = { |
@@ -150,6 +151,3 @@ index d9d1cc1..477d1e3 100644 | |||
150 | }; | 151 | }; |
151 | int r = 0, k; | 152 | int r = 0, k; |
152 | char **fn; | 153 | char **fn; |
153 | -- | ||
154 | 2.11.0 | ||
155 | |||