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 | 55 |
1 files changed, 28 insertions, 27 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 765e4767fd..aa2b4cbcf1 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 | |||
@@ -16,28 +16,29 @@ Upstream-Status: Inappropriate [musl specific] | |||
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 | --- | 18 | --- |
19 | src/basic/glob-util.c | 12 +++++++++++- | 19 | src/basic/glob-util.c | 13 ++++++++++++- |
20 | src/test/test-glob-util.c | 17 +++++++++++++++-- | 20 | src/test/test-glob-util.c | 16 ++++++++++++++++ |
21 | src/tmpfiles/tmpfiles.c | 9 +++++++++ | 21 | src/tmpfiles/tmpfiles.c | 10 ++++++++++ |
22 | 3 files changed, 35 insertions(+), 3 deletions(-) | 22 | 3 files changed, 38 insertions(+), 1 deletion(-) |
23 | 23 | ||
24 | diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c | 24 | diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c |
25 | index 9fac676..962d8b9 100644 | 25 | index 32c53f8..ae358d9 100644 |
26 | --- a/src/basic/glob-util.c | 26 | --- a/src/basic/glob-util.c |
27 | +++ b/src/basic/glob-util.c | 27 | +++ b/src/basic/glob-util.c |
28 | @@ -10,6 +10,11 @@ | 28 | @@ -13,6 +13,12 @@ |
29 | #include "macro.h" | ||
30 | #include "path-util.h" | 29 | #include "path-util.h" |
31 | #include "strv.h" | 30 | #include "strv.h" |
31 | |||
32 | +/* Don't fail if the standard library | 32 | +/* Don't fail if the standard library |
33 | + * doesn't provide brace expansion */ | 33 | + * doesn't provide brace expansion */ |
34 | +#ifndef GLOB_BRACE | 34 | +#ifndef GLOB_BRACE |
35 | +#define GLOB_BRACE 0 | 35 | +#define GLOB_BRACE 0 |
36 | +#endif | 36 | +#endif |
37 | 37 | + | |
38 | static void closedir_wrapper(void* v) { | 38 | static void closedir_wrapper(void* v) { |
39 | (void) closedir(v); | 39 | (void) closedir(v); |
40 | @@ -18,6 +23,7 @@ static void closedir_wrapper(void* v) { | 40 | } |
41 | @@ -20,6 +26,7 @@ static void closedir_wrapper(void* v) { | ||
41 | int safe_glob(const char *path, int flags, glob_t *pglob) { | 42 | int safe_glob(const char *path, int flags, glob_t *pglob) { |
42 | int k; | 43 | int k; |
43 | 44 | ||
@@ -45,7 +46,7 @@ index 9fac676..962d8b9 100644 | |||
45 | /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ | 46 | /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ |
46 | assert(!(flags & GLOB_ALTDIRFUNC)); | 47 | assert(!(flags & GLOB_ALTDIRFUNC)); |
47 | 48 | ||
48 | @@ -31,10 +37,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { | 49 | @@ -33,10 +40,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { |
49 | pglob->gl_lstat = lstat; | 50 | pglob->gl_lstat = lstat; |
50 | if (!pglob->gl_stat) | 51 | if (!pglob->gl_stat) |
51 | pglob->gl_stat = stat; | 52 | pglob->gl_stat = stat; |
@@ -62,26 +63,25 @@ index 9fac676..962d8b9 100644 | |||
62 | return -ENOENT; | 63 | return -ENOENT; |
63 | if (k == GLOB_NOSPACE) | 64 | if (k == GLOB_NOSPACE) |
64 | diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c | 65 | diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c |
65 | index b4f4144..955b3ba 100644 | 66 | index b4f4144..f0d474e 100644 |
66 | --- a/src/test/test-glob-util.c | 67 | --- a/src/test/test-glob-util.c |
67 | +++ b/src/test/test-glob-util.c | 68 | +++ b/src/test/test-glob-util.c |
68 | @@ -12,6 +12,11 @@ | 69 | @@ -13,6 +13,12 @@ |
69 | #include "macro.h" | ||
70 | #include "rm-rf.h" | 70 | #include "rm-rf.h" |
71 | #include "tmpfile-util.h" | 71 | #include "tmpfile-util.h" |
72 | |||
72 | +/* Don't fail if the standard library | 73 | +/* Don't fail if the standard library |
73 | + * doesn't provide brace expansion */ | 74 | + * doesn't provide brace expansion */ |
74 | +#ifndef GLOB_BRACE | 75 | +#ifndef GLOB_BRACE |
75 | +#define GLOB_BRACE 0 | 76 | +#define GLOB_BRACE 0 |
76 | +#endif | 77 | +#endif |
77 | 78 | + | |
78 | static void test_glob_exists(void) { | 79 | static void test_glob_exists(void) { |
79 | char name[] = "/tmp/test-glob_exists.XXXXXX"; | 80 | char name[] = "/tmp/test-glob_exists.XXXXXX"; |
80 | @@ -38,25 +43,33 @@ static void closedir_wrapper(void* v) { | 81 | int fd = -1; |
81 | static void test_glob_no_dot(void) { | 82 | @@ -40,11 +46,13 @@ static void test_glob_no_dot(void) { |
82 | char template[] = "/tmp/test-glob-util.XXXXXXX"; | ||
83 | const char *fn; | 83 | const char *fn; |
84 | - | 84 | |
85 | _cleanup_globfree_ glob_t g = { | 85 | _cleanup_globfree_ glob_t g = { |
86 | +#ifdef GLOB_ALTDIRFUNC | 86 | +#ifdef GLOB_ALTDIRFUNC |
87 | .gl_closedir = closedir_wrapper, | 87 | .gl_closedir = closedir_wrapper, |
@@ -91,9 +91,9 @@ index b4f4144..955b3ba 100644 | |||
91 | .gl_stat = stat, | 91 | .gl_stat = stat, |
92 | +#endif | 92 | +#endif |
93 | }; | 93 | }; |
94 | - | ||
95 | int r; | ||
96 | 94 | ||
95 | int r; | ||
96 | @@ -52,11 +60,19 @@ static void test_glob_no_dot(void) { | ||
97 | assert_se(mkdtemp(template)); | 97 | assert_se(mkdtemp(template)); |
98 | 98 | ||
99 | fn = strjoina(template, "/*"); | 99 | fn = strjoina(template, "/*"); |
@@ -114,22 +114,23 @@ index b4f4144..955b3ba 100644 | |||
114 | 114 | ||
115 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); | 115 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); |
116 | diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c | 116 | diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c |
117 | index b66765b..11dbbf4 100644 | 117 | index d9d1cc1..477d1e3 100644 |
118 | --- a/src/tmpfiles/tmpfiles.c | 118 | --- a/src/tmpfiles/tmpfiles.c |
119 | +++ b/src/tmpfiles/tmpfiles.c | 119 | +++ b/src/tmpfiles/tmpfiles.c |
120 | @@ -60,6 +60,11 @@ | 120 | @@ -63,6 +63,12 @@ |
121 | #include "umask-util.h" | 121 | #include "umask-util.h" |
122 | #include "user-util.h" | 122 | #include "user-util.h" |
123 | #include "util.h" | 123 | |
124 | +/* Don't fail if the standard library | 124 | +/* Don't fail if the standard library |
125 | + * doesn't provide brace expansion */ | 125 | + * doesn't provide brace expansion */ |
126 | +#ifndef GLOB_BRACE | 126 | +#ifndef GLOB_BRACE |
127 | +#define GLOB_BRACE 0 | 127 | +#define GLOB_BRACE 0 |
128 | +#endif | 128 | +#endif |
129 | 129 | + | |
130 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates | 130 | /* 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 | 131 | * them in the file system. This is intended to be used to create |
132 | @@ -1853,7 +1858,9 @@ finish: | 132 | * properly owned directories beneath /tmp, /var/tmp, /run, which are |
133 | @@ -1839,7 +1845,9 @@ finish: | ||
133 | 134 | ||
134 | static int glob_item(Item *i, action_t action) { | 135 | static int glob_item(Item *i, action_t action) { |
135 | _cleanup_globfree_ glob_t g = { | 136 | _cleanup_globfree_ glob_t g = { |
@@ -139,7 +140,7 @@ index b66765b..11dbbf4 100644 | |||
139 | }; | 140 | }; |
140 | int r = 0, k; | 141 | int r = 0, k; |
141 | char **fn; | 142 | char **fn; |
142 | @@ -1873,7 +1880,9 @@ static int glob_item(Item *i, action_t action) { | 143 | @@ -1859,7 +1867,9 @@ static int glob_item(Item *i, action_t action) { |
143 | 144 | ||
144 | static int glob_item_recursively(Item *i, fdaction_t action) { | 145 | static int glob_item_recursively(Item *i, fdaction_t action) { |
145 | _cleanup_globfree_ glob_t g = { | 146 | _cleanup_globfree_ glob_t g = { |
@@ -150,5 +151,5 @@ index b66765b..11dbbf4 100644 | |||
150 | int r = 0, k; | 151 | int r = 0, k; |
151 | char **fn; | 152 | char **fn; |
152 | -- | 153 | -- |
153 | 2.7.4 | 154 | 2.11.0 |
154 | 155 | ||