diff options
author | Yureka Lilian <yuka@yuka.dev> | 2023-03-21 08:46:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-23 22:36:46 +0000 |
commit | ab7a9262a5616b299579c686428da028f72250a2 (patch) | |
tree | 2444cd01d5b53e36abb12f191e8980ed81f791ed /meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch | |
parent | 13c1529b70345b0446482e8952e0b4b452bce7b1 (diff) | |
download | poky-ab7a9262a5616b299579c686428da028f72250a2.tar.gz |
systemd: rebase musl patches
(From OE-Core rev: f34f6ab04b443608497b73668365819343d0c2fe)
Signed-off-by: Yureka Lilian <yuka@yuka.dev>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch | 419 |
1 files changed, 0 insertions, 419 deletions
diff --git a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch deleted file mode 100644 index f9c7ced947..0000000000 --- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch +++ /dev/null | |||
@@ -1,419 +0,0 @@ | |||
1 | From 3d9910dcda697b1e361bba49c99050ee0d116742 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Sat, 22 May 2021 20:26:24 +0200 | ||
4 | Subject: [PATCH] add fallback parse_printf_format implementation | ||
5 | |||
6 | Upstream-Status: Inappropriate [musl specific] | ||
7 | |||
8 | Signed-off-by: Emil Renner Berthing <systemd@esmil.dk> | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
11 | [rebased for systemd 243] | ||
12 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | ||
13 | |||
14 | --- | ||
15 | meson.build | 1 + | ||
16 | src/basic/meson.build | 5 + | ||
17 | src/basic/parse-printf-format.c | 273 +++++++++++++++++++++++ | ||
18 | src/basic/parse-printf-format.h | 57 +++++ | ||
19 | src/basic/stdio-util.h | 2 +- | ||
20 | src/libsystemd/sd-journal/journal-send.c | 2 +- | ||
21 | 6 files changed, 338 insertions(+), 2 deletions(-) | ||
22 | create mode 100644 src/basic/parse-printf-format.c | ||
23 | create mode 100644 src/basic/parse-printf-format.h | ||
24 | |||
25 | --- a/meson.build | ||
26 | +++ b/meson.build | ||
27 | @@ -739,6 +739,7 @@ endif | ||
28 | foreach header : ['crypt.h', | ||
29 | 'linux/memfd.h', | ||
30 | 'linux/vm_sockets.h', | ||
31 | + 'printf.h', | ||
32 | 'sys/auxv.h', | ||
33 | 'valgrind/memcheck.h', | ||
34 | 'valgrind/valgrind.h', | ||
35 | --- a/src/basic/meson.build | ||
36 | +++ b/src/basic/meson.build | ||
37 | @@ -337,6 +337,11 @@ endforeach | ||
38 | |||
39 | basic_sources += generated_gperf_headers | ||
40 | |||
41 | +if conf.get('HAVE_PRINTF_H') != 1 | ||
42 | + basic_sources += [files('parse-printf-format.c')] | ||
43 | +endif | ||
44 | + | ||
45 | + | ||
46 | ############################################################ | ||
47 | |||
48 | arch_list = [ | ||
49 | --- /dev/null | ||
50 | +++ b/src/basic/parse-printf-format.c | ||
51 | @@ -0,0 +1,273 @@ | ||
52 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ | ||
53 | + | ||
54 | +/*** | ||
55 | + This file is part of systemd. | ||
56 | + | ||
57 | + Copyright 2014 Emil Renner Berthing <systemd@esmil.dk> | ||
58 | + | ||
59 | + With parts from the musl C library | ||
60 | + Copyright 2005-2014 Rich Felker, et al. | ||
61 | + | ||
62 | + systemd is free software; you can redistribute it and/or modify it | ||
63 | + under the terms of the GNU Lesser General Public License as published by | ||
64 | + the Free Software Foundation; either version 2.1 of the License, or | ||
65 | + (at your option) any later version. | ||
66 | + | ||
67 | + systemd is distributed in the hope that it will be useful, but | ||
68 | + WITHOUT ANY WARRANTY; without even the implied warranty of | ||
69 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
70 | + Lesser General Public License for more details. | ||
71 | + | ||
72 | + You should have received a copy of the GNU Lesser General Public License | ||
73 | + along with systemd; If not, see <http://www.gnu.org/licenses/>. | ||
74 | +***/ | ||
75 | + | ||
76 | +#include <stddef.h> | ||
77 | +#include <string.h> | ||
78 | + | ||
79 | +#include "parse-printf-format.h" | ||
80 | + | ||
81 | +static const char *consume_nonarg(const char *fmt) | ||
82 | +{ | ||
83 | + do { | ||
84 | + if (*fmt == '\0') | ||
85 | + return fmt; | ||
86 | + } while (*fmt++ != '%'); | ||
87 | + return fmt; | ||
88 | +} | ||
89 | + | ||
90 | +static const char *consume_num(const char *fmt) | ||
91 | +{ | ||
92 | + for (;*fmt >= '0' && *fmt <= '9'; fmt++) | ||
93 | + /* do nothing */; | ||
94 | + return fmt; | ||
95 | +} | ||
96 | + | ||
97 | +static const char *consume_argn(const char *fmt, size_t *arg) | ||
98 | +{ | ||
99 | + const char *p = fmt; | ||
100 | + size_t val = 0; | ||
101 | + | ||
102 | + if (*p < '1' || *p > '9') | ||
103 | + return fmt; | ||
104 | + do { | ||
105 | + val = 10*val + (*p++ - '0'); | ||
106 | + } while (*p >= '0' && *p <= '9'); | ||
107 | + | ||
108 | + if (*p != '$') | ||
109 | + return fmt; | ||
110 | + *arg = val; | ||
111 | + return p+1; | ||
112 | +} | ||
113 | + | ||
114 | +static const char *consume_flags(const char *fmt) | ||
115 | +{ | ||
116 | + while (1) { | ||
117 | + switch (*fmt) { | ||
118 | + case '#': | ||
119 | + case '0': | ||
120 | + case '-': | ||
121 | + case ' ': | ||
122 | + case '+': | ||
123 | + case '\'': | ||
124 | + case 'I': | ||
125 | + fmt++; | ||
126 | + continue; | ||
127 | + } | ||
128 | + return fmt; | ||
129 | + } | ||
130 | +} | ||
131 | + | ||
132 | +enum state { | ||
133 | + BARE, | ||
134 | + LPRE, | ||
135 | + LLPRE, | ||
136 | + HPRE, | ||
137 | + HHPRE, | ||
138 | + BIGLPRE, | ||
139 | + ZTPRE, | ||
140 | + JPRE, | ||
141 | + STOP | ||
142 | +}; | ||
143 | + | ||
144 | +enum type { | ||
145 | + NONE, | ||
146 | + PTR, | ||
147 | + INT, | ||
148 | + UINT, | ||
149 | + ULLONG, | ||
150 | + LONG, | ||
151 | + ULONG, | ||
152 | + SHORT, | ||
153 | + USHORT, | ||
154 | + CHAR, | ||
155 | + UCHAR, | ||
156 | + LLONG, | ||
157 | + SIZET, | ||
158 | + IMAX, | ||
159 | + UMAX, | ||
160 | + PDIFF, | ||
161 | + UIPTR, | ||
162 | + DBL, | ||
163 | + LDBL, | ||
164 | + MAXTYPE | ||
165 | +}; | ||
166 | + | ||
167 | +static const short pa_types[MAXTYPE] = { | ||
168 | + [NONE] = PA_INT, | ||
169 | + [PTR] = PA_POINTER, | ||
170 | + [INT] = PA_INT, | ||
171 | + [UINT] = PA_INT, | ||
172 | + [ULLONG] = PA_INT | PA_FLAG_LONG_LONG, | ||
173 | + [LONG] = PA_INT | PA_FLAG_LONG, | ||
174 | + [ULONG] = PA_INT | PA_FLAG_LONG, | ||
175 | + [SHORT] = PA_INT | PA_FLAG_SHORT, | ||
176 | + [USHORT] = PA_INT | PA_FLAG_SHORT, | ||
177 | + [CHAR] = PA_CHAR, | ||
178 | + [UCHAR] = PA_CHAR, | ||
179 | + [LLONG] = PA_INT | PA_FLAG_LONG_LONG, | ||
180 | + [SIZET] = PA_INT | PA_FLAG_LONG, | ||
181 | + [IMAX] = PA_INT | PA_FLAG_LONG_LONG, | ||
182 | + [UMAX] = PA_INT | PA_FLAG_LONG_LONG, | ||
183 | + [PDIFF] = PA_INT | PA_FLAG_LONG_LONG, | ||
184 | + [UIPTR] = PA_INT | PA_FLAG_LONG, | ||
185 | + [DBL] = PA_DOUBLE, | ||
186 | + [LDBL] = PA_DOUBLE | PA_FLAG_LONG_DOUBLE | ||
187 | +}; | ||
188 | + | ||
189 | +#define S(x) [(x)-'A'] | ||
190 | +#define E(x) (STOP + (x)) | ||
191 | + | ||
192 | +static const unsigned char states[]['z'-'A'+1] = { | ||
193 | + { /* 0: bare types */ | ||
194 | + S('d') = E(INT), S('i') = E(INT), | ||
195 | + S('o') = E(UINT),S('u') = E(UINT),S('x') = E(UINT), S('X') = E(UINT), | ||
196 | + S('e') = E(DBL), S('f') = E(DBL), S('g') = E(DBL), S('a') = E(DBL), | ||
197 | + S('E') = E(DBL), S('F') = E(DBL), S('G') = E(DBL), S('A') = E(DBL), | ||
198 | + S('c') = E(CHAR),S('C') = E(INT), | ||
199 | + S('s') = E(PTR), S('S') = E(PTR), S('p') = E(UIPTR),S('n') = E(PTR), | ||
200 | + S('m') = E(NONE), | ||
201 | + S('l') = LPRE, S('h') = HPRE, S('L') = BIGLPRE, | ||
202 | + S('z') = ZTPRE, S('j') = JPRE, S('t') = ZTPRE | ||
203 | + }, { /* 1: l-prefixed */ | ||
204 | + S('d') = E(LONG), S('i') = E(LONG), | ||
205 | + S('o') = E(ULONG),S('u') = E(ULONG),S('x') = E(ULONG),S('X') = E(ULONG), | ||
206 | + S('e') = E(DBL), S('f') = E(DBL), S('g') = E(DBL), S('a') = E(DBL), | ||
207 | + S('E') = E(DBL), S('F') = E(DBL), S('G') = E(DBL), S('A') = E(DBL), | ||
208 | + S('c') = E(INT), S('s') = E(PTR), S('n') = E(PTR), | ||
209 | + S('l') = LLPRE | ||
210 | + }, { /* 2: ll-prefixed */ | ||
211 | + S('d') = E(LLONG), S('i') = E(LLONG), | ||
212 | + S('o') = E(ULLONG),S('u') = E(ULLONG), | ||
213 | + S('x') = E(ULLONG),S('X') = E(ULLONG), | ||
214 | + S('n') = E(PTR) | ||
215 | + }, { /* 3: h-prefixed */ | ||
216 | + S('d') = E(SHORT), S('i') = E(SHORT), | ||
217 | + S('o') = E(USHORT),S('u') = E(USHORT), | ||
218 | + S('x') = E(USHORT),S('X') = E(USHORT), | ||
219 | + S('n') = E(PTR), | ||
220 | + S('h') = HHPRE | ||
221 | + }, { /* 4: hh-prefixed */ | ||
222 | + S('d') = E(CHAR), S('i') = E(CHAR), | ||
223 | + S('o') = E(UCHAR),S('u') = E(UCHAR), | ||
224 | + S('x') = E(UCHAR),S('X') = E(UCHAR), | ||
225 | + S('n') = E(PTR) | ||
226 | + }, { /* 5: L-prefixed */ | ||
227 | + S('e') = E(LDBL),S('f') = E(LDBL),S('g') = E(LDBL), S('a') = E(LDBL), | ||
228 | + S('E') = E(LDBL),S('F') = E(LDBL),S('G') = E(LDBL), S('A') = E(LDBL), | ||
229 | + S('n') = E(PTR) | ||
230 | + }, { /* 6: z- or t-prefixed (assumed to be same size) */ | ||
231 | + S('d') = E(PDIFF),S('i') = E(PDIFF), | ||
232 | + S('o') = E(SIZET),S('u') = E(SIZET), | ||
233 | + S('x') = E(SIZET),S('X') = E(SIZET), | ||
234 | + S('n') = E(PTR) | ||
235 | + }, { /* 7: j-prefixed */ | ||
236 | + S('d') = E(IMAX), S('i') = E(IMAX), | ||
237 | + S('o') = E(UMAX), S('u') = E(UMAX), | ||
238 | + S('x') = E(UMAX), S('X') = E(UMAX), | ||
239 | + S('n') = E(PTR) | ||
240 | + } | ||
241 | +}; | ||
242 | + | ||
243 | +size_t parse_printf_format(const char *fmt, size_t n, int *types) | ||
244 | +{ | ||
245 | + size_t i = 0; | ||
246 | + size_t last = 0; | ||
247 | + | ||
248 | + memset(types, 0, n); | ||
249 | + | ||
250 | + while (1) { | ||
251 | + size_t arg; | ||
252 | + unsigned int state; | ||
253 | + | ||
254 | + fmt = consume_nonarg(fmt); | ||
255 | + if (*fmt == '\0') | ||
256 | + break; | ||
257 | + if (*fmt == '%') { | ||
258 | + fmt++; | ||
259 | + continue; | ||
260 | + } | ||
261 | + arg = 0; | ||
262 | + fmt = consume_argn(fmt, &arg); | ||
263 | + /* flags */ | ||
264 | + fmt = consume_flags(fmt); | ||
265 | + /* width */ | ||
266 | + if (*fmt == '*') { | ||
267 | + size_t warg = 0; | ||
268 | + fmt = consume_argn(fmt+1, &warg); | ||
269 | + if (warg == 0) | ||
270 | + warg = ++i; | ||
271 | + if (warg > last) | ||
272 | + last = warg; | ||
273 | + if (warg <= n && types[warg-1] == NONE) | ||
274 | + types[warg-1] = INT; | ||
275 | + } else | ||
276 | + fmt = consume_num(fmt); | ||
277 | + /* precision */ | ||
278 | + if (*fmt == '.') { | ||
279 | + fmt++; | ||
280 | + if (*fmt == '*') { | ||
281 | + size_t parg = 0; | ||
282 | + fmt = consume_argn(fmt+1, &parg); | ||
283 | + if (parg == 0) | ||
284 | + parg = ++i; | ||
285 | + if (parg > last) | ||
286 | + last = parg; | ||
287 | + if (parg <= n && types[parg-1] == NONE) | ||
288 | + types[parg-1] = INT; | ||
289 | + } else { | ||
290 | + if (*fmt == '-') | ||
291 | + fmt++; | ||
292 | + fmt = consume_num(fmt); | ||
293 | + } | ||
294 | + } | ||
295 | + /* length modifier and conversion specifier */ | ||
296 | + state = BARE; | ||
297 | + do { | ||
298 | + unsigned char c = *fmt++; | ||
299 | + | ||
300 | + if (c < 'A' || c > 'z') | ||
301 | + continue; | ||
302 | + state = states[state]S(c); | ||
303 | + if (state == 0) | ||
304 | + continue; | ||
305 | + } while (state < STOP); | ||
306 | + | ||
307 | + if (state == E(NONE)) | ||
308 | + continue; | ||
309 | + | ||
310 | + if (arg == 0) | ||
311 | + arg = ++i; | ||
312 | + if (arg > last) | ||
313 | + last = arg; | ||
314 | + if (arg <= n) | ||
315 | + types[arg-1] = state - STOP; | ||
316 | + } | ||
317 | + | ||
318 | + if (last > n) | ||
319 | + last = n; | ||
320 | + for (i = 0; i < last; i++) | ||
321 | + types[i] = pa_types[types[i]]; | ||
322 | + | ||
323 | + return last; | ||
324 | +} | ||
325 | --- /dev/null | ||
326 | +++ b/src/basic/parse-printf-format.h | ||
327 | @@ -0,0 +1,57 @@ | ||
328 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ | ||
329 | + | ||
330 | +/*** | ||
331 | + This file is part of systemd. | ||
332 | + | ||
333 | + Copyright 2014 Emil Renner Berthing <systemd@esmil.dk> | ||
334 | + | ||
335 | + With parts from the GNU C Library | ||
336 | + Copyright 1991-2014 Free Software Foundation, Inc. | ||
337 | + | ||
338 | + systemd is free software; you can redistribute it and/or modify it | ||
339 | + under the terms of the GNU Lesser General Public License as published by | ||
340 | + the Free Software Foundation; either version 2.1 of the License, or | ||
341 | + (at your option) any later version. | ||
342 | + | ||
343 | + systemd is distributed in the hope that it will be useful, but | ||
344 | + WITHOUT ANY WARRANTY; without even the implied warranty of | ||
345 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
346 | + Lesser General Public License for more details. | ||
347 | + | ||
348 | + You should have received a copy of the GNU Lesser General Public License | ||
349 | + along with systemd; If not, see <http://www.gnu.org/licenses/>. | ||
350 | +***/ | ||
351 | + | ||
352 | +#pragma once | ||
353 | + | ||
354 | +#include "config.h" | ||
355 | + | ||
356 | +#if HAVE_PRINTF_H | ||
357 | +#include <printf.h> | ||
358 | +#else | ||
359 | + | ||
360 | +#include <stddef.h> | ||
361 | + | ||
362 | +enum { /* C type: */ | ||
363 | + PA_INT, /* int */ | ||
364 | + PA_CHAR, /* int, cast to char */ | ||
365 | + PA_WCHAR, /* wide char */ | ||
366 | + PA_STRING, /* const char *, a '\0'-terminated string */ | ||
367 | + PA_WSTRING, /* const wchar_t *, wide character string */ | ||
368 | + PA_POINTER, /* void * */ | ||
369 | + PA_FLOAT, /* float */ | ||
370 | + PA_DOUBLE, /* double */ | ||
371 | + PA_LAST | ||
372 | +}; | ||
373 | + | ||
374 | +/* Flag bits that can be set in a type returned by `parse_printf_format'. */ | ||
375 | +#define PA_FLAG_MASK 0xff00 | ||
376 | +#define PA_FLAG_LONG_LONG (1 << 8) | ||
377 | +#define PA_FLAG_LONG_DOUBLE PA_FLAG_LONG_LONG | ||
378 | +#define PA_FLAG_LONG (1 << 9) | ||
379 | +#define PA_FLAG_SHORT (1 << 10) | ||
380 | +#define PA_FLAG_PTR (1 << 11) | ||
381 | + | ||
382 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); | ||
383 | + | ||
384 | +#endif /* HAVE_PRINTF_H */ | ||
385 | --- a/src/basic/stdio-util.h | ||
386 | +++ b/src/basic/stdio-util.h | ||
387 | @@ -1,13 +1,13 @@ | ||
388 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
389 | #pragma once | ||
390 | |||
391 | -#include <printf.h> | ||
392 | #include <stdarg.h> | ||
393 | #include <stdio.h> | ||
394 | #include <sys/types.h> | ||
395 | |||
396 | #include "macro.h" | ||
397 | #include "memory-util.h" | ||
398 | +#include "parse-printf-format.h" | ||
399 | |||
400 | #define snprintf_ok(buf, len, fmt, ...) \ | ||
401 | ({ \ | ||
402 | --- a/src/libsystemd/sd-journal/journal-send.c | ||
403 | +++ b/src/libsystemd/sd-journal/journal-send.c | ||
404 | @@ -2,7 +2,6 @@ | ||
405 | |||
406 | #include <errno.h> | ||
407 | #include <fcntl.h> | ||
408 | -#include <printf.h> | ||
409 | #include <stddef.h> | ||
410 | #include <sys/un.h> | ||
411 | #include <unistd.h> | ||
412 | @@ -25,6 +24,7 @@ | ||
413 | #include "stdio-util.h" | ||
414 | #include "string-util.h" | ||
415 | #include "tmpfile-util.h" | ||
416 | +#include "parse-printf-format.h" | ||
417 | |||
418 | #define SNDBUF_SIZE (8*1024*1024) | ||
419 | |||