diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-24 11:13:28 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-25 22:36:08 +0100 |
commit | 4cac662d7d705ad6d9d43ac4f724d028b054ac72 (patch) | |
tree | 37a5665b976deb0ff54bc1166dd2cd197339a53c /meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch | |
parent | f003e6015f613b5786ab374853562282cbcd7958 (diff) | |
download | poky-4cac662d7d705ad6d9d43ac4f724d028b054ac72.tar.gz |
systemd: update 247.6 -> 248.3
Drop backports:
48fff0a2af3f62acd446ebec8081b039b72caad8.patch
7c5fd25119a495009ea62f79e5daec34cc464628.patch
0001-analyze-resolve-executable-path-if-it-is-relative.patch
0001-analyze-resolve-executable-path-if-it-is-relative.patch
Drop 0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch
as difficult to rebase; please resend if you feel strongly that
it is needed.
Rebase the big pile of musl patches.
(From OE-Core rev: e8dd5a36bf2f1e645fb2ff15eb3b5e97c04776e6)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch | 204 |
1 files changed, 154 insertions, 50 deletions
diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index d63e3c0d09..a0d757b3f3 100644 --- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5aeae0ea89f5af74ed5d95bed1d87a03b3801ff0 Mon Sep 17 00:00:00 2001 | 1 | From 6b0732ac7164914ce16e231e35980b849bdfc4c8 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:18:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:18:21 +0800 |
4 | Subject: [PATCH 05/26] src/basic/missing.h: check for missing strndupa | 4 | Subject: [PATCH] src/basic/missing.h: check for missing strndupa |
5 | 5 | ||
6 | include missing.h for definition of strndupa | 6 | include missing.h for definition of strndupa |
7 | 7 | ||
@@ -17,6 +17,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
17 | [rebased for systemd 244] | 17 | [rebased for systemd 244] |
18 | [Rebased for v247] | 18 | [Rebased for v247] |
19 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | 19 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> |
20 | |||
20 | --- | 21 | --- |
21 | meson.build | 1 + | 22 | meson.build | 1 + |
22 | src/backlight/backlight.c | 1 + | 23 | src/backlight/backlight.c | 1 + |
@@ -25,6 +26,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
25 | src/basic/log.c | 1 + | 26 | src/basic/log.c | 1 + |
26 | src/basic/missing_stdlib.h | 12 ++++++++++++ | 27 | src/basic/missing_stdlib.h | 12 ++++++++++++ |
27 | src/basic/mkdir.c | 1 + | 28 | src/basic/mkdir.c | 1 + |
29 | src/basic/mountpoint-util.c | 1 + | ||
28 | src/basic/parse-util.c | 1 + | 30 | src/basic/parse-util.c | 1 + |
29 | src/basic/path-lookup.c | 1 + | 31 | src/basic/path-lookup.c | 1 + |
30 | src/basic/proc-cmdline.c | 1 + | 32 | src/basic/proc-cmdline.c | 1 + |
@@ -41,12 +43,12 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
41 | src/coredump/coredump-vacuum.c | 1 + | 43 | src/coredump/coredump-vacuum.c | 1 + |
42 | src/journal-remote/journal-remote-main.c | 1 + | 44 | src/journal-remote/journal-remote-main.c | 1 + |
43 | src/journal/journalctl.c | 1 + | 45 | src/journal/journalctl.c | 1 + |
44 | src/journal/sd-journal.c | 1 + | ||
45 | src/libsystemd/sd-bus/bus-message.c | 1 + | 46 | src/libsystemd/sd-bus/bus-message.c | 1 + |
46 | src/libsystemd/sd-bus/bus-objects.c | 1 + | 47 | src/libsystemd/sd-bus/bus-objects.c | 1 + |
47 | src/libsystemd/sd-bus/bus-socket.c | 1 + | 48 | src/libsystemd/sd-bus/bus-socket.c | 1 + |
48 | src/libsystemd/sd-bus/sd-bus.c | 1 + | 49 | src/libsystemd/sd-bus/sd-bus.c | 1 + |
49 | src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + | 50 | src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + |
51 | src/libsystemd/sd-journal/sd-journal.c | 1 + | ||
50 | src/locale/keymap-util.c | 1 + | 52 | src/locale/keymap-util.c | 1 + |
51 | src/login/pam_systemd.c | 1 + | 53 | src/login/pam_systemd.c | 1 + |
52 | src/network/generator/network-generator.c | 1 + | 54 | src/network/generator/network-generator.c | 1 + |
@@ -68,18 +70,22 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
68 | src/udev/udev-builtin-path_id.c | 1 + | 70 | src/udev/udev-builtin-path_id.c | 1 + |
69 | src/udev/udev-event.c | 1 + | 71 | src/udev/udev-event.c | 1 + |
70 | src/udev/udev-rules.c | 1 + | 72 | src/udev/udev-rules.c | 1 + |
71 | 50 files changed, 61 insertions(+) | 73 | 51 files changed, 62 insertions(+) |
72 | 74 | ||
75 | diff --git a/meson.build b/meson.build | ||
76 | index 2abb7b3188..c97f09062b 100644 | ||
73 | --- a/meson.build | 77 | --- a/meson.build |
74 | +++ b/meson.build | 78 | +++ b/meson.build |
75 | @@ -535,6 +535,7 @@ foreach ident : [ | 79 | @@ -550,6 +550,7 @@ foreach ident : [ |
76 | #include <sys/wait.h>'''], | 80 | ['execveat', '''#include <unistd.h>'''], |
77 | ['mallinfo', '''#include <malloc.h>'''], | ||
78 | ['close_range', '''#include <unistd.h>'''], | 81 | ['close_range', '''#include <unistd.h>'''], |
82 | ['epoll_pwait2', '''#include <sys/epoll.h>'''], | ||
79 | + ['strndupa' , '''#include <string.h>'''], | 83 | + ['strndupa' , '''#include <string.h>'''], |
80 | ] | 84 | ] |
81 | 85 | ||
82 | have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') | 86 | have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') |
87 | diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c | ||
88 | index 86927be62e..a34be158a0 100644 | ||
83 | --- a/src/backlight/backlight.c | 89 | --- a/src/backlight/backlight.c |
84 | +++ b/src/backlight/backlight.c | 90 | +++ b/src/backlight/backlight.c |
85 | @@ -19,6 +19,7 @@ | 91 | @@ -19,6 +19,7 @@ |
@@ -90,6 +96,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
90 | 96 | ||
91 | static int help(void) { | 97 | static int help(void) { |
92 | _cleanup_free_ char *link = NULL; | 98 | _cleanup_free_ char *link = NULL; |
99 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c | ||
100 | index 8dd3f8cd95..50c1ae1b2b 100644 | ||
93 | --- a/src/basic/cgroup-util.c | 101 | --- a/src/basic/cgroup-util.c |
94 | +++ b/src/basic/cgroup-util.c | 102 | +++ b/src/basic/cgroup-util.c |
95 | @@ -38,6 +38,7 @@ | 103 | @@ -38,6 +38,7 @@ |
@@ -100,9 +108,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
100 | 108 | ||
101 | static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { | 109 | static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { |
102 | _cleanup_free_ char *fs = NULL; | 110 | _cleanup_free_ char *fs = NULL; |
111 | diff --git a/src/basic/env-util.c b/src/basic/env-util.c | ||
112 | index c110a750a5..e1f091b01e 100644 | ||
103 | --- a/src/basic/env-util.c | 113 | --- a/src/basic/env-util.c |
104 | +++ b/src/basic/env-util.c | 114 | +++ b/src/basic/env-util.c |
105 | @@ -15,6 +15,7 @@ | 115 | @@ -18,6 +18,7 @@ |
106 | #include "string-util.h" | 116 | #include "string-util.h" |
107 | #include "strv.h" | 117 | #include "strv.h" |
108 | #include "utf8.h" | 118 | #include "utf8.h" |
@@ -110,6 +120,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
110 | 120 | ||
111 | /* We follow bash for the character set. Different shells have different rules. */ | 121 | /* We follow bash for the character set. Different shells have different rules. */ |
112 | #define VALID_BASH_ENV_NAME_CHARS \ | 122 | #define VALID_BASH_ENV_NAME_CHARS \ |
123 | diff --git a/src/basic/log.c b/src/basic/log.c | ||
124 | index 595db0c395..daff8eb68a 100644 | ||
113 | --- a/src/basic/log.c | 125 | --- a/src/basic/log.c |
114 | +++ b/src/basic/log.c | 126 | +++ b/src/basic/log.c |
115 | @@ -36,6 +36,7 @@ | 127 | @@ -36,6 +36,7 @@ |
@@ -120,6 +132,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
120 | 132 | ||
121 | #define SNDBUF_SIZE (8*1024*1024) | 133 | #define SNDBUF_SIZE (8*1024*1024) |
122 | 134 | ||
135 | diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h | ||
136 | index 8c76f93eb2..9068bfb4f0 100644 | ||
123 | --- a/src/basic/missing_stdlib.h | 137 | --- a/src/basic/missing_stdlib.h |
124 | +++ b/src/basic/missing_stdlib.h | 138 | +++ b/src/basic/missing_stdlib.h |
125 | @@ -11,3 +11,15 @@ | 139 | @@ -11,3 +11,15 @@ |
@@ -138,6 +152,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
138 | + (char *)memcpy(__new, __old, __len); \ | 152 | + (char *)memcpy(__new, __old, __len); \ |
139 | + }) | 153 | + }) |
140 | +#endif | 154 | +#endif |
155 | diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c | ||
156 | index f91f8f7a08..fb31596216 100644 | ||
141 | --- a/src/basic/mkdir.c | 157 | --- a/src/basic/mkdir.c |
142 | +++ b/src/basic/mkdir.c | 158 | +++ b/src/basic/mkdir.c |
143 | @@ -14,6 +14,7 @@ | 159 | @@ -14,6 +14,7 @@ |
@@ -148,9 +164,23 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
148 | 164 | ||
149 | int mkdir_safe_internal( | 165 | int mkdir_safe_internal( |
150 | const char *path, | 166 | const char *path, |
167 | diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c | ||
168 | index 1d617e87b2..346f9a47d7 100644 | ||
169 | --- a/src/basic/mountpoint-util.c | ||
170 | +++ b/src/basic/mountpoint-util.c | ||
171 | @@ -12,6 +12,7 @@ | ||
172 | #include "missing_stat.h" | ||
173 | #include "missing_syscall.h" | ||
174 | #include "mkdir.h" | ||
175 | +#include "missing_stdlib.h" | ||
176 | #include "mountpoint-util.h" | ||
177 | #include "parse-util.h" | ||
178 | #include "path-util.h" | ||
179 | diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c | ||
180 | index b79c885dfd..6dabda5691 100644 | ||
151 | --- a/src/basic/parse-util.c | 181 | --- a/src/basic/parse-util.c |
152 | +++ b/src/basic/parse-util.c | 182 | +++ b/src/basic/parse-util.c |
153 | @@ -22,6 +22,7 @@ | 183 | @@ -19,6 +19,7 @@ |
154 | #include "stat-util.h" | 184 | #include "stat-util.h" |
155 | #include "string-util.h" | 185 | #include "string-util.h" |
156 | #include "strv.h" | 186 | #include "strv.h" |
@@ -158,6 +188,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
158 | 188 | ||
159 | int parse_boolean(const char *v) { | 189 | int parse_boolean(const char *v) { |
160 | if (!v) | 190 | if (!v) |
191 | diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c | ||
192 | index e53c2302b1..ca1d40ccbe 100644 | ||
161 | --- a/src/basic/path-lookup.c | 193 | --- a/src/basic/path-lookup.c |
162 | +++ b/src/basic/path-lookup.c | 194 | +++ b/src/basic/path-lookup.c |
163 | @@ -15,6 +15,7 @@ | 195 | @@ -15,6 +15,7 @@ |
@@ -168,6 +200,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
168 | 200 | ||
169 | int xdg_user_runtime_dir(char **ret, const char *suffix) { | 201 | int xdg_user_runtime_dir(char **ret, const char *suffix) { |
170 | const char *e; | 202 | const char *e; |
203 | diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c | ||
204 | index 410b8a3eb5..f2c4355609 100644 | ||
171 | --- a/src/basic/proc-cmdline.c | 205 | --- a/src/basic/proc-cmdline.c |
172 | +++ b/src/basic/proc-cmdline.c | 206 | +++ b/src/basic/proc-cmdline.c |
173 | @@ -15,6 +15,7 @@ | 207 | @@ -15,6 +15,7 @@ |
@@ -178,6 +212,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
178 | 212 | ||
179 | int proc_cmdline(char **ret) { | 213 | int proc_cmdline(char **ret) { |
180 | const char *e; | 214 | const char *e; |
215 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c | ||
216 | index ccab71f7d2..8f9eee8d36 100644 | ||
181 | --- a/src/basic/procfs-util.c | 217 | --- a/src/basic/procfs-util.c |
182 | +++ b/src/basic/procfs-util.c | 218 | +++ b/src/basic/procfs-util.c |
183 | @@ -11,6 +11,7 @@ | 219 | @@ -11,6 +11,7 @@ |
@@ -188,6 +224,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
188 | 224 | ||
189 | int procfs_tasks_get_limit(uint64_t *ret) { | 225 | int procfs_tasks_get_limit(uint64_t *ret) { |
190 | _cleanup_free_ char *value = NULL; | 226 | _cleanup_free_ char *value = NULL; |
227 | diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c | ||
228 | index ee9e34ed47..96c1e9362d 100644 | ||
191 | --- a/src/basic/selinux-util.c | 229 | --- a/src/basic/selinux-util.c |
192 | +++ b/src/basic/selinux-util.c | 230 | +++ b/src/basic/selinux-util.c |
193 | @@ -27,6 +27,7 @@ | 231 | @@ -27,6 +27,7 @@ |
@@ -197,7 +235,9 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
197 | +#include "missing_stdlib.h" | 235 | +#include "missing_stdlib.h" |
198 | 236 | ||
199 | #if HAVE_SELINUX | 237 | #if HAVE_SELINUX |
200 | DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); | 238 | DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(context_t, context_free, NULL); |
239 | diff --git a/src/basic/time-util.c b/src/basic/time-util.c | ||
240 | index 78d0390a00..47c38ca691 100644 | ||
201 | --- a/src/basic/time-util.c | 241 | --- a/src/basic/time-util.c |
202 | +++ b/src/basic/time-util.c | 242 | +++ b/src/basic/time-util.c |
203 | @@ -27,6 +27,7 @@ | 243 | @@ -27,6 +27,7 @@ |
@@ -208,6 +248,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
208 | 248 | ||
209 | static clockid_t map_clock_id(clockid_t c) { | 249 | static clockid_t map_clock_id(clockid_t c) { |
210 | 250 | ||
251 | diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c | ||
252 | index 97ad1e0cb5..9d60f3cc79 100644 | ||
211 | --- a/src/boot/bless-boot.c | 253 | --- a/src/boot/bless-boot.c |
212 | +++ b/src/boot/bless-boot.c | 254 | +++ b/src/boot/bless-boot.c |
213 | @@ -18,6 +18,7 @@ | 255 | @@ -18,6 +18,7 @@ |
@@ -218,16 +260,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
218 | 260 | ||
219 | static char **arg_path = NULL; | 261 | static char **arg_path = NULL; |
220 | 262 | ||
263 | diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c | ||
264 | index 04d2ba34f3..651ca9412e 100644 | ||
221 | --- a/src/core/dbus-cgroup.c | 265 | --- a/src/core/dbus-cgroup.c |
222 | +++ b/src/core/dbus-cgroup.c | 266 | +++ b/src/core/dbus-cgroup.c |
223 | @@ -16,6 +16,7 @@ | 267 | @@ -17,6 +17,7 @@ |
224 | #include "fileio.h" | ||
225 | #include "limits-util.h" | 268 | #include "limits-util.h" |
226 | #include "path-util.h" | 269 | #include "path-util.h" |
270 | #include "percent-util.h" | ||
227 | +#include "missing_stdlib.h" | 271 | +#include "missing_stdlib.h" |
228 | 272 | ||
229 | BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); | 273 | BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); |
230 | 274 | ||
275 | diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c | ||
276 | index 5239c41d67..0f604efe98 100644 | ||
231 | --- a/src/core/dbus-execute.c | 277 | --- a/src/core/dbus-execute.c |
232 | +++ b/src/core/dbus-execute.c | 278 | +++ b/src/core/dbus-execute.c |
233 | @@ -41,6 +41,7 @@ | 279 | @@ -41,6 +41,7 @@ |
@@ -238,9 +284,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
238 | 284 | ||
239 | BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); | 285 | BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); |
240 | static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); | 286 | static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); |
287 | diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c | ||
288 | index 44a2ccfca0..3926ccfa4a 100644 | ||
241 | --- a/src/core/dbus-util.c | 289 | --- a/src/core/dbus-util.c |
242 | +++ b/src/core/dbus-util.c | 290 | +++ b/src/core/dbus-util.c |
243 | @@ -7,6 +7,7 @@ | 291 | @@ -9,6 +9,7 @@ |
244 | #include "unit-printf.h" | 292 | #include "unit-printf.h" |
245 | #include "user-util.h" | 293 | #include "user-util.h" |
246 | #include "unit.h" | 294 | #include "unit.h" |
@@ -248,16 +296,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
248 | 296 | ||
249 | int bus_property_get_triggered_unit( | 297 | int bus_property_get_triggered_unit( |
250 | sd_bus *bus, | 298 | sd_bus *bus, |
299 | diff --git a/src/core/execute.c b/src/core/execute.c | ||
300 | index 922913e7af..f82fc294c0 100644 | ||
251 | --- a/src/core/execute.c | 301 | --- a/src/core/execute.c |
252 | +++ b/src/core/execute.c | 302 | +++ b/src/core/execute.c |
253 | @@ -96,6 +96,7 @@ | 303 | @@ -96,6 +96,7 @@ |
254 | #include "unit.h" | 304 | #include "unit-serialize.h" |
255 | #include "user-util.h" | 305 | #include "user-util.h" |
256 | #include "utmp-wtmp.h" | 306 | #include "utmp-wtmp.h" |
257 | +#include "missing_stdlib.h" | 307 | +#include "missing_stdlib.h" |
258 | 308 | ||
259 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) | 309 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) |
260 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) | 310 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) |
311 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | ||
312 | index a56f12f47f..6b8729ef67 100644 | ||
261 | --- a/src/core/kmod-setup.c | 313 | --- a/src/core/kmod-setup.c |
262 | +++ b/src/core/kmod-setup.c | 314 | +++ b/src/core/kmod-setup.c |
263 | @@ -11,6 +11,7 @@ | 315 | @@ -11,6 +11,7 @@ |
@@ -268,6 +320,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
268 | 320 | ||
269 | #if HAVE_KMOD | 321 | #if HAVE_KMOD |
270 | #include "module-util.h" | 322 | #include "module-util.h" |
323 | diff --git a/src/core/service.c b/src/core/service.c | ||
324 | index 4c5bfb17fb..8c05f36119 100644 | ||
271 | --- a/src/core/service.c | 325 | --- a/src/core/service.c |
272 | +++ b/src/core/service.c | 326 | +++ b/src/core/service.c |
273 | @@ -41,6 +41,7 @@ | 327 | @@ -41,6 +41,7 @@ |
@@ -278,6 +332,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
278 | 332 | ||
279 | static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { | 333 | static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { |
280 | [SERVICE_DEAD] = UNIT_INACTIVE, | 334 | [SERVICE_DEAD] = UNIT_INACTIVE, |
335 | diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c | ||
336 | index 95c3fca661..d4a9f27b08 100644 | ||
281 | --- a/src/coredump/coredump-vacuum.c | 337 | --- a/src/coredump/coredump-vacuum.c |
282 | +++ b/src/coredump/coredump-vacuum.c | 338 | +++ b/src/coredump/coredump-vacuum.c |
283 | @@ -16,6 +16,7 @@ | 339 | @@ -16,6 +16,7 @@ |
@@ -288,9 +344,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
288 | 344 | ||
289 | #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ | 345 | #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ |
290 | #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ | 346 | #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ |
347 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c | ||
348 | index ae1d43756a..24de98c9f3 100644 | ||
291 | --- a/src/journal-remote/journal-remote-main.c | 349 | --- a/src/journal-remote/journal-remote-main.c |
292 | +++ b/src/journal-remote/journal-remote-main.c | 350 | +++ b/src/journal-remote/journal-remote-main.c |
293 | @@ -22,6 +22,7 @@ | 351 | @@ -24,6 +24,7 @@ |
294 | #include "stat-util.h" | 352 | #include "stat-util.h" |
295 | #include "string-table.h" | 353 | #include "string-table.h" |
296 | #include "strv.h" | 354 | #include "strv.h" |
@@ -298,9 +356,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
298 | 356 | ||
299 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" | 357 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" |
300 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" | 358 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" |
359 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c | ||
360 | index 76d05c1eee..0beb77b2e5 100644 | ||
301 | --- a/src/journal/journalctl.c | 361 | --- a/src/journal/journalctl.c |
302 | +++ b/src/journal/journalctl.c | 362 | +++ b/src/journal/journalctl.c |
303 | @@ -73,6 +73,7 @@ | 363 | @@ -72,6 +72,7 @@ |
304 | #include "unit-name.h" | 364 | #include "unit-name.h" |
305 | #include "user-util.h" | 365 | #include "user-util.h" |
306 | #include "varlink.h" | 366 | #include "varlink.h" |
@@ -308,19 +368,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
308 | 368 | ||
309 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) | 369 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) |
310 | #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ | 370 | #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ |
311 | --- a/src/journal/sd-journal.c | 371 | diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c |
312 | +++ b/src/journal/sd-journal.c | 372 | index b25064b672..b3bbe63a91 100644 |
313 | @@ -40,6 +40,7 @@ | ||
314 | #include "string-util.h" | ||
315 | #include "strv.h" | ||
316 | #include "syslog-util.h" | ||
317 | +#include "missing_stdlib.h" | ||
318 | |||
319 | #define JOURNAL_FILES_MAX 7168 | ||
320 | |||
321 | --- a/src/libsystemd/sd-bus/bus-message.c | 373 | --- a/src/libsystemd/sd-bus/bus-message.c |
322 | +++ b/src/libsystemd/sd-bus/bus-message.c | 374 | +++ b/src/libsystemd/sd-bus/bus-message.c |
323 | @@ -21,6 +21,7 @@ | 375 | @@ -20,6 +20,7 @@ |
324 | #include "strv.h" | 376 | #include "strv.h" |
325 | #include "time-util.h" | 377 | #include "time-util.h" |
326 | #include "utf8.h" | 378 | #include "utf8.h" |
@@ -328,9 +380,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
328 | 380 | ||
329 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); | 381 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); |
330 | 382 | ||
383 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c | ||
384 | index bfd42aea7d..daefc56e3e 100644 | ||
331 | --- a/src/libsystemd/sd-bus/bus-objects.c | 385 | --- a/src/libsystemd/sd-bus/bus-objects.c |
332 | +++ b/src/libsystemd/sd-bus/bus-objects.c | 386 | +++ b/src/libsystemd/sd-bus/bus-objects.c |
333 | @@ -13,6 +13,7 @@ | 387 | @@ -12,6 +12,7 @@ |
334 | #include "set.h" | 388 | #include "set.h" |
335 | #include "string-util.h" | 389 | #include "string-util.h" |
336 | #include "strv.h" | 390 | #include "strv.h" |
@@ -338,6 +392,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
338 | 392 | ||
339 | static int node_vtable_get_userdata( | 393 | static int node_vtable_get_userdata( |
340 | sd_bus *bus, | 394 | sd_bus *bus, |
395 | diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c | ||
396 | index 832526cc1b..7bff701806 100644 | ||
341 | --- a/src/libsystemd/sd-bus/bus-socket.c | 397 | --- a/src/libsystemd/sd-bus/bus-socket.c |
342 | +++ b/src/libsystemd/sd-bus/bus-socket.c | 398 | +++ b/src/libsystemd/sd-bus/bus-socket.c |
343 | @@ -28,6 +28,7 @@ | 399 | @@ -28,6 +28,7 @@ |
@@ -348,29 +404,47 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
348 | 404 | ||
349 | #define SNDBUF_SIZE (8*1024*1024) | 405 | #define SNDBUF_SIZE (8*1024*1024) |
350 | 406 | ||
407 | diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c | ||
408 | index e719c74370..ac2a605680 100644 | ||
351 | --- a/src/libsystemd/sd-bus/sd-bus.c | 409 | --- a/src/libsystemd/sd-bus/sd-bus.c |
352 | +++ b/src/libsystemd/sd-bus/sd-bus.c | 410 | +++ b/src/libsystemd/sd-bus/sd-bus.c |
353 | @@ -41,6 +41,7 @@ | 411 | @@ -41,6 +41,7 @@ |
354 | #include "process-util.h" | ||
355 | #include "string-util.h" | 412 | #include "string-util.h" |
356 | #include "strv.h" | 413 | #include "strv.h" |
414 | #include "user-util.h" | ||
357 | +#include "missing_stdlib.h" | 415 | +#include "missing_stdlib.h" |
358 | 416 | ||
359 | #define log_debug_bus_message(m) \ | 417 | #define log_debug_bus_message(m) \ |
360 | do { \ | 418 | do { \ |
419 | diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c | ||
420 | index 13c08fe295..9aae83486e 100644 | ||
361 | --- a/src/libsystemd/sd-bus/test-bus-benchmark.c | 421 | --- a/src/libsystemd/sd-bus/test-bus-benchmark.c |
362 | +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c | 422 | +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c |
363 | @@ -14,6 +14,7 @@ | 423 | @@ -14,6 +14,7 @@ |
364 | #include "missing_resource.h" | 424 | #include "string-util.h" |
365 | #include "time-util.h" | 425 | #include "time-util.h" |
366 | #include "util.h" | 426 | #include "util.h" |
367 | +#include "missing_stdlib.h" | 427 | +#include "missing_stdlib.h" |
368 | 428 | ||
369 | #define MAX_SIZE (2*1024*1024) | 429 | #define MAX_SIZE (2*1024*1024) |
370 | 430 | ||
431 | diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c | ||
432 | index c90b4c926e..0efdccff5d 100644 | ||
433 | --- a/src/libsystemd/sd-journal/sd-journal.c | ||
434 | +++ b/src/libsystemd/sd-journal/sd-journal.c | ||
435 | @@ -40,6 +40,7 @@ | ||
436 | #include "string-util.h" | ||
437 | #include "strv.h" | ||
438 | #include "syslog-util.h" | ||
439 | +#include "missing_stdlib.h" | ||
440 | |||
441 | #define JOURNAL_FILES_MAX 7168 | ||
442 | |||
443 | diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c | ||
444 | index d2f0566dbc..3b7746557e 100644 | ||
371 | --- a/src/locale/keymap-util.c | 445 | --- a/src/locale/keymap-util.c |
372 | +++ b/src/locale/keymap-util.c | 446 | +++ b/src/locale/keymap-util.c |
373 | @@ -21,6 +21,7 @@ | 447 | @@ -24,6 +24,7 @@ |
374 | #include "string-util.h" | 448 | #include "string-util.h" |
375 | #include "strv.h" | 449 | #include "strv.h" |
376 | #include "tmpfile-util.h" | 450 | #include "tmpfile-util.h" |
@@ -378,6 +452,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
378 | 452 | ||
379 | static bool startswith_comma(const char *s, const char *prefix) { | 453 | static bool startswith_comma(const char *s, const char *prefix) { |
380 | s = startswith(s, prefix); | 454 | s = startswith(s, prefix); |
455 | diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c | ||
456 | index 2021c31bd5..58eb09808d 100644 | ||
381 | --- a/src/login/pam_systemd.c | 457 | --- a/src/login/pam_systemd.c |
382 | +++ b/src/login/pam_systemd.c | 458 | +++ b/src/login/pam_systemd.c |
383 | @@ -31,6 +31,7 @@ | 459 | @@ -31,6 +31,7 @@ |
@@ -388,6 +464,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
388 | #include "pam-util.h" | 464 | #include "pam-util.h" |
389 | #include "parse-util.h" | 465 | #include "parse-util.h" |
390 | #include "path-util.h" | 466 | #include "path-util.h" |
467 | diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c | ||
468 | index ae673ddf5b..a79e5114ca 100644 | ||
391 | --- a/src/network/generator/network-generator.c | 469 | --- a/src/network/generator/network-generator.c |
392 | +++ b/src/network/generator/network-generator.c | 470 | +++ b/src/network/generator/network-generator.c |
393 | @@ -13,6 +13,7 @@ | 471 | @@ -13,6 +13,7 @@ |
@@ -398,6 +476,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
398 | 476 | ||
399 | /* | 477 | /* |
400 | # .network | 478 | # .network |
479 | diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c | ||
480 | index d4619bead5..0e832fd994 100644 | ||
401 | --- a/src/nspawn/nspawn-settings.c | 481 | --- a/src/nspawn/nspawn-settings.c |
402 | +++ b/src/nspawn/nspawn-settings.c | 482 | +++ b/src/nspawn/nspawn-settings.c |
403 | @@ -16,6 +16,7 @@ | 483 | @@ -16,6 +16,7 @@ |
@@ -408,19 +488,23 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
408 | 488 | ||
409 | Settings *settings_new(void) { | 489 | Settings *settings_new(void) { |
410 | Settings *s; | 490 | Settings *s; |
491 | diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c | ||
492 | index 44715bb3e5..bc1e688b5e 100644 | ||
411 | --- a/src/nss-mymachines/nss-mymachines.c | 493 | --- a/src/nss-mymachines/nss-mymachines.c |
412 | +++ b/src/nss-mymachines/nss-mymachines.c | 494 | +++ b/src/nss-mymachines/nss-mymachines.c |
413 | @@ -19,6 +19,7 @@ | 495 | @@ -21,6 +21,7 @@ |
414 | #include "nss-util.h" | 496 | #include "nss-util.h" |
415 | #include "signal-util.h" | 497 | #include "signal-util.h" |
416 | #include "string-util.h" | 498 | #include "string-util.h" |
417 | +#include "missing_stdlib.h" | 499 | +#include "missing_stdlib.h" |
418 | 500 | ||
419 | NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); | 501 | static void setup_logging(void) { |
420 | NSS_GETPW_PROTOTYPES(mymachines); | 502 | /* We need a dummy function because log_parse_environment is a macro. */ |
503 | diff --git a/src/portable/portable.c b/src/portable/portable.c | ||
504 | index f201f52531..c78ad0f471 100644 | ||
421 | --- a/src/portable/portable.c | 505 | --- a/src/portable/portable.c |
422 | +++ b/src/portable/portable.c | 506 | +++ b/src/portable/portable.c |
423 | @@ -31,6 +31,7 @@ | 507 | @@ -32,6 +32,7 @@ |
424 | #include "strv.h" | 508 | #include "strv.h" |
425 | #include "tmpfile-util.h" | 509 | #include "tmpfile-util.h" |
426 | #include "user-util.h" | 510 | #include "user-util.h" |
@@ -428,9 +512,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
428 | 512 | ||
429 | static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); | 513 | static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); |
430 | 514 | ||
515 | diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c | ||
516 | index 52bbae3293..4ccbae09c4 100644 | ||
431 | --- a/src/resolve/resolvectl.c | 517 | --- a/src/resolve/resolvectl.c |
432 | +++ b/src/resolve/resolvectl.c | 518 | +++ b/src/resolve/resolvectl.c |
433 | @@ -37,6 +37,7 @@ | 519 | @@ -41,6 +41,7 @@ |
434 | #include "terminal-util.h" | 520 | #include "terminal-util.h" |
435 | #include "utf8.h" | 521 | #include "utf8.h" |
436 | #include "verbs.h" | 522 | #include "verbs.h" |
@@ -438,6 +524,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
438 | 524 | ||
439 | static int arg_family = AF_UNSPEC; | 525 | static int arg_family = AF_UNSPEC; |
440 | static int arg_ifindex = 0; | 526 | static int arg_ifindex = 0; |
527 | diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c | ||
528 | index feb6d3807f..eb11d29e50 100644 | ||
441 | --- a/src/shared/bus-get-properties.c | 529 | --- a/src/shared/bus-get-properties.c |
442 | +++ b/src/shared/bus-get-properties.c | 530 | +++ b/src/shared/bus-get-properties.c |
443 | @@ -4,6 +4,7 @@ | 531 | @@ -4,6 +4,7 @@ |
@@ -448,6 +536,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
448 | 536 | ||
449 | int bus_property_get_bool( | 537 | int bus_property_get_bool( |
450 | sd_bus *bus, | 538 | sd_bus *bus, |
539 | diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c | ||
540 | index b76125e551..2e0892242f 100644 | ||
451 | --- a/src/shared/bus-unit-procs.c | 541 | --- a/src/shared/bus-unit-procs.c |
452 | +++ b/src/shared/bus-unit-procs.c | 542 | +++ b/src/shared/bus-unit-procs.c |
453 | @@ -10,6 +10,7 @@ | 543 | @@ -10,6 +10,7 @@ |
@@ -458,9 +548,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
458 | 548 | ||
459 | struct CGroupInfo { | 549 | struct CGroupInfo { |
460 | char *cgroup_path; | 550 | char *cgroup_path; |
551 | diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c | ||
552 | index a75178068b..3de06e2bd5 100644 | ||
461 | --- a/src/shared/bus-unit-util.c | 553 | --- a/src/shared/bus-unit-util.c |
462 | +++ b/src/shared/bus-unit-util.c | 554 | +++ b/src/shared/bus-unit-util.c |
463 | @@ -44,6 +44,7 @@ | 555 | @@ -45,6 +45,7 @@ |
464 | #include "unit-def.h" | 556 | #include "unit-def.h" |
465 | #include "user-util.h" | 557 | #include "user-util.h" |
466 | #include "utf8.h" | 558 | #include "utf8.h" |
@@ -468,6 +560,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
468 | 560 | ||
469 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { | 561 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { |
470 | assert(message); | 562 | assert(message); |
563 | diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c | ||
564 | index 64ca67993c..31e3d148ea 100644 | ||
471 | --- a/src/shared/bus-util.c | 565 | --- a/src/shared/bus-util.c |
472 | +++ b/src/shared/bus-util.c | 566 | +++ b/src/shared/bus-util.c |
473 | @@ -21,6 +21,7 @@ | 567 | @@ -21,6 +21,7 @@ |
@@ -478,6 +572,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
478 | 572 | ||
479 | static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { | 573 | static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { |
480 | sd_event *e = userdata; | 574 | sd_event *e = userdata; |
575 | diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c | ||
576 | index e43aa12882..cec9b413c1 100644 | ||
481 | --- a/src/shared/dns-domain.c | 577 | --- a/src/shared/dns-domain.c |
482 | +++ b/src/shared/dns-domain.c | 578 | +++ b/src/shared/dns-domain.c |
483 | @@ -17,6 +17,7 @@ | 579 | @@ -17,6 +17,7 @@ |
@@ -488,6 +584,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
488 | 584 | ||
489 | int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { | 585 | int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { |
490 | const char *n; | 586 | const char *n; |
587 | diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c | ||
588 | index b2785f0552..5f00902882 100644 | ||
491 | --- a/src/shared/journal-importer.c | 589 | --- a/src/shared/journal-importer.c |
492 | +++ b/src/shared/journal-importer.c | 590 | +++ b/src/shared/journal-importer.c |
493 | @@ -14,6 +14,7 @@ | 591 | @@ -14,6 +14,7 @@ |
@@ -498,6 +596,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
498 | 596 | ||
499 | enum { | 597 | enum { |
500 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ | 598 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ |
599 | diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c | ||
600 | index e63c59bd94..dd9773c009 100644 | ||
501 | --- a/src/shared/logs-show.c | 601 | --- a/src/shared/logs-show.c |
502 | +++ b/src/shared/logs-show.c | 602 | +++ b/src/shared/logs-show.c |
503 | @@ -41,6 +41,7 @@ | 603 | @@ -41,6 +41,7 @@ |
@@ -508,6 +608,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
508 | 608 | ||
509 | /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ | 609 | /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ |
510 | #define PRINT_LINE_THRESHOLD 3 | 610 | #define PRINT_LINE_THRESHOLD 3 |
611 | diff --git a/src/shared/pager.c b/src/shared/pager.c | ||
612 | index 4bbad7e37b..eefcdd068c 100644 | ||
511 | --- a/src/shared/pager.c | 613 | --- a/src/shared/pager.c |
512 | +++ b/src/shared/pager.c | 614 | +++ b/src/shared/pager.c |
513 | @@ -26,6 +26,7 @@ | 615 | @@ -26,6 +26,7 @@ |
@@ -518,6 +620,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
518 | 620 | ||
519 | static pid_t pager_pid = 0; | 621 | static pid_t pager_pid = 0; |
520 | 622 | ||
623 | diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c | ||
624 | index 5d5bf7f21d..f1002ffa6c 100644 | ||
521 | --- a/src/shared/uid-range.c | 625 | --- a/src/shared/uid-range.c |
522 | +++ b/src/shared/uid-range.c | 626 | +++ b/src/shared/uid-range.c |
523 | @@ -9,6 +9,7 @@ | 627 | @@ -9,6 +9,7 @@ |
@@ -528,6 +632,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
528 | 632 | ||
529 | static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { | 633 | static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { |
530 | assert(range); | 634 | assert(range); |
635 | diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c | ||
636 | index 6e3ee0d76b..7727e33d95 100644 | ||
531 | --- a/src/socket-proxy/socket-proxyd.c | 637 | --- a/src/socket-proxy/socket-proxyd.c |
532 | +++ b/src/socket-proxy/socket-proxyd.c | 638 | +++ b/src/socket-proxy/socket-proxyd.c |
533 | @@ -26,6 +26,7 @@ | 639 | @@ -26,6 +26,7 @@ |
@@ -538,6 +644,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
538 | 644 | ||
539 | #define BUFFER_SIZE (256 * 1024) | 645 | #define BUFFER_SIZE (256 * 1024) |
540 | 646 | ||
647 | diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c | ||
648 | index c9d318b8d1..fcb8d40805 100644 | ||
541 | --- a/src/test/test-hexdecoct.c | 649 | --- a/src/test/test-hexdecoct.c |
542 | +++ b/src/test/test-hexdecoct.c | 650 | +++ b/src/test/test-hexdecoct.c |
543 | @@ -6,6 +6,7 @@ | 651 | @@ -6,6 +6,7 @@ |
@@ -548,19 +656,23 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
548 | 656 | ||
549 | static void test_hexchar(void) { | 657 | static void test_hexchar(void) { |
550 | assert_se(hexchar(0xa) == 'a'); | 658 | assert_se(hexchar(0xa) == 'a'); |
659 | diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c | ||
660 | index 09cc1c3bd8..8a7d3152a7 100644 | ||
551 | --- a/src/udev/udev-builtin-path_id.c | 661 | --- a/src/udev/udev-builtin-path_id.c |
552 | +++ b/src/udev/udev-builtin-path_id.c | 662 | +++ b/src/udev/udev-builtin-path_id.c |
553 | @@ -22,6 +22,7 @@ | 663 | @@ -22,6 +22,7 @@ |
554 | #include "strv.h" | ||
555 | #include "sysexits.h" | 664 | #include "sysexits.h" |
556 | #include "udev-builtin.h" | 665 | #include "udev-builtin.h" |
666 | #include "udev-util.h" | ||
557 | +#include "missing_stdlib.h" | 667 | +#include "missing_stdlib.h" |
558 | 668 | ||
559 | _printf_(2,3) | 669 | _printf_(2,3) |
560 | static void path_prepend(char **path, const char *fmt, ...) { | 670 | static void path_prepend(char **path, const char *fmt, ...) { |
671 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c | ||
672 | index 12597194a9..208b2458b5 100644 | ||
561 | --- a/src/udev/udev-event.c | 673 | --- a/src/udev/udev-event.c |
562 | +++ b/src/udev/udev-event.c | 674 | +++ b/src/udev/udev-event.c |
563 | @@ -34,6 +34,7 @@ | 675 | @@ -33,6 +33,7 @@ |
564 | #include "udev-util.h" | 676 | #include "udev-util.h" |
565 | #include "udev-watch.h" | 677 | #include "udev-watch.h" |
566 | #include "user-util.h" | 678 | #include "user-util.h" |
@@ -568,9 +680,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
568 | 680 | ||
569 | typedef struct Spawn { | 681 | typedef struct Spawn { |
570 | sd_device *device; | 682 | sd_device *device; |
683 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c | ||
684 | index 57ede6a197..dc59857765 100644 | ||
571 | --- a/src/udev/udev-rules.c | 685 | --- a/src/udev/udev-rules.c |
572 | +++ b/src/udev/udev-rules.c | 686 | +++ b/src/udev/udev-rules.c |
573 | @@ -30,6 +30,7 @@ | 687 | @@ -31,6 +31,7 @@ |
574 | #include "udev-rules.h" | 688 | #include "udev-rules.h" |
575 | #include "user-util.h" | 689 | #include "user-util.h" |
576 | #include "virt.h" | 690 | #include "virt.h" |
@@ -578,13 +692,3 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
578 | 692 | ||
579 | #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") | 693 | #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") |
580 | 694 | ||
581 | --- a/src/basic/mountpoint-util.c | ||
582 | +++ b/src/basic/mountpoint-util.c | ||
583 | @@ -10,6 +10,7 @@ | ||
584 | #include "fs-util.h" | ||
585 | #include "missing_stat.h" | ||
586 | #include "missing_syscall.h" | ||
587 | +#include "missing_stdlib.h" | ||
588 | #include "mountpoint-util.h" | ||
589 | #include "parse-util.h" | ||
590 | #include "path-util.h" | ||