From fd41e50650e78feb6115e963053525c9d5da66b8 Mon Sep 17 00:00:00 2001 From: Alexander Miroshnichenko Date: Thu, 17 Jun 2021 17:32:15 +0300 Subject: [PATCH] Allow building on musl libc Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Alexander Miroshnichenko --- meson.build | 2 + src/backlight/backlight.c | 1 + src/basic/arphrd-list.c | 2 +- src/basic/cgroup-util.c | 11 +- src/basic/env-util.c | 1 + src/basic/format-util.h | 8 +- src/basic/fs-util.h | 23 +- src/basic/glob-util.c | 12 + src/basic/linux/if_ether.h | 1 + src/basic/log.c | 1 + src/basic/meson.build | 5 + src/basic/missing_prctl.h | 2 + src/basic/missing_stdlib.h | 12 + src/basic/missing_syscall.h | 6 + src/basic/missing_type.h | 30 ++ src/basic/mkdir.c | 1 + src/basic/mountpoint-util.c | 1 + src/basic/parse-printf-format.c | 273 ++++++++++++++++++ src/basic/parse-printf-format.h | 57 ++++ src/basic/parse-util.c | 1 + src/basic/path-lookup.c | 1 + src/basic/percent-util.c | 1 + src/basic/proc-cmdline.c | 1 + src/basic/process-util.c | 9 +- src/basic/procfs-util.c | 5 +- src/basic/rlimit-util.c | 12 +- src/basic/selinux-util.c | 1 + src/basic/smack-util.c | 2 +- src/basic/sort-util.h | 15 +- src/basic/stdio-util.h | 2 +- src/basic/sysctl-util.c | 2 +- src/basic/time-util.c | 1 + src/basic/util.c | 2 +- src/binfmt/binfmt.c | 6 +- src/boot/bless-boot.c | 1 + src/core/dbus-cgroup.c | 1 + src/core/dbus-execute.c | 1 + src/core/dbus-util.c | 1 + src/core/execute.c | 5 +- src/core/kmod-setup.c | 2 + src/core/main.c | 4 +- src/core/service.c | 1 + src/core/smack-setup.c | 8 +- src/coredump/coredump-vacuum.c | 1 + src/hibernate-resume/hibernate-resume.c | 2 +- src/journal-remote/journal-remote-main.c | 1 + src/journal/journalctl.c | 1 + src/libsystemd-network/sd-dhcp6-client.c | 1 - src/libsystemd/sd-bus/bus-error.c | 9 +- src/libsystemd/sd-bus/bus-message.c | 1 + src/libsystemd/sd-bus/bus-objects.c | 1 + src/libsystemd/sd-bus/bus-socket.c | 1 + src/libsystemd/sd-bus/sd-bus.c | 1 + src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + src/libsystemd/sd-device/sd-device.c | 2 +- src/libsystemd/sd-hwdb/hwdb-util.c | 19 +- src/libsystemd/sd-journal/catalog.c | 1 + src/libsystemd/sd-journal/journal-send.c | 7 +- src/libsystemd/sd-journal/sd-journal.c | 1 + src/libsystemd/sd-netlink/netlink-types.c | 1 + src/locale/keymap-util.c | 1 + src/login/logind-dbus.c | 2 +- src/login/pam_systemd.c | 1 + src/machine/machine-dbus.c | 6 + src/network/generator/network-generator.c | 1 + src/network/netdev/bond.c | 1 + src/network/netdev/bridge.c | 1 + src/network/netdev/macsec.c | 1 + src/network/netdev/netdev-gperf.gperf | 1 + src/network/netdev/netdev.c | 1 + src/network/networkd-brvlan.c | 1 + src/network/networkd-dhcp-common.c | 4 +- src/network/networkd-dhcp-server.c | 4 +- src/network/networkd-dhcp4.c | 2 +- src/network/networkd-dhcp6.c | 2 +- src/network/networkd-link.c | 2 +- src/network/networkd-network.c | 1 + src/network/networkd-route.c | 5 +- src/network/test-network-tables.c | 1 + src/nspawn/nspawn-cgroup.c | 2 +- src/nspawn/nspawn-settings.c | 1 + src/nspawn/nspawn.c | 8 +- src/nss-mymachines/nss-mymachines.c | 1 + src/partition/makefs.c | 1 + src/portable/portable.c | 1 + src/resolve/resolvectl.c | 1 + src/shared/base-filesystem.c | 6 +- src/shared/bus-get-properties.c | 1 + src/shared/bus-unit-procs.c | 1 + src/shared/bus-unit-util.c | 1 + src/shared/bus-util.c | 1 + src/shared/cgroup-setup.c | 4 +- src/shared/cpu-set-util.h | 2 + src/shared/dns-domain.c | 1 + src/shared/ethtool-util.c | 1 + src/shared/ethtool-util.h | 1 + src/shared/format-table.c | 36 ++- src/shared/journal-importer.c | 1 + src/shared/logs-show.c | 1 + src/shared/mount-setup.c | 1 + src/shared/pager.c | 1 + src/shared/tpm2-util.c | 1 + src/shared/uid-range.c | 1 + src/shared/user-record-nss.c | 20 ++ src/shared/user-record-nss.h | 4 + src/shared/userdb.c | 6 + src/sleep/sleep.c | 8 +- src/socket-proxy/socket-proxyd.c | 1 + src/systemctl/systemd-sysv-install.SKELETON | 6 +- .../systemd-sysv-install.SKELETON.orig | 51 ++++ src/test/test-arphrd-list.c | 2 +- src/test/test-glob-util.c | 16 + src/test/test-hexdecoct.c | 1 + src/test/test-json.c | 4 + src/test/test-parse-argument.c | 1 + src/test/test-sizeof.c | 6 +- src/tmpfiles/tmpfiles.c | 10 + src/udev/net/link-config.c | 1 + src/udev/udev-builtin-net_setup_link.c | 1 + src/udev/udev-builtin-path_id.c | 1 + src/udev/udev-event.c | 1 + src/udev/udev-rules.c | 1 + src/vconsole/vconsole-setup.c | 2 +- 123 files changed, 738 insertions(+), 104 deletions(-) create mode 100644 src/basic/parse-printf-format.c create mode 100644 src/basic/parse-printf-format.h create mode 100755 src/systemctl/systemd-sysv-install.SKELETON.orig diff --git a/meson.build b/meson.build index 27186d63a3c6..c97f09062bde 100644 --- a/meson.build +++ b/meson.build @@ -550,6 +550,7 @@ foreach ident : [ ['execveat', '''#include '''], ['close_range', '''#include '''], ['epoll_pwait2', '''#include '''], + ['strndupa' , '''#include '''], ] have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') @@ -675,6 +676,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h', + 'printf.h', 'sys/auxv.h', 'valgrind/memcheck.h', 'valgrind/valgrind.h', diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c index 86927be62e98..a34be158a0be 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -19,6 +19,7 @@ #include "string-util.h" #include "strv.h" #include "util.h" +#include "missing_stdlib.h" static int help(void) { _cleanup_free_ char *link = NULL; diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c index 99048d20c80c..bdfe37ac812f 100644 --- a/src/basic/arphrd-list.c +++ b/src/basic/arphrd-list.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include +#include #include #include "arphrd-list.h" diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 8dd3f8cd9501..5b40e92163b8 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -38,6 +38,7 @@ #include "unit-name.h" #include "user-util.h" #include "xattr-util.h" +#include "missing_stdlib.h" static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { _cleanup_free_ char *fs = NULL; @@ -764,7 +765,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (isempty(sc)) { - r = write_string_file(fs, agent, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(fs, agent, 0); if (r < 0) return r; } else if (!path_equal(sc, agent)) @@ -782,7 +783,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (streq(sc, "0")) { - r = write_string_file(fs, "1", WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(fs, "1", 0); if (r < 0) return r; @@ -809,7 +810,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; - r = write_string_file(fs, "0", WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(fs, "0", 0); if (r < 0) return r; @@ -819,7 +820,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; - r = write_string_file(fs, "", WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(fs, "", 0); if (r < 0) return r; @@ -1649,7 +1650,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri if (r < 0) return r; - return write_string_file(p, value, WRITE_STRING_FILE_DISABLE_BUFFER); + return write_string_file(p, value, 0); } int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { diff --git a/src/basic/env-util.c b/src/basic/env-util.c index c110a750a55d..e1f091b01e51 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -18,6 +18,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" +#include "missing_stdlib.h" /* We follow bash for the character set. Different shells have different rules. */ #define VALID_BASH_ENV_NAME_CHARS \ diff --git a/src/basic/format-util.h b/src/basic/format-util.h index b7e18768e392..3195ab205dbd 100644 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h @@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); # define PRI_TIMEX "li" #endif -#if SIZEOF_RLIM_T == 8 -# define RLIM_FMT "%" PRIu64 -#elif SIZEOF_RLIM_T == 4 -# define RLIM_FMT "%" PRIu32 -#else -# error Unknown rlim_t size -#endif +#define RLIM_FMT "%ju" #if SIZEOF_DEV_T == 8 # define DEV_FMT "%" PRIu64 diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h index 027037f7a724..16eb379caf89 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -44,8 +44,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); int fd_warn_permissions(const char *path, int fd); int stat_warn_permissions(const char *path, const struct stat *st); -#define laccess(path, mode) \ - (faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) < 0 ? -errno : 0) +/* + Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to + do and it's not portable (not supported by musl). See: + + http://lists.landley.net/pipermail/toybox-landley.net/2014-September/003610.html + http://www.openwall.com/lists/musl/2015/02/05/2 + + Note that laccess() is never passing AT_EACCESS so a lot of the discussion in + the links above doesn't apply. Note also that (currently) all systemd callers + of laccess() pass mode as F_OK, so only check for existence of a file, not + access permissions. Therefore, in this case, the only distiction between + faccessat() with (flag == 0) and (flag == AT_SYMLINK_NOFOLLOW) is the + behaviour for broken symlinks; laccess() on a broken symlink will succeed + with (flag == AT_SYMLINK_NOFOLLOW) and fail (flag == 0). + + The laccess() macros was added to systemd some time ago and it's not clear if + or why it needs to return success for broken symlinks. Maybe just historical + and not actually necessary or desired behaviour? +*/ + +#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), 0) int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); int touch(const char *path); diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c index bc0278e57f5d..c973f82e5451 100644 --- a/src/basic/glob-util.c +++ b/src/basic/glob-util.c @@ -12,6 +12,12 @@ #include "path-util.h" #include "strv.h" +/* Don't fail if the standard library + * doesn't provide brace expansion */ +#ifndef GLOB_BRACE +#define GLOB_BRACE 0 +#endif + static void closedir_wrapper(void* v) { (void) closedir(v); } @@ -19,6 +25,7 @@ static void closedir_wrapper(void* v) { int safe_glob(const char *path, int flags, glob_t *pglob) { int k; +#ifdef GLOB_ALTDIRFUNC /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ assert(!(flags & GLOB_ALTDIRFUNC)); @@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { pglob->gl_lstat = lstat; if (!pglob->gl_stat) pglob->gl_stat = stat; +#endif errno = 0; +#ifdef GLOB_ALTDIRFUNC k = glob(path, flags | GLOB_ALTDIRFUNC, NULL, pglob); +#else + k = glob(path, flags, NULL, pglob); +#endif if (k == GLOB_NOMATCH) return -ENOENT; if (k == GLOB_NOSPACE) diff --git a/src/basic/linux/if_ether.h b/src/basic/linux/if_ether.h index d6de2b167448..108d1b889af3 100644 --- a/src/basic/linux/if_ether.h +++ b/src/basic/linux/if_ether.h @@ -23,6 +23,7 @@ #define _UAPI_LINUX_IF_ETHER_H #include +#include /* * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble diff --git a/src/basic/log.c b/src/basic/log.c index 595db0c395ac..daff8eb68a05 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -36,6 +36,7 @@ #include "terminal-util.h" #include "time-util.h" #include "utf8.h" +#include "missing_stdlib.h" #define SNDBUF_SIZE (8*1024*1024) diff --git a/src/basic/meson.build b/src/basic/meson.build index 60ef801a2530..aba2172edd7b 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -341,6 +341,11 @@ endforeach basic_sources += generated_gperf_headers +if conf.get('HAVE_PRINTF_H') != 1 + basic_sources += [files('parse-printf-format.c')] +endif + + ############################################################ arch_list = [ diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h index ab851306bac6..5547cad87505 100644 --- a/src/basic/missing_prctl.h +++ b/src/basic/missing_prctl.h @@ -1,7 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#ifdef __GLIBC__ #include +#endif /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ #ifndef PR_CAP_AMBIENT diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h index 8c76f93eb2f4..9068bfb4f0f7 100644 --- a/src/basic/missing_stdlib.h +++ b/src/basic/missing_stdlib.h @@ -11,3 +11,15 @@ # error "neither secure_getenv nor __secure_getenv are available" # endif #endif + +/* string.h */ +#if ! HAVE_STRNDUPA +#define strndupa(s, n) \ + ({ \ + const char *__old = (s); \ + size_t __len = strnlen(__old, (n)); \ + char *__new = (char *)alloca(__len + 1); \ + __new[__len] = '\0'; \ + (char *)memcpy(__new, __old, __len); \ + }) +#endif diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h index 13843248045a..0202d0037272 100644 --- a/src/basic/missing_syscall.h +++ b/src/basic/missing_syscall.h @@ -20,6 +20,12 @@ #include #endif +#ifndef _MIPS_SIM_ABI32 +#define _MIPS_SIM_ABI32 1 +#define _MIPS_SIM_NABI32 2 +#define _MIPS_SIM_ABI64 3 +#endif + #include "missing_keyctl.h" #include "missing_stat.h" #include "missing_syscall_def.h" diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h index f6233090a905..697aa7f58a9c 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -10,3 +10,33 @@ #if !HAVE_CHAR16_T #define char16_t uint16_t #endif + +#ifndef __GLIBC__ +typedef int (*comparison_fn_t)(const void *, const void *); +typedef int (*__compar_d_fn_t) (const void *, const void *, void *); +#endif + +#ifndef __COMPAR_FN_T +#define __COMPAR_FN_T +typedef int (*__compar_fn_t)(const void *, const void *); +#endif + +#ifndef FTW_ACTIONRETVAL +#define FTW_ACTIONRETVAL 16 +#endif + +#ifndef FTW_CONTINUE +#define FTW_CONTINUE 0 +#endif + +#ifndef FTW_STOP +#define FTW_STOP 1 +#endif + +#ifndef FTW_SKIP_SUBTREE +#define FTW_SKIP_SUBTREE 2 +#endif + +#ifndef FTW_SKIP_SIBLINGS +#define FTW_SKIP_SIBLINGS 3 +#endif diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c index f91f8f7a089a..fb3159621667 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c @@ -14,6 +14,7 @@ #include "stat-util.h" #include "stdio-util.h" #include "user-util.h" +#include "missing_stdlib.h" int mkdir_safe_internal( const char *path, diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c index 1d617e87b276..346f9a47d7b4 100644 --- a/src/basic/mountpoint-util.c +++ b/src/basic/mountpoint-util.c @@ -12,6 +12,7 @@ #include "missing_stat.h" #include "missing_syscall.h" #include "mkdir.h" +#include "missing_stdlib.h" #include "mountpoint-util.h" #include "parse-util.h" #include "path-util.h" diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c new file mode 100644 index 000000000000..49437e544540 --- /dev/null +++ b/src/basic/parse-printf-format.c @@ -0,0 +1,273 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2014 Emil Renner Berthing + + With parts from the musl C library + Copyright 2005-2014 Rich Felker, et al. + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include +#include + +#include "parse-printf-format.h" + +static const char *consume_nonarg(const char *fmt) +{ + do { + if (*fmt == '\0') + return fmt; + } while (*fmt++ != '%'); + return fmt; +} + +static const char *consume_num(const char *fmt) +{ + for (;*fmt >= '0' && *fmt <= '9'; fmt++) + /* do nothing */; + return fmt; +} + +static const char *consume_argn(const char *fmt, size_t *arg) +{ + const char *p = fmt; + size_t val = 0; + + if (*p < '1' || *p > '9') + return fmt; + do { + val = 10*val + (*p++ - '0'); + } while (*p >= '0' && *p <= '9'); + + if (*p != '$') + return fmt; + *arg = val; + return p+1; +} + +static const char *consume_flags(const char *fmt) +{ + while (1) { + switch (*fmt) { + case '#': + case '0': + case '-': + case ' ': + case '+': + case '\'': + case 'I': + fmt++; + continue; + } + return fmt; + } +} + +enum state { + BARE, + LPRE, + LLPRE, + HPRE, + HHPRE, + BIGLPRE, + ZTPRE, + JPRE, + STOP +}; + +enum type { + NONE, + PTR, + INT, + UINT, + ULLONG, + LONG, + ULONG, + SHORT, + USHORT, + CHAR, + UCHAR, + LLONG, + SIZET, + IMAX, + UMAX, + PDIFF, + UIPTR, + DBL, + LDBL, + MAXTYPE +}; + +static const short pa_types[MAXTYPE] = { + [NONE] = PA_INT, + [PTR] = PA_POINTER, + [INT] = PA_INT, + [UINT] = PA_INT, + [ULLONG] = PA_INT | PA_FLAG_LONG_LONG, + [LONG] = PA_INT | PA_FLAG_LONG, + [ULONG] = PA_INT | PA_FLAG_LONG, + [SHORT] = PA_INT | PA_FLAG_SHORT, + [USHORT] = PA_INT | PA_FLAG_SHORT, + [CHAR] = PA_CHAR, + [UCHAR] = PA_CHAR, + [LLONG] = PA_INT | PA_FLAG_LONG_LONG, + [SIZET] = PA_INT | PA_FLAG_LONG, + [IMAX] = PA_INT | PA_FLAG_LONG_LONG, + [UMAX] = PA_INT | PA_FLAG_LONG_LONG, + [PDIFF] = PA_INT | PA_FLAG_LONG_LONG, + [UIPTR] = PA_INT | PA_FLAG_LONG, + [DBL] = PA_DOUBLE, + [LDBL] = PA_DOUBLE | PA_FLAG_LONG_DOUBLE +}; + +#define S(x) [(x)-'A'] +#define E(x) (STOP + (x)) + +static const unsigned char states[]['z'-'A'+1] = { + { /* 0: bare types */ + S('d') = E(INT), S('i') = E(INT), + S('o') = E(UINT),S('u') = E(UINT),S('x') = E(UINT), S('X') = E(UINT), + S('e') = E(DBL), S('f') = E(DBL), S('g') = E(DBL), S('a') = E(DBL), + S('E') = E(DBL), S('F') = E(DBL), S('G') = E(DBL), S('A') = E(DBL), + S('c') = E(CHAR),S('C') = E(INT), + S('s') = E(PTR), S('S') = E(PTR), S('p') = E(UIPTR),S('n') = E(PTR), + S('m') = E(NONE), + S('l') = LPRE, S('h') = HPRE, S('L') = BIGLPRE, + S('z') = ZTPRE, S('j') = JPRE, S('t') = ZTPRE + }, { /* 1: l-prefixed */ + S('d') = E(LONG), S('i') = E(LONG), + S('o') = E(ULONG),S('u') = E(ULONG),S('x') = E(ULONG),S('X') = E(ULONG), + S('e') = E(DBL), S('f') = E(DBL), S('g') = E(DBL), S('a') = E(DBL), + S('E') = E(DBL), S('F') = E(DBL), S('G') = E(DBL), S('A') = E(DBL), + S('c') = E(INT), S('s') = E(PTR), S('n') = E(PTR), + S('l') = LLPRE + }, { /* 2: ll-prefixed */ + S('d') = E(LLONG), S('i') = E(LLONG), + S('o') = E(ULLONG),S('u') = E(ULLONG), + S('x') = E(ULLONG),S('X') = E(ULLONG), + S('n') = E(PTR) + }, { /* 3: h-prefixed */ + S('d') = E(SHORT), S('i') = E(SHORT), + S('o') = E(USHORT),S('u') = E(USHORT), + S('x') = E(USHORT),S('X') = E(USHORT), + S('n') = E(PTR), + S('h') = HHPRE + }, { /* 4: hh-prefixed */ + S('d') = E(CHAR), S('i') = E(CHAR), + S('o') = E(UCHAR),S('u') = E(UCHAR), + S('x') = E(UCHAR),S('X') = E(UCHAR), + S('n') = E(PTR) + }, { /* 5: L-prefixed */ + S('e') = E(LDBL),S('f') = E(LDBL),S('g') = E(LDBL), S('a') = E(LDBL), + S('E') = E(LDBL),S('F') = E(LDBL),S('G') = E(LDBL), S('A') = E(LDBL), + S('n') = E(PTR) + }, { /* 6: z- or t-prefixed (assumed to be same size) */ + S('d') = E(PDIFF),S('i') = E(PDIFF), + S('o') = E(SIZET),S('u') = E(SIZET), + S('x') = E(SIZET),S('X') = E(SIZET), + S('n') = E(PTR) + }, { /* 7: j-prefixed */ + S('d') = E(IMAX), S('i') = E(IMAX), + S('o') = E(UMAX), S('u') = E(UMAX), + S('x') = E(UMAX), S('X') = E(UMAX), + S('n') = E(PTR) + } +}; + +size_t parse_printf_format(const char *fmt, size_t n, int *types) +{ + size_t i = 0; + size_t last = 0; + + memset(types, 0, n); + + while (1) { + size_t arg; + unsigned int state; + + fmt = consume_nonarg(fmt); + if (*fmt == '\0') + break; + if (*fmt == '%') { + fmt++; + continue; + } + arg = 0; + fmt = consume_argn(fmt, &arg); + /* flags */ + fmt = consume_flags(fmt); + /* width */ + if (*fmt == '*') { + size_t warg = 0; + fmt = consume_argn(fmt+1, &warg); + if (warg == 0) + warg = ++i; + if (warg > last) + last = warg; + if (warg <= n && types[warg-1] == NONE) + types[warg-1] = INT; + } else + fmt = consume_num(fmt); + /* precision */ + if (*fmt == '.') { + fmt++; + if (*fmt == '*') { + size_t parg = 0; + fmt = consume_argn(fmt+1, &parg); + if (parg == 0) + parg = ++i; + if (parg > last) + last = parg; + if (parg <= n && types[parg-1] == NONE) + types[parg-1] = INT; + } else { + if (*fmt == '-') + fmt++; + fmt = consume_num(fmt); + } + } + /* length modifier and conversion specifier */ + state = BARE; + do { + unsigned char c = *fmt++; + + if (c < 'A' || c > 'z') + continue; + state = states[state]S(c); + if (state == 0) + continue; + } while (state < STOP); + + if (state == E(NONE)) + continue; + + if (arg == 0) + arg = ++i; + if (arg > last) + last = arg; + if (arg <= n) + types[arg-1] = state - STOP; + } + + if (last > n) + last = n; + for (i = 0; i < last; i++) + types[i] = pa_types[types[i]]; + + return last; +} diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h new file mode 100644 index 000000000000..47be7522d7fa --- /dev/null +++ b/src/basic/parse-printf-format.h @@ -0,0 +1,57 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2014 Emil Renner Berthing + + With parts from the GNU C Library + Copyright 1991-2014 Free Software Foundation, Inc. + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#pragma once + +#include "config.h" + +#if HAVE_PRINTF_H +#include +#else + +#include + +enum { /* C type: */ + PA_INT, /* int */ + PA_CHAR, /* int, cast to char */ + PA_WCHAR, /* wide char */ + PA_STRING, /* const char *, a '\0'-terminated string */ + PA_WSTRING, /* const wchar_t *, wide character string */ + PA_POINTER, /* void * */ + PA_FLOAT, /* float */ + PA_DOUBLE, /* double */ + PA_LAST +}; + +/* Flag bits that can be set in a type returned by `parse_printf_format'. */ +#define PA_FLAG_MASK 0xff00 +#define PA_FLAG_LONG_LONG (1 << 8) +#define PA_FLAG_LONG_DOUBLE PA_FLAG_LONG_LONG +#define PA_FLAG_LONG (1 << 9) +#define PA_FLAG_SHORT (1 << 10) +#define PA_FLAG_PTR (1 << 11) + +size_t parse_printf_format(const char *fmt, size_t n, int *types); + +#endif /* HAVE_PRINTF_H */ diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c index b79c885dfd21..6dabda569189 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c @@ -19,6 +19,7 @@ #include "stat-util.h" #include "string-util.h" #include "strv.h" +#include "missing_stdlib.h" int parse_boolean(const char *v) { if (!v) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c index e53c2302b127..ca1d40ccbef3 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c @@ -15,6 +15,7 @@ #include "strv.h" #include "tmpfile-util.h" #include "user-util.h" +#include "missing_stdlib.h" int xdg_user_runtime_dir(char **ret, const char *suffix) { const char *e; diff --git a/src/basic/percent-util.c b/src/basic/percent-util.c index 06f20fd61e9a..8159d721bb1a 100644 --- a/src/basic/percent-util.c +++ b/src/basic/percent-util.c @@ -3,6 +3,7 @@ #include "percent-util.h" #include "string-util.h" #include "parse-util.h" +#include "missing_stdlib.h" static int parse_parts_value_whole(const char *p, const char *symbol) { const char *pc, *n; diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c index 410b8a3eb5de..f2c435560906 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -15,6 +15,7 @@ #include "string-util.h" #include "util.h" #include "virt.h" +#include "missing_stdlib.h" int proc_cmdline(char **ret) { const char *e; diff --git a/src/basic/process-util.c b/src/basic/process-util.c index 7d4301eadb8a..6101f43db51f 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -18,6 +18,9 @@ #if HAVE_VALGRIND_VALGRIND_H #include #endif +#ifndef __GLIBC__ +#include +#endif #include "alloc-util.h" #include "architecture.h" @@ -1121,11 +1124,15 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } +#ifdef __GLIBC__ /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against * libpthread, as it is part of glibc anyway. */ extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle); extern void* __dso_handle _weak_; +#else +#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child) +#endif pid_t getpid_cached(void) { static bool installed = false; @@ -1516,7 +1523,7 @@ int set_oom_score_adjust(int value) { sprintf(t, "%i", value); return write_string_file("/proc/self/oom_score_adj", t, - WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER); + WRITE_STRING_FILE_VERIFY_ON_FAILURE); } int pidfd_get_pid(int fd, pid_t *ret) { diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c index ccab71f7d2a8..480f8cc0b495 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c @@ -11,6 +11,7 @@ #include "procfs-util.h" #include "stdio-util.h" #include "string-util.h" +#include "missing_stdlib.h" int procfs_tasks_get_limit(uint64_t *ret) { _cleanup_free_ char *value = NULL; @@ -85,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ - r = write_string_file("/proc/sys/kernel/pid_max", buffer, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/proc/sys/kernel/pid_max", buffer, 0); if (r < 0) return r; } sprintf(buffer, "%" PRIu64, limit); - r = write_string_file("/proc/sys/kernel/threads-max", buffer, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/proc/sys/kernel/threads-max", buffer, 0); if (r < 0) { uint64_t threads_max; diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c index 23d108d5df39..3e6fb438d766 100644 --- a/src/basic/rlimit-util.c +++ b/src/basic/rlimit-util.c @@ -43,7 +43,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) { fixed.rlim_max == highest.rlim_max) return 0; - log_debug("Failed at setting rlimit " RLIM_FMT " for resource RLIMIT_%s. Will attempt setting value " RLIM_FMT " instead.", rlim->rlim_max, rlimit_to_string(resource), fixed.rlim_max); + log_debug("Failed at setting rlimit " RLIM_FMT " for resource RLIMIT_%s. Will attempt setting value " RLIM_FMT " instead.", (uintmax_t)rlim->rlim_max, rlimit_to_string(resource), (uintmax_t)fixed.rlim_max); if (setrlimit(resource, &fixed) < 0) return -errno; @@ -308,13 +308,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) s = strdup("infinity"); else if (rl->rlim_cur >= RLIM_INFINITY) - (void) asprintf(&s, "infinity:" RLIM_FMT, rl->rlim_max); + (void) asprintf(&s, "infinity:" RLIM_FMT, (uintmax_t)rl->rlim_max); else if (rl->rlim_max >= RLIM_INFINITY) - (void) asprintf(&s, RLIM_FMT ":infinity", rl->rlim_cur); + (void) asprintf(&s, RLIM_FMT ":infinity", (uintmax_t)rl->rlim_cur); else if (rl->rlim_cur == rl->rlim_max) - (void) asprintf(&s, RLIM_FMT, rl->rlim_cur); + (void) asprintf(&s, RLIM_FMT, (uintmax_t)rl->rlim_cur); else - (void) asprintf(&s, RLIM_FMT ":" RLIM_FMT, rl->rlim_cur, rl->rlim_max); + (void) asprintf(&s, RLIM_FMT ":" RLIM_FMT, (uintmax_t)rl->rlim_cur, (uintmax_t)rl->rlim_max); if (!s) return -ENOMEM; @@ -405,7 +405,7 @@ int rlimit_nofile_safe(void) { rl.rlim_cur = FD_SETSIZE; if (setrlimit(RLIMIT_NOFILE, &rl) < 0) - return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", rl.rlim_cur); + return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", (uintmax_t)rl.rlim_cur); return 1; } diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c index ee9e34ed47cb..96c1e9362dc2 100644 --- a/src/basic/selinux-util.c +++ b/src/basic/selinux-util.c @@ -27,6 +27,7 @@ #include "selinux-util.h" #include "stdio-util.h" #include "time-util.h" +#include "missing_stdlib.h" #if HAVE_SELINUX DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(context_t, context_free, NULL); diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c index 3362ee3924b0..80c0f2a52e5f 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c @@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { return 0; p = procfs_file_alloca(pid, "attr/current"); - r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(p, label, 0); if (r < 0) return r; diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h index 49586a4a2407..a63867c71606 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -4,6 +4,7 @@ #include #include "macro.h" +#include "missing_type.h" void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *arg); @@ -55,18 +56,4 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, __compar_f _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ }) -static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) { - if (nmemb <= 1) - return; - - assert(base); - qsort_r(base, nmemb, size, compar, userdata); -} - -#define typesafe_qsort_r(p, n, func, userdata) \ - ({ \ - int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \ - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ - }) - int cmp_int(const int *a, const int *b); diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h index 6dc1e72312c8..cea76b36cf8d 100644 --- a/src/basic/stdio-util.h +++ b/src/basic/stdio-util.h @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include #include #include #include #include "macro.h" #include "memory-util.h" +#include "parse-printf-format.h" #define snprintf_ok(buf, len, fmt, ...) \ ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c index c96b5cd77f0e..d2476d966569 100644 --- a/src/basic/sysctl-util.c +++ b/src/basic/sysctl-util.c @@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c log_debug("Setting '%s' to '%s'", p, value); - return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); + return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); } int sysctl_read(const char *property, char **ret) { diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 78d0390a00cb..47c38ca69166 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -27,6 +27,7 @@ #include "string-util.h" #include "strv.h" #include "time-util.h" +#include "missing_stdlib.h" static clockid_t map_clock_id(clockid_t c) { diff --git a/src/basic/util.c b/src/basic/util.c index 955b18bd2aaf..6d89c901762a 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -234,7 +234,7 @@ void disable_coredumps(void) { if (detect_container() > 0) return; - r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0); if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c index f6b72e0bae86..e9fd4d06bee7 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { if (!fn) return log_oom(); - return write_string_file(fn, "-1", WRITE_STRING_FILE_DISABLE_BUFFER); + return write_string_file(fn, "-1", 0); } static int apply_rule(const char *rule) { @@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { (void) delete_rule(rule); - r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, 0); if (r < 0) return log_error_errno(r, "Failed to add binary format: %m"); @@ -222,7 +222,7 @@ static int run(int argc, char *argv[]) { } /* Flush out all rules */ - (void) write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); + (void) write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); STRV_FOREACH(f, files) { k = apply_file(*f, true); diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c index 97ad1e0cb501..9d60f3cc7906 100644 --- a/src/boot/bless-boot.c +++ b/src/boot/bless-boot.c @@ -18,6 +18,7 @@ #include "util.h" #include "verbs.h" #include "virt.h" +#include "missing_stdlib.h" static char **arg_path = NULL; diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c index 04d2ba34f30f..651ca9412e4f 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -17,6 +17,7 @@ #include "limits-util.h" #include "path-util.h" #include "percent-util.h" +#include "missing_stdlib.h" BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 5239c41d6735..0f604efe98aa 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -41,6 +41,7 @@ #include "unit-printf.h" #include "user-util.h" #include "utf8.h" +#include "missing_stdlib.h" BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c index 44a2ccfca066..3926ccfa4abd 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c @@ -9,6 +9,7 @@ #include "unit-printf.h" #include "user-util.h" #include "unit.h" +#include "missing_stdlib.h" int bus_property_get_triggered_unit( sd_bus *bus, diff --git a/src/core/execute.c b/src/core/execute.c index 922913e7afbc..4696d055a846 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -96,6 +96,7 @@ #include "unit-serialize.h" #include "user-util.h" #include "utmp-wtmp.h" +#include "missing_stdlib.h" #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) @@ -5369,9 +5370,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { for (unsigned i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n", - prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max); + prefix, rlimit_to_string(i), (uintmax_t)c->rlimit[i]->rlim_max); fprintf(f, "%sLimit%sSoft: " RLIM_FMT "\n", - prefix, rlimit_to_string(i), c->rlimit[i]->rlim_cur); + prefix, rlimit_to_string(i), (uintmax_t)c->rlimit[i]->rlim_cur); } if (c->ioprio_set) { diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index 8a7f82812a3b..6b8729ef673a 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -10,6 +10,8 @@ #include "kmod-setup.h" #include "macro.h" #include "string-util.h" +#include "missing_type.h" +#include "missing_stdlib.h" #if HAVE_KMOD #include "module-util.h" diff --git a/src/core/main.c b/src/core/main.c index 3ee8d0a86977..ec36e3e80faf 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1401,7 +1401,7 @@ static int bump_unix_max_dgram_qlen(void) { if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; - r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", WRITE_STRING_FILE_DISABLE_BUFFER, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); + r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", 0, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); @@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) { if (getpid_cached() != 1) return; - r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, 0); if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } diff --git a/src/core/service.c b/src/core/service.c index 4c5bfb17fb81..8c05f3611979 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -41,6 +41,7 @@ #include "unit.h" #include "utf8.h" #include "util.h" +#include "missing_stdlib.h" static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c index 8cc1696a4fa4..ab7b4ba2c380 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c @@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { } #ifdef SMACK_RUN_LABEL - r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, 0); if (r < 0) log_warning_errno(r, "Failed to set SMACK label \"" SMACK_RUN_LABEL "\" on self: %m"); - r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, 0); if (r < 0) log_warning_errno(r, "Failed to set SMACK ambient label \"" SMACK_RUN_LABEL "\": %m"); r = write_string_file("/sys/fs/smackfs/netlabel", - "0.0.0.0/0 " SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); + "0.0.0.0/0 " SMACK_RUN_LABEL, 0); if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"0.0.0.0/0 " SMACK_RUN_LABEL "\": %m"); - r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", 0); if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c index 95c3fca66186..d4a9f27b0899 100644 --- a/src/coredump/coredump-vacuum.c +++ b/src/coredump/coredump-vacuum.c @@ -16,6 +16,7 @@ #include "string-util.h" #include "time-util.h" #include "user-util.h" +#include "missing_stdlib.h" #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c index 58e35e403ebe..1d0beb4008b0 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } - r = write_string_file("/sys/power/resume", major_minor, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/sys/power/resume", major_minor, 0); if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index ae1d43756a14..24de98c9f37d 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -24,6 +24,7 @@ #include "stat-util.h" #include "string-table.h" #include "strv.h" +#include "missing_stdlib.h" #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 76d05c1eee00..0beb77b2e56b 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -72,6 +72,7 @@ #include "unit-name.h" #include "user-util.h" #include "varlink.h" +#include "missing_stdlib.h" #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index 410bfda10eaa..e70ed8be9257 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -5,7 +5,6 @@ #include #include -#include #include #include "sd-dhcp6-client.h" diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c index 8da2024a5028..38b6cf90c33e 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -55,8 +55,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { }; /* GCC maps this magically to the beginning and end of the BUS_ERROR_MAP section */ -extern const sd_bus_error_map __start_SYSTEMD_BUS_ERROR_MAP[]; -extern const sd_bus_error_map __stop_SYSTEMD_BUS_ERROR_MAP[]; +extern const sd_bus_error_map __start_SYSTEMD_BUS_ERROR_MAP[] _hidden_; +extern const sd_bus_error_map __stop_SYSTEMD_BUS_ERROR_MAP[] _hidden_; /* Additional maps registered with sd_bus_error_add_map() are in this * NULL terminated array */ @@ -392,7 +392,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { return; errno = 0; +#ifndef __GLIBC__ + strerror_r(error, m, k); + x = m; +#else x = strerror_r(error, m, k); +#endif if (errno == ERANGE || strlen(x) >= k - 1) { free(m); k *= 2; diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index b25064b67214..b3bbe63a9107 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -20,6 +20,7 @@ #include "strv.h" #include "time-util.h" #include "utf8.h" +#include "missing_stdlib.h" static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c index bfd42aea7da6..daefc56e3ea3 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -12,6 +12,7 @@ #include "set.h" #include "string-util.h" #include "strv.h" +#include "missing_stdlib.h" static int node_vtable_get_userdata( sd_bus *bus, diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c index 832526cc1b71..7bff701806bc 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -28,6 +28,7 @@ #include "string-util.h" #include "user-util.h" #include "utf8.h" +#include "missing_stdlib.h" #define SNDBUF_SIZE (8*1024*1024) diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index e719c74370f3..ac2a605680cc 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -41,6 +41,7 @@ #include "string-util.h" #include "strv.h" #include "user-util.h" +#include "missing_stdlib.h" #define log_debug_bus_message(m) \ do { \ diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c index 13c08fe2955c..9aae83486e0a 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -14,6 +14,7 @@ #include "string-util.h" #include "time-util.h" #include "util.h" +#include "missing_stdlib.h" #define MAX_SIZE (2*1024*1024) diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index d82f01a16468..b8fd63346ce6 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -1987,7 +1987,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, if (!value) return -ENOMEM; - r = write_string_file(path, value, WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_NOFOLLOW); + r = write_string_file(path, value, 0 | WRITE_STRING_FILE_NOFOLLOW); if (r < 0) { /* On failure, clear cache entry, as we do not know how it fails. */ device_remove_cached_sysattr_value(device, sysattr); diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c index fd45ff0f548f..ac4b63c49b41 100644 --- a/src/libsystemd/sd-hwdb/hwdb-util.c +++ b/src/libsystemd/sd-hwdb/hwdb-util.c @@ -126,9 +126,13 @@ static struct trie* trie_free(struct trie *trie) { DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); -static int trie_values_cmp(const struct trie_value_entry *a, const struct trie_value_entry *b, struct trie *trie) { - return strcmp(trie->strings->buf + a->key_off, - trie->strings->buf + b->key_off); +static struct trie *trie_node_add_value_trie; +static int trie_values_cmp(const void *v1, const void *v2) { + const struct trie_value_entry *a = v1; + const struct trie_value_entry *b = v2; + + return strcmp(trie_node_add_value_trie->strings->buf + a->key_off, + trie_node_add_value_trie->strings->buf + b->key_off); } static int trie_node_add_value(struct trie *trie, struct trie_node *node, @@ -156,7 +160,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, .value_off = v, }; - val = typesafe_bsearch_r(&search, node->values, node->values_count, trie_values_cmp, trie); + trie_node_add_value_trie = trie; + val = bsearch(&search, node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); + trie_node_add_value_trie = NULL; + if (val) { /* At this point we have 2 identical properties on the same match-string. * Since we process files in order, we just replace the previous value. */ @@ -182,7 +189,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, .line_number = line_number, }; node->values_count++; - typesafe_qsort_r(node->values, node->values_count, trie_values_cmp, trie); + trie_node_add_value_trie = trie; + qsort(node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); + trie_node_add_value_trie = NULL; return 0; } diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c index aea3241d1853..75e6c56a28be 100644 --- a/src/libsystemd/sd-journal/catalog.c +++ b/src/libsystemd/sd-journal/catalog.c @@ -28,6 +28,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" +#include "missing_type.h" const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c index fd3fd7ef9c94..8ca5271d02f2 100644 --- a/src/libsystemd/sd-journal/journal-send.c +++ b/src/libsystemd/sd-journal/journal-send.c @@ -2,7 +2,6 @@ #include #include -#include #include #include #include @@ -21,6 +20,7 @@ #include "stdio-util.h" #include "string-util.h" #include "tmpfile-util.h" +#include "parse-printf-format.h" #define SNDBUF_SIZE (8*1024*1024) @@ -348,7 +348,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove char* j; errno = 0; +#ifndef __GLIBC__ + strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); + j = buffer + 8 + k; +#else j = strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); +#endif if (errno == 0) { char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c index c90b4c926e6d..0efdccff5dc2 100644 --- a/src/libsystemd/sd-journal/sd-journal.c +++ b/src/libsystemd/sd-journal/sd-journal.c @@ -40,6 +40,7 @@ #include "string-util.h" #include "strv.h" #include "syslog-util.h" +#include "missing_stdlib.h" #define JOURNAL_FILES_MAX 7168 diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c index ed7b9a8cd166..112c0b09e411 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c index d2f0566dbc52..3b7746557e0d 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c @@ -24,6 +24,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" +#include "missing_stdlib.h" static bool startswith_comma(const char *s, const char *prefix) { s = startswith(s, prefix); diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 3bc424b83b79..5f5eef0843c2 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1330,7 +1330,7 @@ static int trigger_device(Manager *m, sd_device *d) { if (!t) return -ENOMEM; - (void) write_string_file(t, "change", WRITE_STRING_FILE_DISABLE_BUFFER); + (void) write_string_file(t, "change", 0); } return 0; diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c index 2021c31bd522..58eb09808d22 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -31,6 +31,7 @@ #include "locale-util.h" #include "login-util.h" #include "macro.h" +#include "missing_stdlib.h" #include "pam-util.h" #include "parse-util.h" #include "path-util.h" diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index e7c4ed3c7c17..ab87b9882c6b 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -3,6 +3,7 @@ #include #include #include +#include /* When we include libgen.h because we need dirname() we immediately * undefine basename() since libgen.h defines it as a macro to the POSIX @@ -10,6 +11,11 @@ #include #undef basename +#if !defined(__GLIBC__) +#include +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#endif + #include "alloc-util.h" #include "bus-common-errors.h" #include "bus-get-properties.h" diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c index ae673ddf5b5e..a79e5114ca98 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -13,6 +13,7 @@ #include "string-table.h" #include "string-util.h" #include "strv.h" +#include "missing_stdlib.h" /* # .network diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c index cf7ca88d6f3a..34ab468191c9 100644 --- a/src/network/netdev/bond.c +++ b/src/network/netdev/bond.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include "alloc-util.h" #include "bond.h" #include "bond-util.h" diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c index 38432f157846..79ccfe578e8b 100644 --- a/src/network/netdev/bridge.c +++ b/src/network/netdev/bridge.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "bridge.h" diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c index 77c5f8c4e798..04be1b4ab282 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf index 8abe04489002..3c54c589284d 100644 --- a/src/network/netdev/netdev-gperf.gperf +++ b/src/network/netdev/netdev-gperf.gperf @@ -3,6 +3,7 @@ #if __GNUC__ >= 7 _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") #endif +#include #include #include "bareudp.h" #include "batadv.h" diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index b31f0fa81ab2..c80e1ff5378d 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c index 2847b336c935..4d6af8c64273 100644 --- a/src/network/networkd-brvlan.c +++ b/src/network/networkd-brvlan.c @@ -4,6 +4,7 @@ ***/ #include +#include #include #include diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c index 00d055cf8db3..65821c1d31a5 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -1,7 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include +#include +#include #include "bus-error.h" #include "dhcp-internal.h" @@ -11,6 +12,7 @@ #include "networkd-dhcp-common.h" #include "networkd-link.h" #include "networkd-manager.h" +#include #include "networkd-network.h" #include "parse-util.h" #include "socket-util.h" diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c index 5cdf432c2784..93cffb986376 100644 --- a/src/network/networkd-dhcp-server.c +++ b/src/network/networkd-dhcp-server.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include +#include +#include #include "sd-dhcp-server.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 23dc3a45dbe0..7ae6c2467a19 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include -#include #include "escape.h" #include "alloc-util.h" diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index aa077d6219ff..4f6ce22059db 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -3,9 +3,9 @@ Copyright © 2014 Intel Corporation. All rights reserved. ***/ +#include #include #include -#include #include "sd-dhcp6-client.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 8219d95b0d95..c92230453bd0 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include -#include #include #include diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index e5ffd35b6f9a..871ebb32c678 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index a74541a6c95e..a10549b33688 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -1,7 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include +/* linux/ipv6_route.h conflicts with netinet/in.h so define manually */ +#ifndef IP6_RT_PRIO_USER +#define IP6_RT_PRIO_USER 1024 +#endif #include "alloc-util.h" #include "netlink-util.h" diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c index ce34449554f9..0b5dc011821d 100644 --- a/src/network/test-network-tables.c +++ b/src/network/test-network-tables.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include "bond.h" #include "dhcp6-internal.h" #include "dhcp6-protocol.h" diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c index cb01b25bc670..e92051268b0d 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c @@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); - r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER|WRITE_STRING_FILE_MKDIR_0755); + r = write_string_file(fn, pid_string, WRITE_STRING_FILE_MKDIR_0755); if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c index d4619bead53c..0e832fd9941d 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -16,6 +16,7 @@ #include "strv.h" #include "user-util.h" #include "util.h" +#include "missing_stdlib.h" Settings *settings_new(void) { Settings *s; diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index a4ac8ed2bb75..9c893b18e4b6 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2695,7 +2695,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; - r = write_string_file("/proc/self/loginuid", "4294967295", WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/proc/self/loginuid", "4294967295", 0); if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" @@ -3948,13 +3948,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); - r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(uid_map, line, 0); if (r < 0) return log_error_errno(r, "Failed to write UID map: %m"); /* We always assign the same UID and GID ranges */ xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); - r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(uid_map, line, 0); if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); @@ -5125,7 +5125,7 @@ static int cant_be_in_netns(void) { if (fd < 0) return log_error_errno(errno, "Failed to allocate udev control socket: %m"); - if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { + if (connect(fd, (struct sockaddr *)&sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno)) return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c index 44715bb3e5d8..bc1e688b5e02 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/nss-mymachines/nss-mymachines.c @@ -21,6 +21,7 @@ #include "nss-util.h" #include "signal-util.h" #include "string-util.h" +#include "missing_stdlib.h" static void setup_logging(void) { /* We need a dummy function because log_parse_environment is a macro. */ diff --git a/src/partition/makefs.c b/src/partition/makefs.c index 7c94fbfedb10..42f966722d4d 100644 --- a/src/partition/makefs.c +++ b/src/partition/makefs.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "alloc-util.h" #include "blockdev-util.h" diff --git a/src/portable/portable.c b/src/portable/portable.c index f201f5253187..c78ad0f47111 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -32,6 +32,7 @@ #include "strv.h" #include "tmpfile-util.h" #include "user-util.h" +#include "missing_stdlib.h" static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c index 52bbae3293b8..4ccbae09c487 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c @@ -41,6 +41,7 @@ #include "terminal-util.h" #include "utf8.h" #include "verbs.h" +#include "missing_stdlib.h" static int arg_family = AF_UNSPEC; static int arg_ifindex = 0; diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c index 1d054090863e..1ed06c31abf5 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c @@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { return log_error_errno(errno, "Failed to open root file system: %m"); for (i = 0; i < ELEMENTSOF(table); i ++) { - if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0) + if (faccessat(fd, table[i].dir, F_OK, 0) >= 0) continue; if (table[i].target) { @@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { /* check if one of the targets exists */ NULSTR_FOREACH(s, table[i].target) { - if (faccessat(fd, s, F_OK, AT_SYMLINK_NOFOLLOW) < 0) + if (faccessat(fd, s, F_OK, 0) < 0) continue; /* check if a specific file exists at the target path */ @@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { if (!p) return log_oom(); - if (faccessat(fd, p, F_OK, AT_SYMLINK_NOFOLLOW) < 0) + if (faccessat(fd, p, F_OK, 0) < 0) continue; } diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c index feb6d3807f77..eb11d29e50b2 100644 --- a/src/shared/bus-get-properties.c +++ b/src/shared/bus-get-properties.c @@ -4,6 +4,7 @@ #include "rlimit-util.h" #include "stdio-util.h" #include "string-util.h" +#include "missing_stdlib.h" int bus_property_get_bool( sd_bus *bus, diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c index b76125e551f9..2e0892242f6c 100644 --- a/src/shared/bus-unit-procs.c +++ b/src/shared/bus-unit-procs.c @@ -10,6 +10,7 @@ #include "sort-util.h" #include "string-util.h" #include "terminal-util.h" +#include "missing_stdlib.h" struct CGroupInfo { char *cgroup_path; diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index a75178068b50..3de06e2bd580 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -45,6 +45,7 @@ #include "unit-def.h" #include "user-util.h" #include "utf8.h" +#include "missing_stdlib.h" int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { assert(message); diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 64ca67993c00..31e3d148ea1f 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -21,6 +21,7 @@ #include "path-util.h" #include "socket-util.h" #include "stdio-util.h" +#include "missing_stdlib.h" static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { sd_event *e = userdata; diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c index f197f715c792..077f8931770d 100644 --- a/src/shared/cgroup-setup.c +++ b/src/shared/cgroup-setup.c @@ -267,7 +267,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { xsprintf(c, PID_FMT "\n", pid); - r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(fs, c, 0); if (r < 0) return r; @@ -799,7 +799,7 @@ int cg_enable_everywhere( return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); } - r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_stream(f, s, 0); if (r < 0) { log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h index 3c63a5882616..4c2d4347fc6c 100644 --- a/src/shared/cpu-set-util.h +++ b/src/shared/cpu-set-util.h @@ -6,6 +6,8 @@ #include "macro.h" #include "missing_syscall.h" +typedef unsigned long __cpu_mask; + /* This wraps the libc interface with a variable to keep the allocated size. */ typedef struct CPUSet { cpu_set_t *set; diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c index e43aa12882a8..cec9b413c13c 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c @@ -17,6 +17,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" +#include "missing_stdlib.h" int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { const char *n; diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c index 654d36a83a24..f4ed42d543b7 100644 --- a/src/shared/ethtool-util.c +++ b/src/shared/ethtool-util.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h index 11e2906681a5..a171df07375c 100644 --- a/src/shared/ethtool-util.h +++ b/src/shared/ethtool-util.h @@ -3,6 +3,7 @@ #include #include +#include #include #include "conf-parser.h" diff --git a/src/shared/format-table.c b/src/shared/format-table.c index dccb796b262c..c3ab8ac2968c 100644 --- a/src/shared/format-table.c +++ b/src/shared/format-table.c @@ -1290,30 +1290,32 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t return CMP(index_a, index_b); } -static int table_data_compare(const size_t *a, const size_t *b, Table *t) { +static Table *user_table; +static int table_data_compare(const void *x, const void *y) { + const size_t *a = x, *b=y; int r; - assert(t); - assert(t->sort_map); + assert(user_table); + assert(user_table->sort_map); /* Make sure the header stays at the beginning */ - if (*a < t->n_columns && *b < t->n_columns) + if (*a < user_table->n_columns && *b < user_table->n_columns) return 0; - if (*a < t->n_columns) + if (*a < user_table->n_columns) return -1; - if (*b < t->n_columns) + if (*b < user_table->n_columns) return 1; /* Order other lines by the sorting map */ - for (size_t i = 0; i < t->n_sort_map; i++) { + for (size_t i = 0; i < user_table->n_sort_map; i++) { TableData *d, *dd; - d = t->data[*a + t->sort_map[i]]; - dd = t->data[*b + t->sort_map[i]]; + d = user_table->data[*a + user_table->sort_map[i]]; + dd = user_table->data[*b + user_table->sort_map[i]]; r = cell_data_compare(d, *a, dd, *b); if (r != 0) - return t->reverse_map && t->reverse_map[t->sort_map[i]] ? -r : r; + return user_table->reverse_map && user_table->reverse_map[user_table->sort_map[i]] ? -r : r; } /* Order identical lines by the order there were originally added in */ @@ -1952,7 +1954,12 @@ int table_print(Table *t, FILE *f) { for (size_t i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); + if (n_rows <= 1) + return 0; + assert(sorted); + user_table = t; + qsort(sorted, n_rows, sizeof(size_t), table_data_compare); + user_table = NULL; } if (t->display_map) @@ -2580,7 +2587,12 @@ int table_to_json(Table *t, JsonVariant **ret) { for (size_t i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); + if (n_rows <= 1) + return 0; + assert(sorted); + user_table = t; + qsort(sorted, n_rows, sizeof(size_t), table_data_compare); + user_table = NULL; } if (t->display_map) diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c index b2785f055248..5f00902882d5 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c @@ -14,6 +14,7 @@ #include "parse-util.h" #include "string-util.h" #include "unaligned.h" +#include "missing_stdlib.h" enum { IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index e63c59bd94e3..dd9773c009e7 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -41,6 +41,7 @@ #include "utf8.h" #include "util.h" #include "web-util.h" +#include "missing_stdlib.h" /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ #define PRINT_LINE_THRESHOLD 3 diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c index 1e4bbfb1ab08..9a8573fe4816 100644 --- a/src/shared/mount-setup.c +++ b/src/shared/mount-setup.c @@ -21,6 +21,7 @@ #include "label.h" #include "log.h" #include "macro.h" +#include "missing_type.h" #include "mkdir.h" #include "mount-setup.h" #include "mount-util.h" diff --git a/src/shared/pager.c b/src/shared/pager.c index 4bbad7e37be4..eefcdd068cb4 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c @@ -26,6 +26,7 @@ #include "strv.h" #include "terminal-util.h" #include "util.h" +#include "missing_stdlib.h" static pid_t pager_pid = 0; diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c index 4d17f3c96a22..be5332e55a08 100644 --- a/src/shared/tpm2-util.c +++ b/src/shared/tpm2-util.c @@ -3,6 +3,7 @@ #include "extract-word.h" #include "parse-util.h" #include "tpm2-util.h" +#include "missing_stdlib.h" #if HAVE_TPM2 #include "alloc-util.h" diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c index 5d5bf7f21d87..f1002ffa6c75 100644 --- a/src/shared/uid-range.c +++ b/src/shared/uid-range.c @@ -9,6 +9,7 @@ #include "sort-util.h" #include "uid-range.h" #include "user-util.h" +#include "missing_stdlib.h" static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { assert(range); diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c index 88b8fc2f8f5f..a819d41bac7d 100644 --- a/src/shared/user-record-nss.c +++ b/src/shared/user-record-nss.c @@ -331,8 +331,10 @@ int nss_group_to_group_record( if (isempty(grp->gr_name)) return -EINVAL; +#if ENABLE_GSHADOW if (sgrp && !streq_ptr(sgrp->sg_namp, grp->gr_name)) return -EINVAL; +#endif g = group_record_new(); if (!g) @@ -348,6 +350,7 @@ int nss_group_to_group_record( g->gid = grp->gr_gid; +#if ENABLE_GSHADOW if (sgrp) { if (looks_like_hashed_password(utf8_only(sgrp->sg_passwd))) { g->hashed_password = strv_new(sgrp->sg_passwd); @@ -363,6 +366,7 @@ int nss_group_to_group_record( if (r < 0) return r; } +#endif r = json_build(&g->json, JSON_BUILD_OBJECT( JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), @@ -388,6 +392,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re assert(ret_sgrp); assert(ret_buffer); +#if ENABLE_GSHADOW for (;;) { _cleanup_free_ char *buf = NULL; struct sgrp sgrp, *result; @@ -416,6 +421,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re buflen *= 2; buf = mfree(buf); } +#else + return -ESRCH; +#endif } int nss_group_record_by_name( @@ -427,7 +435,9 @@ int nss_group_record_by_name( struct group grp, *result; bool incomplete = false; size_t buflen = 4096; +#if ENABLE_GSHADOW struct sgrp sgrp, *sresult = NULL; +#endif int r; assert(name); @@ -457,6 +467,7 @@ int nss_group_record_by_name( buf = mfree(buf); } +#if ENABLE_GSHADOW if (with_shadow) { r = nss_sgrp_for_group(result, &sgrp, &sbuf); if (r < 0) { @@ -468,6 +479,9 @@ int nss_group_record_by_name( incomplete = true; r = nss_group_to_group_record(result, sresult, ret); +#else + r = nss_group_to_group_record(result, NULL, ret); +#endif if (r < 0) return r; @@ -484,7 +498,9 @@ int nss_group_record_by_gid( struct group grp, *result; bool incomplete = false; size_t buflen = 4096; +#if ENABLE_GSHADOW struct sgrp sgrp, *sresult = NULL; +#endif int r; assert(ret); @@ -512,6 +528,7 @@ int nss_group_record_by_gid( buf = mfree(buf); } +#if ENABLE_GSHADOW if (with_shadow) { r = nss_sgrp_for_group(result, &sgrp, &sbuf); if (r < 0) { @@ -523,6 +540,9 @@ int nss_group_record_by_gid( incomplete = true; r = nss_group_to_group_record(result, sresult, ret); +#else + r = nss_group_to_group_record(result, NULL, ret); +#endif if (r < 0) return r; diff --git a/src/shared/user-record-nss.h b/src/shared/user-record-nss.h index 22ab04d6eec3..4e52e7a91179 100644 --- a/src/shared/user-record-nss.h +++ b/src/shared/user-record-nss.h @@ -2,7 +2,11 @@ #pragma once #include +#if ENABLE_GSHADOW #include +#else +struct sgrp; +#endif #include #include diff --git a/src/shared/userdb.c b/src/shared/userdb.c index 613350bd469f..5c821d28cd23 100644 --- a/src/shared/userdb.c +++ b/src/shared/userdb.c @@ -938,13 +938,16 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { if (gr) { _cleanup_free_ char *buffer = NULL; bool incomplete = false; +#if ENABLE_GSHADOW struct sgrp sgrp; +#endif if (streq_ptr(gr->gr_name, "root")) iterator->synthesize_root = false; if (gr->gr_gid == GID_NOBODY) iterator->synthesize_nobody = false; +#if ENABLE_GSHADOW if (!FLAGS_SET(iterator->flags, USERDB_AVOID_SHADOW)) { r = nss_sgrp_for_group(gr, &sgrp, &buffer); if (r < 0) { @@ -957,6 +960,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { } r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); +#else + r = nss_group_to_group_record(gr, NULL, ret); +#endif if (r < 0) return r; diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 262d4cea66a2..0523e8dc9b5f 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -48,7 +48,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca assert(hibernate_location->swap); xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); - r = write_string_file("/sys/power/resume", resume_str, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/sys/power/resume", resume_str, 0); if (r < 0) return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", hibernate_location->swap->device, resume_str); @@ -75,7 +75,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca } xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); - r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/sys/power/resume_offset", offset_str, 0); if (r < 0) return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m", hibernate_location->swap->device, offset_str); @@ -92,7 +92,7 @@ static int write_mode(char **modes) { STRV_FOREACH(mode, modes) { int k; - k = write_string_file("/sys/power/disk", *mode, WRITE_STRING_FILE_DISABLE_BUFFER); + k = write_string_file("/sys/power/disk", *mode, 0); if (k >= 0) return 0; @@ -114,7 +114,7 @@ static int write_state(FILE **f, char **states) { STRV_FOREACH(state, states) { int k; - k = write_string_stream(*f, *state, WRITE_STRING_FILE_DISABLE_BUFFER); + k = write_string_stream(*f, *state, 0); if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c index 6e3ee0d76b00..7727e33d95b2 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -26,6 +26,7 @@ #include "socket-util.h" #include "string-util.h" #include "util.h" +#include "missing_stdlib.h" #define BUFFER_SIZE (256 * 1024) diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON index a2a0059fef06..7f95791d9b29 100755 --- a/src/systemctl/systemd-sysv-install.SKELETON +++ b/src/systemctl/systemd-sysv-install.SKELETON @@ -34,17 +34,17 @@ case "$1" in enable) # call the command to enable SysV init script $NAME here # (consider optional $ROOT) - echo "IMPLEMENT ME: enabling SysV init.d script $NAME" + update-rc.d -f $NAME defaults ;; disable) # call the command to disable SysV init script $NAME here # (consider optional $ROOT) - echo "IMPLEMENT ME: disabling SysV init.d script $NAME" + update-rc.d -f $NAME remove ;; is-enabled) # exit with 0 if $NAME is enabled, non-zero if it is disabled # (consider optional $ROOT) - echo "IMPLEMENT ME: checking SysV init.d script $NAME" + /etc/init.d/$NAME status ;; *) usage ;; diff --git a/src/systemctl/systemd-sysv-install.SKELETON.orig b/src/systemctl/systemd-sysv-install.SKELETON.orig new file mode 100755 index 000000000000..a2a0059fef06 --- /dev/null +++ b/src/systemctl/systemd-sysv-install.SKELETON.orig @@ -0,0 +1,51 @@ +#!/bin/sh +# SPDX-License-Identifier: CC0-1.0 +# +# This script is called by "systemctl enable/disable" when the given unit is a +# SysV init.d script. It needs to call the distribution's mechanism for +# enabling/disabling those, such as chkconfig, update-rc.d, or similar. This +# can optionally take a --root argument for enabling a SysV init script +# in a chroot or similar. +set -e + +usage() { + echo "Usage: $0 [--root=path] enable|disable|is-enabled " >&2 + exit 1 +} + +unset ROOT + +# parse options +eval set -- "$(getopt -o r: --long root: -- "$@")" +while true; do + case "$1" in + -r|--root) + ROOT="$2" + shift 2 ;; + --) shift ; break ;; + *) usage ;; + esac +done + +NAME="$2" +[ -n "$NAME" ] || usage + +case "$1" in + enable) + # call the command to enable SysV init script $NAME here + # (consider optional $ROOT) + echo "IMPLEMENT ME: enabling SysV init.d script $NAME" + ;; + disable) + # call the command to disable SysV init script $NAME here + # (consider optional $ROOT) + echo "IMPLEMENT ME: disabling SysV init.d script $NAME" + ;; + is-enabled) + # exit with 0 if $NAME is enabled, non-zero if it is disabled + # (consider optional $ROOT) + echo "IMPLEMENT ME: checking SysV init.d script $NAME" + ;; + *) + usage ;; +esac diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c index 9e21f3218946..eba13fc911dc 100644 --- a/src/test/test-arphrd-list.c +++ b/src/test/test-arphrd-list.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include "string-util.h" #include "tests.h" diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c index df6444c43384..79a692046e85 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c @@ -12,6 +12,12 @@ #include "rm-rf.h" #include "tmpfile-util.h" +/* Don't fail if the standard library + * doesn't provide brace expansion */ +#ifndef GLOB_BRACE +#define GLOB_BRACE 0 +#endif + static void test_glob_exists(void) { char name[] = "/tmp/test-glob_exists.XXXXXX"; int fd = -1; @@ -39,11 +45,13 @@ static void test_glob_no_dot(void) { const char *fn; _cleanup_globfree_ glob_t g = { +#ifdef GLOB_ALTDIRFUNC .gl_closedir = closedir_wrapper, .gl_readdir = (struct dirent *(*)(void *)) readdir_no_dot, .gl_opendir = (void *(*)(const char *)) opendir, .gl_lstat = lstat, .gl_stat = stat, +#endif }; int r; @@ -51,11 +59,19 @@ static void test_glob_no_dot(void) { assert_se(mkdtemp(template)); fn = strjoina(template, "/*"); +#ifdef GLOB_ALTDIRFUNC r = glob(fn, GLOB_NOSORT|GLOB_BRACE|GLOB_ALTDIRFUNC, NULL, &g); +#else + r = glob(fn, GLOB_NOSORT|GLOB_BRACE, NULL, &g); +#endif assert_se(r == GLOB_NOMATCH); fn = strjoina(template, "/.*"); +#ifdef GLOB_ALTDIRFUNC r = glob(fn, GLOB_NOSORT|GLOB_BRACE|GLOB_ALTDIRFUNC, NULL, &g); +#else + r = glob(fn, GLOB_NOSORT|GLOB_BRACE, NULL, &g); +#endif assert_se(r == GLOB_NOMATCH); (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c index c9d318b8d161..fcb8d4080519 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -6,6 +6,7 @@ #include "hexdecoct.h" #include "macro.h" #include "string-util.h" +#include "missing_stdlib.h" static void test_hexchar(void) { assert_se(hexchar(0xa) == 'a'); diff --git a/src/test/test-json.c b/src/test/test-json.c index 1d4b11945ec4..572c8cf9d0e5 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c @@ -13,6 +13,10 @@ #include "tests.h" #include "util.h" +#ifndef M_PIl +#define M_PIl 3.141592653589793238462643383279502884L +#endif + static void test_tokenizer(const char *data, ...) { unsigned line = 0, column = 0; void *state = NULL; diff --git a/src/test/test-parse-argument.c b/src/test/test-parse-argument.c index 4081a9f25a7b..820d69f09285 100644 --- a/src/test/test-parse-argument.c +++ b/src/test/test-parse-argument.c @@ -3,6 +3,7 @@ #include "parse-argument.h" #include "stdio-util.h" #include "tests.h" +#include static void test_parse_json_argument(void) { log_info("/* %s */", __func__); diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c index 3c9dc180fa45..c269ea6e8cc0 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include @@ -10,6 +9,7 @@ #include #include "time-util.h" +#include "cpu-set-util.h" /* Print information about various types. Useful when diagnosing * gcc diagnostics on an unfamiliar architecture. */ @@ -55,8 +55,10 @@ int main(void) { info(unsigned); info(long unsigned); info(long long unsigned); +#ifdef __GLIBC__ info(__syscall_ulong_t); info(__syscall_slong_t); +#endif info(float); info(double); @@ -74,7 +76,9 @@ int main(void) { info(ssize_t); info(time_t); info(usec_t); +#ifdef __GLIBC__ info(__time_t); +#endif info(pid_t); info(uid_t); info(gid_t); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 6b73d1e6d513..26b3b7427527 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -66,6 +66,12 @@ #include "umask-util.h" #include "user-util.h" +/* Don't fail if the standard library + * doesn't provide brace expansion */ +#ifndef GLOB_BRACE +#define GLOB_BRACE 0 +#endif + /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create * properly owned directories beneath /tmp, /var/tmp, /run, which are @@ -1947,7 +1953,9 @@ finish: static int glob_item(Item *i, action_t action) { _cleanup_globfree_ glob_t g = { +#ifdef GLOB_ALTDIRFUNC .gl_opendir = (void *(*)(const char *)) opendir_nomod, +#endif }; int r = 0, k; char **fn; @@ -1967,7 +1975,9 @@ static int glob_item(Item *i, action_t action) { static int glob_item_recursively(Item *i, fdaction_t action) { _cleanup_globfree_ glob_t g = { +#ifdef GLOB_ALTDIRFUNC .gl_opendir = (void *(*)(const char *)) opendir_nomod, +#endif }; int r = 0, k; char **fn; diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 31e5d0cd673f..f25f8213642a 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c index 87e1fb133ef9..13876029d0b9 100644 --- a/src/udev/udev-builtin-net_setup_link.c +++ b/src/udev/udev-builtin-net_setup_link.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include "alloc-util.h" #include "device-util.h" #include "errno-util.h" diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c index 09cc1c3bd895..8a7d3152a752 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -22,6 +22,7 @@ #include "sysexits.h" #include "udev-builtin.h" #include "udev-util.h" +#include "missing_stdlib.h" _printf_(2,3) static void path_prepend(char **path, const char *fmt, ...) { diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index 12597194a91d..208b2458b5db 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -33,6 +33,7 @@ #include "udev-util.h" #include "udev-watch.h" #include "user-util.h" +#include "missing_stdlib.h" typedef struct Spawn { sd_device *device; diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 57ede6a197f6..dc5985776508 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -31,6 +31,7 @@ #include "udev-rules.h" #include "user-util.h" #include "virt.h" +#include "missing_stdlib.h" #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index d1c3febdd5bb..1cc68694d12d 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { static int toggle_utf8_sysfs(bool utf8) { int r; - r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), 0); if (r < 0) return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); -- 2.26.2