diff options
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 | 175 |
1 files changed, 94 insertions, 81 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 ca4f0d5d62..8e7a2fb6e4 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,4 +1,4 @@ | |||
1 | From 85dcaad8f38521ec3dc580794072b601900eed84 Mon Sep 17 00:00:00 2001 | 1 | From 7e771de87cf728a8678f1f28f391bba3589e2496 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] src/basic/missing.h: check for missing strndupa | 4 | Subject: [PATCH] src/basic/missing.h: check for missing strndupa |
@@ -25,6 +25,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
25 | src/basic/missing_stdlib.h | 12 ++++++++++++ | 25 | src/basic/missing_stdlib.h | 12 ++++++++++++ |
26 | src/basic/mkdir.c | 1 + | 26 | src/basic/mkdir.c | 1 + |
27 | src/basic/parse-util.c | 1 + | 27 | src/basic/parse-util.c | 1 + |
28 | src/basic/path-lookup.c | 1 + | ||
28 | src/basic/proc-cmdline.c | 1 + | 29 | src/basic/proc-cmdline.c | 1 + |
29 | src/basic/procfs-util.c | 1 + | 30 | src/basic/procfs-util.c | 1 + |
30 | src/basic/selinux-util.c | 1 + | 31 | src/basic/selinux-util.c | 1 + |
@@ -52,6 +53,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
52 | src/nss-mymachines/nss-mymachines.c | 1 + | 53 | src/nss-mymachines/nss-mymachines.c | 1 + |
53 | src/portable/portable.c | 1 + | 54 | src/portable/portable.c | 1 + |
54 | src/resolve/resolvectl.c | 1 + | 55 | src/resolve/resolvectl.c | 1 + |
56 | src/shared/bus-get-properties.c | 1 + | ||
55 | src/shared/bus-unit-procs.c | 1 + | 57 | src/shared/bus-unit-procs.c | 1 + |
56 | src/shared/bus-unit-util.c | 1 + | 58 | src/shared/bus-unit-util.c | 1 + |
57 | src/shared/bus-util.c | 1 + | 59 | src/shared/bus-util.c | 1 + |
@@ -59,20 +61,19 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
59 | src/shared/journal-importer.c | 1 + | 61 | src/shared/journal-importer.c | 1 + |
60 | src/shared/logs-show.c | 1 + | 62 | src/shared/logs-show.c | 1 + |
61 | src/shared/pager.c | 1 + | 63 | src/shared/pager.c | 1 + |
62 | src/shared/path-lookup.c | 1 + | ||
63 | src/shared/uid-range.c | 1 + | 64 | src/shared/uid-range.c | 1 + |
64 | src/socket-proxy/socket-proxyd.c | 1 + | 65 | src/socket-proxy/socket-proxyd.c | 1 + |
65 | src/test/test-hexdecoct.c | 1 + | 66 | src/test/test-hexdecoct.c | 1 + |
66 | src/udev/udev-builtin-path_id.c | 1 + | 67 | src/udev/udev-builtin-path_id.c | 1 + |
67 | src/udev/udev-event.c | 1 + | 68 | src/udev/udev-event.c | 1 + |
68 | src/udev/udev-rules.c | 1 + | 69 | src/udev/udev-rules.c | 1 + |
69 | 49 files changed, 60 insertions(+) | 70 | 50 files changed, 61 insertions(+) |
70 | 71 | ||
71 | diff --git a/meson.build b/meson.build | 72 | diff --git a/meson.build b/meson.build |
72 | index a25996803d64..72b305b5ab58 100644 | 73 | index 9187439bdd..bea9935a91 100644 |
73 | --- a/meson.build | 74 | --- a/meson.build |
74 | +++ b/meson.build | 75 | +++ b/meson.build |
75 | @@ -529,6 +529,7 @@ foreach ident : [ | 76 | @@ -527,6 +527,7 @@ foreach ident : [ |
76 | #include <unistd.h> | 77 | #include <unistd.h> |
77 | #include <signal.h> | 78 | #include <signal.h> |
78 | #include <sys/wait.h>'''], | 79 | #include <sys/wait.h>'''], |
@@ -81,7 +82,7 @@ index a25996803d64..72b305b5ab58 100644 | |||
81 | 82 | ||
82 | have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') | 83 | have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') |
83 | diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c | 84 | diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c |
84 | index 048441429025..01d74ea0ed4e 100644 | 85 | index 3a644363e1..73946a829b 100644 |
85 | --- a/src/backlight/backlight.c | 86 | --- a/src/backlight/backlight.c |
86 | +++ b/src/backlight/backlight.c | 87 | +++ b/src/backlight/backlight.c |
87 | @@ -17,6 +17,7 @@ | 88 | @@ -17,6 +17,7 @@ |
@@ -93,19 +94,19 @@ index 048441429025..01d74ea0ed4e 100644 | |||
93 | static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { | 94 | static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { |
94 | const char *subsystem, *sysname, *value; | 95 | const char *subsystem, *sysname, *value; |
95 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c | 96 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c |
96 | index 54fc6ecf8b20..a5141f4cbedd 100644 | 97 | index e94fcfad02..856a7068b0 100644 |
97 | --- a/src/basic/cgroup-util.c | 98 | --- a/src/basic/cgroup-util.c |
98 | +++ b/src/basic/cgroup-util.c | 99 | +++ b/src/basic/cgroup-util.c |
99 | @@ -37,6 +37,7 @@ | 100 | @@ -38,6 +38,7 @@ |
100 | #include "strv.h" | ||
101 | #include "unit-name.h" | 101 | #include "unit-name.h" |
102 | #include "user-util.h" | 102 | #include "user-util.h" |
103 | #include "xattr-util.h" | ||
103 | +#include "missing_stdlib.h" | 104 | +#include "missing_stdlib.h" |
104 | 105 | ||
105 | static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { | 106 | static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { |
106 | _cleanup_free_ char *fs = NULL; | 107 | _cleanup_free_ char *fs = NULL; |
107 | diff --git a/src/basic/env-util.c b/src/basic/env-util.c | 108 | diff --git a/src/basic/env-util.c b/src/basic/env-util.c |
108 | index b8dc98915f81..5049b37594bc 100644 | 109 | index b8dc98915f..5049b37594 100644 |
109 | --- a/src/basic/env-util.c | 110 | --- a/src/basic/env-util.c |
110 | +++ b/src/basic/env-util.c | 111 | +++ b/src/basic/env-util.c |
111 | @@ -15,6 +15,7 @@ | 112 | @@ -15,6 +15,7 @@ |
@@ -117,10 +118,10 @@ index b8dc98915f81..5049b37594bc 100644 | |||
117 | #define VALID_CHARS_ENV_NAME \ | 118 | #define VALID_CHARS_ENV_NAME \ |
118 | DIGITS LETTERS \ | 119 | DIGITS LETTERS \ |
119 | diff --git a/src/basic/log.c b/src/basic/log.c | 120 | diff --git a/src/basic/log.c b/src/basic/log.c |
120 | index 17557e1844b2..6cec4d324aab 100644 | 121 | index c6fe203808..b7ef932d28 100644 |
121 | --- a/src/basic/log.c | 122 | --- a/src/basic/log.c |
122 | +++ b/src/basic/log.c | 123 | +++ b/src/basic/log.c |
123 | @@ -34,6 +34,7 @@ | 124 | @@ -35,6 +35,7 @@ |
124 | #include "terminal-util.h" | 125 | #include "terminal-util.h" |
125 | #include "time-util.h" | 126 | #include "time-util.h" |
126 | #include "utf8.h" | 127 | #include "utf8.h" |
@@ -129,7 +130,7 @@ index 17557e1844b2..6cec4d324aab 100644 | |||
129 | #define SNDBUF_SIZE (8*1024*1024) | 130 | #define SNDBUF_SIZE (8*1024*1024) |
130 | 131 | ||
131 | diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h | 132 | diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h |
132 | index 188a8d44066a..1e16ec287aad 100644 | 133 | index 188a8d4406..1e16ec287a 100644 |
133 | --- a/src/basic/missing_stdlib.h | 134 | --- a/src/basic/missing_stdlib.h |
134 | +++ b/src/basic/missing_stdlib.h | 135 | +++ b/src/basic/missing_stdlib.h |
135 | @@ -11,3 +11,15 @@ | 136 | @@ -11,3 +11,15 @@ |
@@ -149,7 +150,7 @@ index 188a8d44066a..1e16ec287aad 100644 | |||
149 | + }) | 150 | + }) |
150 | +#endif | 151 | +#endif |
151 | diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c | 152 | diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c |
152 | index fa682d4c438e..37902551490a 100644 | 153 | index 6ebc2b95fd..88f4359bab 100644 |
153 | --- a/src/basic/mkdir.c | 154 | --- a/src/basic/mkdir.c |
154 | +++ b/src/basic/mkdir.c | 155 | +++ b/src/basic/mkdir.c |
155 | @@ -13,6 +13,7 @@ | 156 | @@ -13,6 +13,7 @@ |
@@ -158,22 +159,34 @@ index fa682d4c438e..37902551490a 100644 | |||
158 | #include "user-util.h" | 159 | #include "user-util.h" |
159 | +#include "missing_stdlib.h" | 160 | +#include "missing_stdlib.h" |
160 | 161 | ||
161 | int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) { | 162 | int mkdir_safe_internal( |
162 | struct stat st; | 163 | const char *path, |
163 | diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c | 164 | diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c |
164 | index e0094b0f370a..00da6518124b 100644 | 165 | index 44f0438cf4..54b4133343 100644 |
165 | --- a/src/basic/parse-util.c | 166 | --- a/src/basic/parse-util.c |
166 | +++ b/src/basic/parse-util.c | 167 | +++ b/src/basic/parse-util.c |
167 | @@ -18,6 +18,7 @@ | 168 | @@ -19,6 +19,7 @@ |
168 | #include "process-util.h" | ||
169 | #include "stat-util.h" | 169 | #include "stat-util.h" |
170 | #include "string-util.h" | 170 | #include "string-util.h" |
171 | #include "strv.h" | ||
171 | +#include "missing_stdlib.h" | 172 | +#include "missing_stdlib.h" |
172 | 173 | ||
173 | int parse_boolean(const char *v) { | 174 | int parse_boolean(const char *v) { |
174 | if (!v) | 175 | if (!v) |
176 | diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c | ||
177 | index 52968dee34..2f4f7e3dcd 100644 | ||
178 | --- a/src/basic/path-lookup.c | ||
179 | +++ b/src/basic/path-lookup.c | ||
180 | @@ -15,6 +15,7 @@ | ||
181 | #include "strv.h" | ||
182 | #include "tmpfile-util.h" | ||
183 | #include "user-util.h" | ||
184 | +#include "missing_stdlib.h" | ||
185 | |||
186 | int xdg_user_runtime_dir(char **ret, const char *suffix) { | ||
187 | const char *e; | ||
175 | diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c | 188 | diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c |
176 | index 1af58717c686..c1020f4611d4 100644 | 189 | index ba47ca5812..8baf728fde 100644 |
177 | --- a/src/basic/proc-cmdline.c | 190 | --- a/src/basic/proc-cmdline.c |
178 | +++ b/src/basic/proc-cmdline.c | 191 | +++ b/src/basic/proc-cmdline.c |
179 | @@ -15,6 +15,7 @@ | 192 | @@ -15,6 +15,7 @@ |
@@ -185,7 +198,7 @@ index 1af58717c686..c1020f4611d4 100644 | |||
185 | int proc_cmdline(char **ret) { | 198 | int proc_cmdline(char **ret) { |
186 | const char *e; | 199 | const char *e; |
187 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c | 200 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c |
188 | index 7aaf95bfced2..da7e836f143e 100644 | 201 | index 7aaf95bfce..da7e836f14 100644 |
189 | --- a/src/basic/procfs-util.c | 202 | --- a/src/basic/procfs-util.c |
190 | +++ b/src/basic/procfs-util.c | 203 | +++ b/src/basic/procfs-util.c |
191 | @@ -11,6 +11,7 @@ | 204 | @@ -11,6 +11,7 @@ |
@@ -197,10 +210,10 @@ index 7aaf95bfced2..da7e836f143e 100644 | |||
197 | int procfs_tasks_get_limit(uint64_t *ret) { | 210 | int procfs_tasks_get_limit(uint64_t *ret) { |
198 | _cleanup_free_ char *value = NULL; | 211 | _cleanup_free_ char *value = NULL; |
199 | diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c | 212 | diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c |
200 | index 1095cb426cce..806ef4bd97a9 100644 | 213 | index c94ee26bd9..14e35b4653 100644 |
201 | --- a/src/basic/selinux-util.c | 214 | --- a/src/basic/selinux-util.c |
202 | +++ b/src/basic/selinux-util.c | 215 | +++ b/src/basic/selinux-util.c |
203 | @@ -26,6 +26,7 @@ | 216 | @@ -27,6 +27,7 @@ |
204 | #include "selinux-util.h" | 217 | #include "selinux-util.h" |
205 | #include "stdio-util.h" | 218 | #include "stdio-util.h" |
206 | #include "time-util.h" | 219 | #include "time-util.h" |
@@ -209,7 +222,7 @@ index 1095cb426cce..806ef4bd97a9 100644 | |||
209 | #if HAVE_SELINUX | 222 | #if HAVE_SELINUX |
210 | DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); | 223 | DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); |
211 | diff --git a/src/basic/time-util.c b/src/basic/time-util.c | 224 | diff --git a/src/basic/time-util.c b/src/basic/time-util.c |
212 | index 105584e2e72f..eb0bed47dac3 100644 | 225 | index 15cc1b8851..02bb3f01f9 100644 |
213 | --- a/src/basic/time-util.c | 226 | --- a/src/basic/time-util.c |
214 | +++ b/src/basic/time-util.c | 227 | +++ b/src/basic/time-util.c |
215 | @@ -26,6 +26,7 @@ | 228 | @@ -26,6 +26,7 @@ |
@@ -221,7 +234,7 @@ index 105584e2e72f..eb0bed47dac3 100644 | |||
221 | static clockid_t map_clock_id(clockid_t c) { | 234 | static clockid_t map_clock_id(clockid_t c) { |
222 | 235 | ||
223 | diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c | 236 | diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c |
224 | index b96e1f927fff..cba979baca3e 100644 | 237 | index b96e1f927f..cba979baca 100644 |
225 | --- a/src/boot/bless-boot.c | 238 | --- a/src/boot/bless-boot.c |
226 | +++ b/src/boot/bless-boot.c | 239 | +++ b/src/boot/bless-boot.c |
227 | @@ -18,6 +18,7 @@ | 240 | @@ -18,6 +18,7 @@ |
@@ -233,7 +246,7 @@ index b96e1f927fff..cba979baca3e 100644 | |||
233 | static char **arg_path = NULL; | 246 | static char **arg_path = NULL; |
234 | 247 | ||
235 | diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c | 248 | diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c |
236 | index 27dc9e43c3e2..b1a83023600b 100644 | 249 | index b7d2e32639..fdbc1df95e 100644 |
237 | --- a/src/core/dbus-cgroup.c | 250 | --- a/src/core/dbus-cgroup.c |
238 | +++ b/src/core/dbus-cgroup.c | 251 | +++ b/src/core/dbus-cgroup.c |
239 | @@ -15,6 +15,7 @@ | 252 | @@ -15,6 +15,7 @@ |
@@ -245,7 +258,7 @@ index 27dc9e43c3e2..b1a83023600b 100644 | |||
245 | BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); | 258 | BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); |
246 | 259 | ||
247 | diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c | 260 | diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c |
248 | index d8ba3e5d9241..729e13fda64c 100644 | 261 | index 50f7ada8ce..5c760ee487 100644 |
249 | --- a/src/core/dbus-execute.c | 262 | --- a/src/core/dbus-execute.c |
250 | +++ b/src/core/dbus-execute.c | 263 | +++ b/src/core/dbus-execute.c |
251 | @@ -41,6 +41,7 @@ | 264 | @@ -41,6 +41,7 @@ |
@@ -257,7 +270,7 @@ index d8ba3e5d9241..729e13fda64c 100644 | |||
257 | BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); | 270 | BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); |
258 | static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); | 271 | static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); |
259 | diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c | 272 | diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c |
260 | index 7862beaacb6d..3b1ea53a5f0d 100644 | 273 | index 951450e53d..50d134e9a1 100644 |
261 | --- a/src/core/dbus-util.c | 274 | --- a/src/core/dbus-util.c |
262 | +++ b/src/core/dbus-util.c | 275 | +++ b/src/core/dbus-util.c |
263 | @@ -7,6 +7,7 @@ | 276 | @@ -7,6 +7,7 @@ |
@@ -269,10 +282,10 @@ index 7862beaacb6d..3b1ea53a5f0d 100644 | |||
269 | int bus_property_get_triggered_unit( | 282 | int bus_property_get_triggered_unit( |
270 | sd_bus *bus, | 283 | sd_bus *bus, |
271 | diff --git a/src/core/execute.c b/src/core/execute.c | 284 | diff --git a/src/core/execute.c b/src/core/execute.c |
272 | index 89dbf6fbd2c1..9762dc57443c 100644 | 285 | index 2a4840a3a9..d3f1e0e0f8 100644 |
273 | --- a/src/core/execute.c | 286 | --- a/src/core/execute.c |
274 | +++ b/src/core/execute.c | 287 | +++ b/src/core/execute.c |
275 | @@ -88,6 +88,7 @@ | 288 | @@ -89,6 +89,7 @@ |
276 | #include "unit.h" | 289 | #include "unit.h" |
277 | #include "user-util.h" | 290 | #include "user-util.h" |
278 | #include "utmp-wtmp.h" | 291 | #include "utmp-wtmp.h" |
@@ -281,7 +294,7 @@ index 89dbf6fbd2c1..9762dc57443c 100644 | |||
281 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) | 294 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) |
282 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) | 295 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) |
283 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | 296 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c |
284 | index 09ccd613e32c..f4e64fa283e9 100644 | 297 | index 09ccd613e3..f4e64fa283 100644 |
285 | --- a/src/core/kmod-setup.c | 298 | --- a/src/core/kmod-setup.c |
286 | +++ b/src/core/kmod-setup.c | 299 | +++ b/src/core/kmod-setup.c |
287 | @@ -11,6 +11,7 @@ | 300 | @@ -11,6 +11,7 @@ |
@@ -293,7 +306,7 @@ index 09ccd613e32c..f4e64fa283e9 100644 | |||
293 | #if HAVE_KMOD | 306 | #if HAVE_KMOD |
294 | #include "module-util.h" | 307 | #include "module-util.h" |
295 | diff --git a/src/core/service.c b/src/core/service.c | 308 | diff --git a/src/core/service.c b/src/core/service.c |
296 | index 17f27a4abce3..e5dcc532d0ce 100644 | 309 | index 00e61945ba..1ecab28354 100644 |
297 | --- a/src/core/service.c | 310 | --- a/src/core/service.c |
298 | +++ b/src/core/service.c | 311 | +++ b/src/core/service.c |
299 | @@ -41,6 +41,7 @@ | 312 | @@ -41,6 +41,7 @@ |
@@ -305,7 +318,7 @@ index 17f27a4abce3..e5dcc532d0ce 100644 | |||
305 | static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { | 318 | static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { |
306 | [SERVICE_DEAD] = UNIT_INACTIVE, | 319 | [SERVICE_DEAD] = UNIT_INACTIVE, |
307 | diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c | 320 | diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c |
308 | index 35885dfb47c4..bb9f0660a6a0 100644 | 321 | index 35885dfb47..bb9f0660a6 100644 |
309 | --- a/src/coredump/coredump-vacuum.c | 322 | --- a/src/coredump/coredump-vacuum.c |
310 | +++ b/src/coredump/coredump-vacuum.c | 323 | +++ b/src/coredump/coredump-vacuum.c |
311 | @@ -16,6 +16,7 @@ | 324 | @@ -16,6 +16,7 @@ |
@@ -317,7 +330,7 @@ index 35885dfb47c4..bb9f0660a6a0 100644 | |||
317 | #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ | 330 | #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ |
318 | #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ | 331 | #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ |
319 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c | 332 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c |
320 | index 88e42d3a984b..0f08376e5399 100644 | 333 | index 77dfdefd64..e21ecbeff8 100644 |
321 | --- a/src/journal-remote/journal-remote-main.c | 334 | --- a/src/journal-remote/journal-remote-main.c |
322 | +++ b/src/journal-remote/journal-remote-main.c | 335 | +++ b/src/journal-remote/journal-remote-main.c |
323 | @@ -22,6 +22,7 @@ | 336 | @@ -22,6 +22,7 @@ |
@@ -329,7 +342,7 @@ index 88e42d3a984b..0f08376e5399 100644 | |||
329 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" | 342 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" |
330 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" | 343 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" |
331 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c | 344 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c |
332 | index e5feec83bce6..c3aec1e219d7 100644 | 345 | index 8d4897b942..15476b3c83 100644 |
333 | --- a/src/journal/journalctl.c | 346 | --- a/src/journal/journalctl.c |
334 | +++ b/src/journal/journalctl.c | 347 | +++ b/src/journal/journalctl.c |
335 | @@ -69,6 +69,7 @@ | 348 | @@ -69,6 +69,7 @@ |
@@ -341,7 +354,7 @@ index e5feec83bce6..c3aec1e219d7 100644 | |||
341 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) | 354 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) |
342 | #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ | 355 | #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ |
343 | diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c | 356 | diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c |
344 | index 3fa98dfda237..e655d77e714a 100644 | 357 | index 6fb0abb419..2d94d9938e 100644 |
345 | --- a/src/journal/sd-journal.c | 358 | --- a/src/journal/sd-journal.c |
346 | +++ b/src/journal/sd-journal.c | 359 | +++ b/src/journal/sd-journal.c |
347 | @@ -40,6 +40,7 @@ | 360 | @@ -40,6 +40,7 @@ |
@@ -353,7 +366,7 @@ index 3fa98dfda237..e655d77e714a 100644 | |||
353 | #define JOURNAL_FILES_MAX 7168 | 366 | #define JOURNAL_FILES_MAX 7168 |
354 | 367 | ||
355 | diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c | 368 | diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c |
356 | index 73127dfe0253..cc8635dea591 100644 | 369 | index 55e35cd902..0ed98f9224 100644 |
357 | --- a/src/libsystemd/sd-bus/bus-message.c | 370 | --- a/src/libsystemd/sd-bus/bus-message.c |
358 | +++ b/src/libsystemd/sd-bus/bus-message.c | 371 | +++ b/src/libsystemd/sd-bus/bus-message.c |
359 | @@ -21,6 +21,7 @@ | 372 | @@ -21,6 +21,7 @@ |
@@ -365,7 +378,7 @@ index 73127dfe0253..cc8635dea591 100644 | |||
365 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); | 378 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); |
366 | 379 | ||
367 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c | 380 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c |
368 | index 6d140348ec4c..9126b8801bc5 100644 | 381 | index 6abac8822c..c74c9cd7fa 100644 |
369 | --- a/src/libsystemd/sd-bus/bus-objects.c | 382 | --- a/src/libsystemd/sd-bus/bus-objects.c |
370 | +++ b/src/libsystemd/sd-bus/bus-objects.c | 383 | +++ b/src/libsystemd/sd-bus/bus-objects.c |
371 | @@ -13,6 +13,7 @@ | 384 | @@ -13,6 +13,7 @@ |
@@ -377,7 +390,7 @@ index 6d140348ec4c..9126b8801bc5 100644 | |||
377 | static int node_vtable_get_userdata( | 390 | static int node_vtable_get_userdata( |
378 | sd_bus *bus, | 391 | sd_bus *bus, |
379 | diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c | 392 | diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c |
380 | index 18d30d010a20..be2ab703f8ed 100644 | 393 | index fc7e8e844a..7af4dd2712 100644 |
381 | --- a/src/libsystemd/sd-bus/bus-socket.c | 394 | --- a/src/libsystemd/sd-bus/bus-socket.c |
382 | +++ b/src/libsystemd/sd-bus/bus-socket.c | 395 | +++ b/src/libsystemd/sd-bus/bus-socket.c |
383 | @@ -28,6 +28,7 @@ | 396 | @@ -28,6 +28,7 @@ |
@@ -389,7 +402,7 @@ index 18d30d010a20..be2ab703f8ed 100644 | |||
389 | #define SNDBUF_SIZE (8*1024*1024) | 402 | #define SNDBUF_SIZE (8*1024*1024) |
390 | 403 | ||
391 | diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c | 404 | diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c |
392 | index 7ad03680f48d..b9d2181e4910 100644 | 405 | index 9de5e454a6..fe86c93c63 100644 |
393 | --- a/src/libsystemd/sd-bus/sd-bus.c | 406 | --- a/src/libsystemd/sd-bus/sd-bus.c |
394 | +++ b/src/libsystemd/sd-bus/sd-bus.c | 407 | +++ b/src/libsystemd/sd-bus/sd-bus.c |
395 | @@ -41,6 +41,7 @@ | 408 | @@ -41,6 +41,7 @@ |
@@ -401,7 +414,7 @@ index 7ad03680f48d..b9d2181e4910 100644 | |||
401 | #define log_debug_bus_message(m) \ | 414 | #define log_debug_bus_message(m) \ |
402 | do { \ | 415 | do { \ |
403 | diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c | 416 | diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c |
404 | index 8de0a859ee94..58044b6ba908 100644 | 417 | index 8de0a859ee..58044b6ba9 100644 |
405 | --- a/src/libsystemd/sd-bus/test-bus-benchmark.c | 418 | --- a/src/libsystemd/sd-bus/test-bus-benchmark.c |
406 | +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c | 419 | +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c |
407 | @@ -14,6 +14,7 @@ | 420 | @@ -14,6 +14,7 @@ |
@@ -413,7 +426,7 @@ index 8de0a859ee94..58044b6ba908 100644 | |||
413 | #define MAX_SIZE (2*1024*1024) | 426 | #define MAX_SIZE (2*1024*1024) |
414 | 427 | ||
415 | diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c | 428 | diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c |
416 | index 30669a9359e5..6544b3722099 100644 | 429 | index 233d081300..40a32b9700 100644 |
417 | --- a/src/locale/keymap-util.c | 430 | --- a/src/locale/keymap-util.c |
418 | +++ b/src/locale/keymap-util.c | 431 | +++ b/src/locale/keymap-util.c |
419 | @@ -21,6 +21,7 @@ | 432 | @@ -21,6 +21,7 @@ |
@@ -425,7 +438,7 @@ index 30669a9359e5..6544b3722099 100644 | |||
425 | static bool startswith_comma(const char *s, const char *prefix) { | 438 | static bool startswith_comma(const char *s, const char *prefix) { |
426 | s = startswith(s, prefix); | 439 | s = startswith(s, prefix); |
427 | diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c | 440 | diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c |
428 | index 84bea21ab7be..49720c7f742e 100644 | 441 | index 16f4289585..6c5e438b36 100644 |
429 | --- a/src/login/pam_systemd.c | 442 | --- a/src/login/pam_systemd.c |
430 | +++ b/src/login/pam_systemd.c | 443 | +++ b/src/login/pam_systemd.c |
431 | @@ -31,6 +31,7 @@ | 444 | @@ -31,6 +31,7 @@ |
@@ -437,7 +450,7 @@ index 84bea21ab7be..49720c7f742e 100644 | |||
437 | #include "parse-util.h" | 450 | #include "parse-util.h" |
438 | #include "path-util.h" | 451 | #include "path-util.h" |
439 | diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c | 452 | diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c |
440 | index bed1e42697c4..e4847c2beea2 100644 | 453 | index bed1e42697..e4847c2bee 100644 |
441 | --- a/src/network/generator/network-generator.c | 454 | --- a/src/network/generator/network-generator.c |
442 | +++ b/src/network/generator/network-generator.c | 455 | +++ b/src/network/generator/network-generator.c |
443 | @@ -13,6 +13,7 @@ | 456 | @@ -13,6 +13,7 @@ |
@@ -449,7 +462,7 @@ index bed1e42697c4..e4847c2beea2 100644 | |||
449 | /* | 462 | /* |
450 | # .network | 463 | # .network |
451 | diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c | 464 | diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c |
452 | index 5fb5b49bbcc3..785ccc2da307 100644 | 465 | index d341fa25aa..91646bc2c2 100644 |
453 | --- a/src/nspawn/nspawn-settings.c | 466 | --- a/src/nspawn/nspawn-settings.c |
454 | +++ b/src/nspawn/nspawn-settings.c | 467 | +++ b/src/nspawn/nspawn-settings.c |
455 | @@ -16,6 +16,7 @@ | 468 | @@ -16,6 +16,7 @@ |
@@ -461,19 +474,19 @@ index 5fb5b49bbcc3..785ccc2da307 100644 | |||
461 | Settings *settings_new(void) { | 474 | Settings *settings_new(void) { |
462 | Settings *s; | 475 | Settings *s; |
463 | diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c | 476 | diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c |
464 | index 364356da5622..47d4ea44e40f 100644 | 477 | index 5db0dcef76..681f8677e4 100644 |
465 | --- a/src/nss-mymachines/nss-mymachines.c | 478 | --- a/src/nss-mymachines/nss-mymachines.c |
466 | +++ b/src/nss-mymachines/nss-mymachines.c | 479 | +++ b/src/nss-mymachines/nss-mymachines.c |
467 | @@ -19,6 +19,7 @@ | 480 | @@ -19,6 +19,7 @@ |
481 | #include "nss-util.h" | ||
468 | #include "signal-util.h" | 482 | #include "signal-util.h" |
469 | #include "string-util.h" | 483 | #include "string-util.h" |
470 | #include "user-util.h" | ||
471 | +#include "missing_stdlib.h" | 484 | +#include "missing_stdlib.h" |
472 | 485 | ||
473 | NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); | 486 | NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); |
474 | NSS_GETPW_PROTOTYPES(mymachines); | 487 | NSS_GETPW_PROTOTYPES(mymachines); |
475 | diff --git a/src/portable/portable.c b/src/portable/portable.c | 488 | diff --git a/src/portable/portable.c b/src/portable/portable.c |
476 | index e18826ab2685..d9f4b81d8937 100644 | 489 | index 3a1367ec2b..f29336cb1e 100644 |
477 | --- a/src/portable/portable.c | 490 | --- a/src/portable/portable.c |
478 | +++ b/src/portable/portable.c | 491 | +++ b/src/portable/portable.c |
479 | @@ -31,6 +31,7 @@ | 492 | @@ -31,6 +31,7 @@ |
@@ -485,10 +498,10 @@ index e18826ab2685..d9f4b81d8937 100644 | |||
485 | static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); | 498 | static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); |
486 | 499 | ||
487 | diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c | 500 | diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c |
488 | index f20e8c44b8bc..9f6c4e8f49a7 100644 | 501 | index 3072b984e5..c46ae374bf 100644 |
489 | --- a/src/resolve/resolvectl.c | 502 | --- a/src/resolve/resolvectl.c |
490 | +++ b/src/resolve/resolvectl.c | 503 | +++ b/src/resolve/resolvectl.c |
491 | @@ -33,6 +33,7 @@ | 504 | @@ -36,6 +36,7 @@ |
492 | #include "strv.h" | 505 | #include "strv.h" |
493 | #include "terminal-util.h" | 506 | #include "terminal-util.h" |
494 | #include "verbs.h" | 507 | #include "verbs.h" |
@@ -496,8 +509,20 @@ index f20e8c44b8bc..9f6c4e8f49a7 100644 | |||
496 | 509 | ||
497 | static int arg_family = AF_UNSPEC; | 510 | static int arg_family = AF_UNSPEC; |
498 | static int arg_ifindex = 0; | 511 | static int arg_ifindex = 0; |
512 | diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c | ||
513 | index 8ad4694046..da5082c02a 100644 | ||
514 | --- a/src/shared/bus-get-properties.c | ||
515 | +++ b/src/shared/bus-get-properties.c | ||
516 | @@ -3,6 +3,7 @@ | ||
517 | #include "bus-get-properties.h" | ||
518 | #include "rlimit-util.h" | ||
519 | #include "string-util.h" | ||
520 | +#include "missing_stdlib.h" | ||
521 | |||
522 | int bus_property_get_bool( | ||
523 | sd_bus *bus, | ||
499 | diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c | 524 | diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c |
500 | index b21fe393265f..af2640005c1d 100644 | 525 | index b21fe39326..af2640005c 100644 |
501 | --- a/src/shared/bus-unit-procs.c | 526 | --- a/src/shared/bus-unit-procs.c |
502 | +++ b/src/shared/bus-unit-procs.c | 527 | +++ b/src/shared/bus-unit-procs.c |
503 | @@ -10,6 +10,7 @@ | 528 | @@ -10,6 +10,7 @@ |
@@ -509,10 +534,10 @@ index b21fe393265f..af2640005c1d 100644 | |||
509 | struct CGroupInfo { | 534 | struct CGroupInfo { |
510 | char *cgroup_path; | 535 | char *cgroup_path; |
511 | diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c | 536 | diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c |
512 | index 28d85944a8a7..4743a84a417e 100644 | 537 | index f2652ed9a5..eb019fc89f 100644 |
513 | --- a/src/shared/bus-unit-util.c | 538 | --- a/src/shared/bus-unit-util.c |
514 | +++ b/src/shared/bus-unit-util.c | 539 | +++ b/src/shared/bus-unit-util.c |
515 | @@ -34,6 +34,7 @@ | 540 | @@ -39,6 +39,7 @@ |
516 | #include "unit-def.h" | 541 | #include "unit-def.h" |
517 | #include "user-util.h" | 542 | #include "user-util.h" |
518 | #include "utf8.h" | 543 | #include "utf8.h" |
@@ -521,19 +546,19 @@ index 28d85944a8a7..4743a84a417e 100644 | |||
521 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { | 546 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { |
522 | assert(message); | 547 | assert(message); |
523 | diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c | 548 | diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c |
524 | index 8e6a6e2ce2de..0cbf4b1997df 100644 | 549 | index 77c1c62182..5cd31f3c15 100644 |
525 | --- a/src/shared/bus-util.c | 550 | --- a/src/shared/bus-util.c |
526 | +++ b/src/shared/bus-util.c | 551 | +++ b/src/shared/bus-util.c |
527 | @@ -30,6 +30,7 @@ | 552 | @@ -22,6 +22,7 @@ |
553 | #include "socket-util.h" | ||
528 | #include "stdio-util.h" | 554 | #include "stdio-util.h" |
529 | #include "strv.h" | 555 | /* #include "string-util.h" */ |
530 | #include "user-util.h" | ||
531 | +#include "missing_stdlib.h" | 556 | +#include "missing_stdlib.h" |
532 | 557 | ||
533 | static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { | 558 | static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { |
534 | sd_event *e = userdata; | 559 | sd_event *e = userdata; |
535 | diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c | 560 | diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c |
536 | index b812665315f6..8e68f7f8fc6c 100644 | 561 | index b812665315..8e68f7f8fc 100644 |
537 | --- a/src/shared/dns-domain.c | 562 | --- a/src/shared/dns-domain.c |
538 | +++ b/src/shared/dns-domain.c | 563 | +++ b/src/shared/dns-domain.c |
539 | @@ -23,6 +23,7 @@ | 564 | @@ -23,6 +23,7 @@ |
@@ -545,7 +570,7 @@ index b812665315f6..8e68f7f8fc6c 100644 | |||
545 | int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { | 570 | int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { |
546 | const char *n; | 571 | const char *n; |
547 | diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c | 572 | diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c |
548 | index 7c4fc7021dec..3fbaf5a63969 100644 | 573 | index 7c4fc7021d..3fbaf5a639 100644 |
549 | --- a/src/shared/journal-importer.c | 574 | --- a/src/shared/journal-importer.c |
550 | +++ b/src/shared/journal-importer.c | 575 | +++ b/src/shared/journal-importer.c |
551 | @@ -14,6 +14,7 @@ | 576 | @@ -14,6 +14,7 @@ |
@@ -557,19 +582,19 @@ index 7c4fc7021dec..3fbaf5a63969 100644 | |||
557 | enum { | 582 | enum { |
558 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ | 583 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ |
559 | diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c | 584 | diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c |
560 | index 2bfd0b60c26b..6a1bb3a0760f 100644 | 585 | index 899e894ab7..628854ac9c 100644 |
561 | --- a/src/shared/logs-show.c | 586 | --- a/src/shared/logs-show.c |
562 | +++ b/src/shared/logs-show.c | 587 | +++ b/src/shared/logs-show.c |
563 | @@ -39,6 +39,7 @@ | 588 | @@ -41,6 +41,7 @@ |
564 | #include "time-util.h" | ||
565 | #include "utf8.h" | 589 | #include "utf8.h" |
566 | #include "util.h" | 590 | #include "util.h" |
591 | #include "web-util.h" | ||
567 | +#include "missing_stdlib.h" | 592 | +#include "missing_stdlib.h" |
568 | 593 | ||
569 | /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ | 594 | /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ |
570 | #define PRINT_LINE_THRESHOLD 3 | 595 | #define PRINT_LINE_THRESHOLD 3 |
571 | diff --git a/src/shared/pager.c b/src/shared/pager.c | 596 | diff --git a/src/shared/pager.c b/src/shared/pager.c |
572 | index 1fe9db179176..67954b5cab93 100644 | 597 | index e03be6d23b..50e3d1f75c 100644 |
573 | --- a/src/shared/pager.c | 598 | --- a/src/shared/pager.c |
574 | +++ b/src/shared/pager.c | 599 | +++ b/src/shared/pager.c |
575 | @@ -23,6 +23,7 @@ | 600 | @@ -23,6 +23,7 @@ |
@@ -580,20 +605,8 @@ index 1fe9db179176..67954b5cab93 100644 | |||
580 | 605 | ||
581 | static pid_t pager_pid = 0; | 606 | static pid_t pager_pid = 0; |
582 | 607 | ||
583 | diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c | ||
584 | index 5b1620974536..0e7cd1c2af12 100644 | ||
585 | --- a/src/shared/path-lookup.c | ||
586 | +++ b/src/shared/path-lookup.c | ||
587 | @@ -19,6 +19,7 @@ | ||
588 | #include "tmpfile-util.h" | ||
589 | #include "user-util.h" | ||
590 | #include "util.h" | ||
591 | +#include "missing_stdlib.h" | ||
592 | |||
593 | int xdg_user_runtime_dir(char **ret, const char *suffix) { | ||
594 | const char *e; | ||
595 | diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c | 608 | diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c |
596 | index 7cb7d8a477e9..8e7d7f9e7ca6 100644 | 609 | index 7cb7d8a477..8e7d7f9e7c 100644 |
597 | --- a/src/shared/uid-range.c | 610 | --- a/src/shared/uid-range.c |
598 | +++ b/src/shared/uid-range.c | 611 | +++ b/src/shared/uid-range.c |
599 | @@ -9,6 +9,7 @@ | 612 | @@ -9,6 +9,7 @@ |
@@ -605,7 +618,7 @@ index 7cb7d8a477e9..8e7d7f9e7ca6 100644 | |||
605 | static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { | 618 | static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { |
606 | assert(range); | 619 | assert(range); |
607 | diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c | 620 | diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c |
608 | index 2ee6fc2f0a6a..4a9934f9c14d 100644 | 621 | index b461aead60..9941695ed9 100644 |
609 | --- a/src/socket-proxy/socket-proxyd.c | 622 | --- a/src/socket-proxy/socket-proxyd.c |
610 | +++ b/src/socket-proxy/socket-proxyd.c | 623 | +++ b/src/socket-proxy/socket-proxyd.c |
611 | @@ -26,6 +26,7 @@ | 624 | @@ -26,6 +26,7 @@ |
@@ -617,7 +630,7 @@ index 2ee6fc2f0a6a..4a9934f9c14d 100644 | |||
617 | #define BUFFER_SIZE (256 * 1024) | 630 | #define BUFFER_SIZE (256 * 1024) |
618 | 631 | ||
619 | diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c | 632 | diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c |
620 | index 52217429b154..70708dedf318 100644 | 633 | index 52217429b1..70708dedf3 100644 |
621 | --- a/src/test/test-hexdecoct.c | 634 | --- a/src/test/test-hexdecoct.c |
622 | +++ b/src/test/test-hexdecoct.c | 635 | +++ b/src/test/test-hexdecoct.c |
623 | @@ -6,6 +6,7 @@ | 636 | @@ -6,6 +6,7 @@ |
@@ -629,7 +642,7 @@ index 52217429b154..70708dedf318 100644 | |||
629 | static void test_hexchar(void) { | 642 | static void test_hexchar(void) { |
630 | assert_se(hexchar(0xa) == 'a'); | 643 | assert_se(hexchar(0xa) == 'a'); |
631 | diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c | 644 | diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c |
632 | index ca38f5608791..9d8cf4d2807b 100644 | 645 | index 6c020ac0ed..10723ec46c 100644 |
633 | --- a/src/udev/udev-builtin-path_id.c | 646 | --- a/src/udev/udev-builtin-path_id.c |
634 | +++ b/src/udev/udev-builtin-path_id.c | 647 | +++ b/src/udev/udev-builtin-path_id.c |
635 | @@ -22,6 +22,7 @@ | 648 | @@ -22,6 +22,7 @@ |
@@ -641,7 +654,7 @@ index ca38f5608791..9d8cf4d2807b 100644 | |||
641 | _printf_(2,3) | 654 | _printf_(2,3) |
642 | static void path_prepend(char **path, const char *fmt, ...) { | 655 | static void path_prepend(char **path, const char *fmt, ...) { |
643 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c | 656 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c |
644 | index eb51139e519c..977cc16e9d7c 100644 | 657 | index e1c2baf7f2..62d4086802 100644 |
645 | --- a/src/udev/udev-event.c | 658 | --- a/src/udev/udev-event.c |
646 | +++ b/src/udev/udev-event.c | 659 | +++ b/src/udev/udev-event.c |
647 | @@ -34,6 +34,7 @@ | 660 | @@ -34,6 +34,7 @@ |
@@ -653,7 +666,7 @@ index eb51139e519c..977cc16e9d7c 100644 | |||
653 | typedef struct Spawn { | 666 | typedef struct Spawn { |
654 | sd_device *device; | 667 | sd_device *device; |
655 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c | 668 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c |
656 | index b9b350d1ef7a..2c114cc77572 100644 | 669 | index c36f032f66..36970813d8 100644 |
657 | --- a/src/udev/udev-rules.c | 670 | --- a/src/udev/udev-rules.c |
658 | +++ b/src/udev/udev-rules.c | 671 | +++ b/src/udev/udev-rules.c |
659 | @@ -30,6 +30,7 @@ | 672 | @@ -30,6 +30,7 @@ |