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 | 32 |
1 files changed, 16 insertions, 16 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 580c49fecf..dd6ecebeb4 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 | |||
@@ -23,10 +23,10 @@ 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 | 26 | Index: systemd-stable/src/basic/glob-util.c |
27 | index e3aa6c2e152b..38070b79c83a 100644 | 27 | =================================================================== |
28 | --- a/src/basic/glob-util.c | 28 | --- systemd-stable.orig/src/basic/glob-util.c |
29 | +++ b/src/basic/glob-util.c | 29 | +++ systemd-stable/src/basic/glob-util.c |
30 | @@ -12,6 +12,12 @@ | 30 | @@ -12,6 +12,12 @@ |
31 | #include "path-util.h" | 31 | #include "path-util.h" |
32 | #include "strv.h" | 32 | #include "strv.h" |
@@ -48,7 +48,7 @@ index e3aa6c2e152b..38070b79c83a 100644 | |||
48 | /* 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. */ |
49 | assert(!(flags & GLOB_ALTDIRFUNC)); | 49 | assert(!(flags & GLOB_ALTDIRFUNC)); |
50 | 50 | ||
51 | @@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { | 51 | @@ -32,9 +39,14 @@ int safe_glob(const char *path, int flag |
52 | pglob->gl_lstat = lstat; | 52 | pglob->gl_lstat = lstat; |
53 | if (!pglob->gl_stat) | 53 | if (!pglob->gl_stat) |
54 | pglob->gl_stat = stat; | 54 | pglob->gl_stat = stat; |
@@ -63,10 +63,10 @@ index e3aa6c2e152b..38070b79c83a 100644 | |||
63 | if (k == GLOB_NOMATCH) | 63 | if (k == GLOB_NOMATCH) |
64 | return -ENOENT; | 64 | return -ENOENT; |
65 | 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 | 66 | Index: systemd-stable/src/test/test-glob-util.c |
67 | index 667d15335fbf..76a84443aacf 100644 | 67 | =================================================================== |
68 | --- a/src/test/test-glob-util.c | 68 | --- systemd-stable.orig/src/test/test-glob-util.c |
69 | +++ b/src/test/test-glob-util.c | 69 | +++ systemd-stable/src/test/test-glob-util.c |
70 | @@ -12,6 +12,12 @@ | 70 | @@ -12,6 +12,12 @@ |
71 | #include "rm-rf.h" | 71 | #include "rm-rf.h" |
72 | #include "tmpfile-util.h" | 72 | #include "tmpfile-util.h" |
@@ -114,11 +114,11 @@ index 667d15335fbf..76a84443aacf 100644 | |||
114 | assert_se(r == GLOB_NOMATCH); | 114 | assert_se(r == GLOB_NOMATCH); |
115 | 115 | ||
116 | (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 | 117 | Index: systemd-stable/src/tmpfiles/tmpfiles.c |
118 | index 193ed0bc781b..2f94fd2efd8f 100644 | 118 | =================================================================== |
119 | --- a/src/tmpfiles/tmpfiles.c | 119 | --- systemd-stable.orig/src/tmpfiles/tmpfiles.c |
120 | +++ b/src/tmpfiles/tmpfiles.c | 120 | +++ systemd-stable/src/tmpfiles/tmpfiles.c |
121 | @@ -58,6 +58,12 @@ | 121 | @@ -59,6 +59,12 @@ |
122 | #include "umask-util.h" | 122 | #include "umask-util.h" |
123 | #include "user-util.h" | 123 | #include "user-util.h" |
124 | 124 | ||
@@ -131,7 +131,7 @@ index 193ed0bc781b..2f94fd2efd8f 100644 | |||
131 | /* 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 |
132 | * 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 |
133 | * properly owned directories beneath /tmp, /var/tmp, /run, which are | 133 | * properly owned directories beneath /tmp, /var/tmp, /run, which are |
134 | @@ -1850,7 +1856,9 @@ finish: | 134 | @@ -1867,7 +1873,9 @@ finish: |
135 | 135 | ||
136 | static int glob_item(Item *i, action_t action) { | 136 | static int glob_item(Item *i, action_t action) { |
137 | _cleanup_globfree_ glob_t g = { | 137 | _cleanup_globfree_ glob_t g = { |
@@ -141,7 +141,7 @@ index 193ed0bc781b..2f94fd2efd8f 100644 | |||
141 | }; | 141 | }; |
142 | int r = 0, k; | 142 | int r = 0, k; |
143 | char **fn; | 143 | char **fn; |
144 | @@ -1870,7 +1878,9 @@ static int glob_item(Item *i, action_t action) { | 144 | @@ -1887,7 +1895,9 @@ static int glob_item(Item *i, action_t a |
145 | 145 | ||
146 | static int glob_item_recursively(Item *i, fdaction_t action) { | 146 | static int glob_item_recursively(Item *i, fdaction_t action) { |
147 | _cleanup_globfree_ glob_t g = { | 147 | _cleanup_globfree_ glob_t g = { |