From d9ccf6b349bde6a96ea52a26bc3a023090e8069b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 5 May 2025 12:18:39 +0200 Subject: [PATCH] path-util: Reduce transitive includes --- src/basic/btrfs.c | 2 ++ src/basic/capsule-util.c | 1 + src/basic/chase.c | 1 + src/basic/devnum-util.c | 1 + src/basic/fileio.c | 1 + src/basic/path-util.c | 31 ++++++++++++++++ src/basic/path-util.h | 35 +++---------------- src/basic/sync-util.c | 2 ++ src/basic/sysctl-util.c | 1 + src/basic/unit-name.c | 1 + src/basic/virt.c | 1 + src/bless-boot/bless-boot.c | 1 + src/core/ipe-setup.c | 1 + src/creds/creds.c | 1 + src/journal/journalctl-catalog.c | 1 + src/journal/journalctl-filter.c | 1 + src/journal/journalctl-misc.c | 2 ++ src/journal/journald-native.c | 1 + src/libsystemd/sd-device/device-filter.c | 1 + src/libsystemd/sd-event/sd-event.c | 1 + src/libsystemd/sd-json/json-util.c | 2 ++ src/login/user-runtime-dir.c | 1 + src/network/networkctl-config-file.c | 1 + src/nsresourced/userns-registry.c | 1 + src/pcrlock/pcrlock.c | 1 + src/shared/boot-entry.c | 2 ++ src/shared/bus-util.c | 2 ++ src/shared/dev-setup.c | 1 + src/shared/format-table.c | 1 + src/shared/journal-file-util.c | 1 + src/shared/numa-util.c | 1 + src/shared/open-file.c | 1 + src/shared/parse-argument.c | 1 + src/shared/parse-helpers.c | 2 ++ src/shared/selinux-util.c | 1 + src/shared/shift-uid.c | 1 + src/shared/vpick.c | 2 ++ src/shared/wall.c | 1 + src/shared/watchdog.c | 1 + .../system-update-generator.c | 1 + src/test/test-cgroup.c | 1 + src/test/test-mountpoint-util.c | 1 + src/test/test-terminal-util.c | 1 + src/tmpfiles/offline-passwd.c | 2 ++ src/udev/udevadm-util.c | 1 + src/varlinkctl/varlinkctl.c | 1 + src/veritysetup/veritysetup-generator.c | 1 + src/vmspawn/vmspawn-mount.c | 1 + 48 files changed, 90 insertions(+), 31 deletions(-) diff --git a/src/basic/btrfs.c b/src/basic/btrfs.c index dc2d6a5ddbd..7d5c35605de 100644 --- a/src/basic/btrfs.c +++ b/src/basic/btrfs.c @@ -3,11 +3,13 @@ #include #include +#include "alloc-util.h" #include "btrfs.h" #include "errno-util.h" #include "fd-util.h" #include "fs-util.h" #include "path-util.h" +#include "string-util.h" int btrfs_validate_subvolume_name(const char *name) { diff --git a/src/basic/capsule-util.c b/src/basic/capsule-util.c index 3689a78a8bf..d2d6b194485 100644 --- a/src/basic/capsule-util.c +++ b/src/basic/capsule-util.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "alloc-util.h" #include "capsule-util.h" #include "path-util.h" #include "user-util.h" diff --git a/src/basic/chase.c b/src/basic/chase.c index 954586dbf03..88cd840544b 100644 --- a/src/basic/chase.c +++ b/src/basic/chase.c @@ -12,6 +12,7 @@ #include "log.h" #include "path-util.h" #include "string-util.h" +#include "strv.h" #include "user-util.h" bool unsafe_transition(const struct stat *a, const struct stat *b) { diff --git a/src/basic/devnum-util.c b/src/basic/devnum-util.c index 652740cea75..ab4da865f28 100644 --- a/src/basic/devnum-util.c +++ b/src/basic/devnum-util.c @@ -3,6 +3,7 @@ #include #include +#include "alloc-util.h" #include "chase.h" #include "devnum-util.h" #include "parse-util.h" diff --git a/src/basic/fileio.c b/src/basic/fileio.c index c5eedc312b3..509514512d9 100644 --- a/src/basic/fileio.c +++ b/src/basic/fileio.c @@ -29,6 +29,7 @@ #include "socket-util.h" #include "stdio-util.h" #include "string-util.h" +#include "strv.h" #include "sync-util.h" #include "terminal-util.h" #include "tmpfile-util.h" diff --git a/src/basic/path-util.c b/src/basic/path-util.c index dff1b0ebe4e..64e42b2a23e 100644 --- a/src/basic/path-util.c +++ b/src/basic/path-util.c @@ -22,6 +22,13 @@ #include "strv.h" #include "time-util.h" +bool is_path(const char *p) { + if (!p) /* A NULL pointer is definitely not a path */ + return false; + + return strchr(p, '/'); +} + int path_split_and_make_absolute(const char *p, char ***ret) { _cleanup_strv_free_ char **l = NULL; int r; @@ -345,6 +352,10 @@ char** path_strv_resolve_uniq(char **l, const char *root) { return strv_uniq(l); } +char* skip_leading_slash(const char *p) { + return skip_leading_chars(p, "/"); +} + char* path_simplify_full(char *path, PathSimplifyFlags flags) { bool add_slash = false, keep_trailing_slash, absolute, beginning = true; char *f = path; @@ -406,6 +417,22 @@ char* path_simplify_full(char *path, PathSimplifyFlags flags) { return path; } +int path_simplify_alloc(const char *path, char **ret) { + assert(ret); + + if (!path) { + *ret = NULL; + return 0; + } + + char *t = strdup(path); + if (!t) + return -ENOMEM; + + *ret = path_simplify(t); + return 0; +} + char* path_startswith_full(const char *path, const char *prefix, bool accept_dot_dot) { assert(path); assert(prefix); @@ -1361,6 +1388,10 @@ bool empty_or_root(const char *path) { return path_equal(path, "/"); } +const char* empty_to_root(const char *path) { + return isempty(path) ? "/" : path; +} + bool path_strv_contains(char * const *l, const char *path) { assert(path); diff --git a/src/basic/path-util.h b/src/basic/path-util.h index 74406d7698a..647a884e398 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -1,14 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include #include #include #include "macro.h" -#include "stat-util.h" -#include "string-util.h" -#include "strv.h" #include "time-util.h" #define PATH_SPLIT_BIN(x) x "sbin:" x "bin" @@ -32,12 +28,7 @@ static inline const char* default_user_PATH(void) { #endif } -static inline bool is_path(const char *p) { - if (!p) /* A NULL pointer is definitely not a path */ - return false; - - return strchr(p, '/'); -} +bool is_path(const char *p) _pure_; static inline bool path_is_absolute(const char *p) { if (!p) /* A NULL pointer is definitely not an absolute path */ @@ -76,9 +67,7 @@ char* path_extend_internal(char **x, ...); #define path_extend(x, ...) path_extend_internal(x, __VA_ARGS__, POINTER_MAX) #define path_join(...) path_extend_internal(NULL, __VA_ARGS__, POINTER_MAX) -static inline char* skip_leading_slash(const char *p) { - return skip_leading_chars(p, "/"); -} +char* skip_leading_slash(const char *p) _pure_; typedef enum PathSimplifyFlags { PATH_SIMPLIFY_KEEP_TRAILING_SLASH = 1 << 0, @@ -89,21 +78,7 @@ static inline char* path_simplify(char *path) { return path_simplify_full(path, 0); } -static inline int path_simplify_alloc(const char *path, char **ret) { - assert(ret); - - if (!path) { - *ret = NULL; - return 0; - } - - char *t = strdup(path); - if (!t) - return -ENOMEM; - - *ret = path_simplify(t); - return 0; -} +int path_simplify_alloc(const char *path, char **ret); /* Note: the search terminates on the first NULL item. */ #define PATH_IN_SET(p, ...) path_strv_contains(STRV_MAKE(__VA_ARGS__), p) @@ -195,9 +170,7 @@ static inline const char* skip_dev_prefix(const char *p) { } bool empty_or_root(const char *path); -static inline const char* empty_to_root(const char *path) { - return isempty(path) ? "/" : path; -} +const char* empty_to_root(const char *path) _pure_; bool path_strv_contains(char * const *l, const char *path); bool prefixed_path_strv_contains(char * const *l, const char *path); diff --git a/src/basic/sync-util.c b/src/basic/sync-util.c index 4f0d41848a6..eb9c9f1a6e8 100644 --- a/src/basic/sync-util.c +++ b/src/basic/sync-util.c @@ -3,11 +3,13 @@ #include #include +#include "alloc-util.h" #include "errno-util.h" #include "fd-util.h" #include "fs-util.h" #include "log.h" #include "path-util.h" +#include "string-util.h" #include "sync-util.h" int fsync_directory_of_file(int fd) { diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c index da6e4c58d43..5ffb31ec012 100644 --- a/src/basic/sysctl-util.c +++ b/src/basic/sysctl-util.c @@ -6,6 +6,7 @@ #include #include "af-list.h" +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "log.h" diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c index 5554f04bb75..f38f6386c12 100644 --- a/src/basic/unit-name.c +++ b/src/basic/unit-name.c @@ -9,6 +9,7 @@ #include "alloc-util.h" #include "glob-util.h" +#include "hash-funcs.h" #include "hexdecoct.h" #include "log.h" #include "memory-util.h" diff --git a/src/basic/virt.c b/src/basic/virt.c index dbb035a94a7..e07cee72cf5 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -13,6 +13,7 @@ #include "dirent-util.h" #include "env-util.h" #include "errno-util.h" +#include "extract-word.h" #include "fd-util.h" #include "fileio.h" #include "log.h" diff --git a/src/bless-boot/bless-boot.c b/src/bless-boot/bless-boot.c index 61b882c5050..b3205dec363 100644 --- a/src/bless-boot/bless-boot.c +++ b/src/bless-boot/bless-boot.c @@ -18,6 +18,7 @@ #include "parse-util.h" #include "path-util.h" #include "pretty-print.h" +#include "strv.h" #include "sync-util.h" #include "terminal-util.h" #include "verbs.h" diff --git a/src/core/ipe-setup.c b/src/core/ipe-setup.c index 60396f7bdd6..b6ae89e03a7 100644 --- a/src/core/ipe-setup.c +++ b/src/core/ipe-setup.c @@ -8,6 +8,7 @@ #include "log.h" #include "nulstr-util.h" #include "path-util.h" +#include "strv.h" #define IPE_SECFS_DIR "/sys/kernel/security/ipe" #define IPE_SECFS_NEW_POLICY IPE_SECFS_DIR "/new_policy" diff --git a/src/creds/creds.c b/src/creds/creds.c index 343030b5fbe..7295bb7bd13 100644 --- a/src/creds/creds.c +++ b/src/creds/creds.c @@ -29,6 +29,7 @@ #include "process-util.h" #include "stat-util.h" #include "string-table.h" +#include "strv.h" #include "terminal-util.h" #include "tpm2-pcr.h" #include "tpm2-util.h" diff --git a/src/journal/journalctl-catalog.c b/src/journal/journalctl-catalog.c index 55a8c3d26d7..a35b0a64a38 100644 --- a/src/journal/journalctl-catalog.c +++ b/src/journal/journalctl-catalog.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "alloc-util.h" #include "catalog.h" #include "journalctl.h" #include "journalctl-catalog.h" diff --git a/src/journal/journalctl-filter.c b/src/journal/journalctl-filter.c index 2d8981ac77f..ba7ec5a3103 100644 --- a/src/journal/journalctl-filter.c +++ b/src/journal/journalctl-filter.c @@ -14,6 +14,7 @@ #include "logs-show.h" #include "missing_sched.h" #include "path-util.h" +#include "strv.h" #include "unit-name.h" static int add_invocation(sd_journal *j) { diff --git a/src/journal/journalctl-misc.c b/src/journal/journalctl-misc.c index 4e8ecda33b9..e8dc135e771 100644 --- a/src/journal/journalctl-misc.c +++ b/src/journal/journalctl-misc.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "alloc-util.h" #include "dirent-util.h" #include "fd-util.h" #include "format-table.h" @@ -11,6 +12,7 @@ #include "journalctl-util.h" #include "log.h" #include "logs-show.h" +#include "strv.h" #include "syslog-util.h" int action_print_header(void) { diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index 0600102d327..2cb6e9e9884 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -27,6 +27,7 @@ #include "process-util.h" #include "selinux-util.h" #include "socket-util.h" +#include "stat-util.h" #include "string-util.h" #include "strv.h" #include "unaligned.h" diff --git a/src/libsystemd/sd-device/device-filter.c b/src/libsystemd/sd-device/device-filter.c index 4101e7d2baa..579c9440155 100644 --- a/src/libsystemd/sd-device/device-filter.c +++ b/src/libsystemd/sd-device/device-filter.c @@ -4,6 +4,7 @@ #include "device-filter.h" #include "path-util.h" +#include "strv.h" int update_match_strv(Hashmap **match_strv, const char *key, const char *value, bool clear_on_null) { char **strv; diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index 3f9e21505a4..5e055330e01 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -38,6 +38,7 @@ #include "stat-util.h" #include "string-table.h" #include "string-util.h" +#include "strv.h" #include "strxcpyx.h" #include "time-util.h" diff --git a/src/libsystemd/sd-json/json-util.c b/src/libsystemd/sd-json/json-util.c index 9bc12febe77..0fb5e87df71 100644 --- a/src/libsystemd/sd-json/json-util.c +++ b/src/libsystemd/sd-json/json-util.c @@ -14,7 +14,9 @@ #include "parse-util.h" #include "path-util.h" #include "process-util.h" +#include "stat-util.h" #include "string-util.h" +#include "strv.h" #include "syslog-util.h" #include "user-util.h" diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c index 0b3e977d5c3..63a0a166c0a 100644 --- a/src/login/user-runtime-dir.c +++ b/src/login/user-runtime-dir.c @@ -26,6 +26,7 @@ #include "rm-rf.h" #include "selinux-util.h" #include "smack-util.h" +#include "stat-util.h" #include "stdio-util.h" #include "string-util.h" #include "strv.h" diff --git a/src/network/networkctl-config-file.c b/src/network/networkctl-config-file.c index 782cc6a4e80..7a57b3ff29c 100644 --- a/src/network/networkctl-config-file.c +++ b/src/network/networkctl-config-file.c @@ -25,6 +25,7 @@ #include "path-util.h" #include "pretty-print.h" #include "selinux-util.h" +#include "stat-util.h" #include "string-table.h" #include "strv.h" #include "virt.h" diff --git a/src/nsresourced/userns-registry.c b/src/nsresourced/userns-registry.c index c898dbe76ea..5e39c3844e5 100644 --- a/src/nsresourced/userns-registry.c +++ b/src/nsresourced/userns-registry.c @@ -13,6 +13,7 @@ #include "path-util.h" #include "recurse-dir.h" #include "rm-rf.h" +#include "strv.h" #include "user-util.h" #include "userns-registry.h" diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c index 8dcea205201..a5cf892953e 100644 --- a/src/pcrlock/pcrlock.c +++ b/src/pcrlock/pcrlock.c @@ -49,6 +49,7 @@ #include "recovery-key.h" #include "sort-util.h" #include "string-table.h" +#include "strv.h" #include "terminal-util.h" #include "tpm2-util.h" #include "unaligned.h" diff --git a/src/shared/boot-entry.c b/src/shared/boot-entry.c index ea474d0dca1..cbade699a22 100644 --- a/src/shared/boot-entry.c +++ b/src/shared/boot-entry.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "alloc-util.h" #include "boot-entry.h" #include "chase.h" #include "fd-util.h" @@ -10,6 +11,7 @@ #include "path-util.h" #include "string-table.h" #include "string-util.h" +#include "strv.h" #include "utf8.h" bool boot_entry_token_valid(const char *p) { diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 764548339d3..82153b1451d 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -14,6 +14,7 @@ #include "sd-event.h" #include "sd-id128.h" +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-internal.h" #include "bus-label.h" @@ -31,6 +32,7 @@ #include "socket-util.h" #include "stdio-util.h" #include "string-table.h" +#include "strv.h" #include "uid-classification.h" static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c index eb72793c04b..e0e0f7aac11 100644 --- a/src/shared/dev-setup.c +++ b/src/shared/dev-setup.c @@ -14,6 +14,7 @@ #include "mkdir-label.h" #include "nulstr-util.h" #include "path-util.h" +#include "stat-util.h" #include "terminal-util.h" #include "umask-util.h" #include "user-util.h" diff --git a/src/shared/format-table.c b/src/shared/format-table.c index 42dd583fcdf..7c3539abaa5 100644 --- a/src/shared/format-table.c +++ b/src/shared/format-table.c @@ -30,6 +30,7 @@ #include "sort-util.h" #include "stat-util.h" #include "string-util.h" +#include "strv.h" #include "strxcpyx.h" #include "terminal-util.h" #include "time-util.h" diff --git a/src/shared/journal-file-util.c b/src/shared/journal-file-util.c index 43ebe0a12fc..74f85fadced 100644 --- a/src/shared/journal-file-util.c +++ b/src/shared/journal-file-util.c @@ -3,6 +3,7 @@ #include #include +#include "alloc-util.h" #include "chattr-util.h" #include "copy.h" #include "errno-util.h" diff --git a/src/shared/numa-util.c b/src/shared/numa-util.c index b479e5f776e..8cc315061de 100644 --- a/src/shared/numa-util.c +++ b/src/shared/numa-util.c @@ -15,6 +15,7 @@ #include "parse-util.h" #include "stdio-util.h" #include "string-table.h" +#include "string-util.h" bool numa_policy_is_valid(const NUMAPolicy *policy) { assert(policy); diff --git a/src/shared/open-file.c b/src/shared/open-file.c index a9c2a110327..a06a78a4a7b 100644 --- a/src/shared/open-file.c +++ b/src/shared/open-file.c @@ -2,6 +2,7 @@ #include +#include "alloc-util.h" #include "escape.h" #include "extract-word.h" #include "fd-util.h" diff --git a/src/shared/parse-argument.c b/src/shared/parse-argument.c index 288b68ceed3..701802ec0ca 100644 --- a/src/shared/parse-argument.c +++ b/src/shared/parse-argument.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "alloc-util.h" #include "format-table.h" #include "log.h" #include "parse-argument.h" diff --git a/src/shared/parse-helpers.c b/src/shared/parse-helpers.c index 348dce50590..c6ee92afc56 100644 --- a/src/shared/parse-helpers.c +++ b/src/shared/parse-helpers.c @@ -3,6 +3,7 @@ #include #include "af-list.h" +#include "alloc-util.h" #include "extract-word.h" #include "ip-protocol-list.h" #include "log.h" @@ -10,6 +11,7 @@ #include "parse-helpers.h" #include "parse-util.h" #include "path-util.h" +#include "string-util.h" #include "utf8.h" static bool validate_api_vfs(const char *path, PathSimplifyWarnFlags flags) { diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c index bf97dcf53e9..c0c0e332e25 100644 --- a/src/shared/selinux-util.c +++ b/src/shared/selinux-util.c @@ -27,6 +27,7 @@ #include "path-util.h" #include "selinux-util.h" #include "stdio-util.h" +#include "string-util.h" #include "time-util.h" #if HAVE_SELINUX diff --git a/src/shared/shift-uid.c b/src/shared/shift-uid.c index d723fa911be..96f22cdf502 100644 --- a/src/shared/shift-uid.c +++ b/src/shared/shift-uid.c @@ -3,6 +3,7 @@ #include #include "acl-util.h" +#include "alloc-util.h" #include "dirent-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/shared/vpick.c b/src/shared/vpick.c index 2652633f372..ccde661ca52 100644 --- a/src/shared/vpick.c +++ b/src/shared/vpick.c @@ -11,6 +11,8 @@ #include "parse-util.h" #include "path-util.h" #include "recurse-dir.h" +#include "string-util.h" +#include "strv.h" #include "vpick.h" void pick_result_done(PickResult *p) { diff --git a/src/shared/wall.c b/src/shared/wall.c index 11048f39aad..eed7c652dd7 100644 --- a/src/shared/wall.c +++ b/src/shared/wall.c @@ -12,6 +12,7 @@ #include "io-util.h" #include "path-util.h" #include "string-util.h" +#include "strv.h" #include "terminal-util.h" #include "user-util.h" #include "utmp-wtmp.h" diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c index 3466d1aa070..815eb158e8c 100644 --- a/src/shared/watchdog.c +++ b/src/shared/watchdog.c @@ -17,6 +17,7 @@ #include "path-util.h" #include "ratelimit.h" #include "string-util.h" +#include "strv.h" #include "time-util.h" #include "watchdog.h" diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c index 8be8879decd..d76437745b4 100644 --- a/src/system-update-generator/system-update-generator.c +++ b/src/system-update-generator/system-update-generator.c @@ -11,6 +11,7 @@ #include "proc-cmdline.h" #include "special.h" #include "string-util.h" +#include "strv.h" #include "unit-file.h" /* diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c index 363a7beeafd..8ca6eb1b9da 100644 --- a/src/test/test-cgroup.c +++ b/src/test/test-cgroup.c @@ -8,6 +8,7 @@ #include "fd-util.h" #include "path-util.h" #include "process-util.h" +#include "stat-util.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c index 32a3b927e59..51d3e69be77 100644 --- a/src/test/test-mountpoint-util.c +++ b/src/test/test-mountpoint-util.c @@ -14,6 +14,7 @@ #include "mountpoint-util.h" #include "path-util.h" #include "rm-rf.h" +#include "stat-util.h" #include "string-util.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c index 907a6c5c732..4b7f23cf510 100644 --- a/src/test/test-terminal-util.c +++ b/src/test/test-terminal-util.c @@ -15,6 +15,7 @@ #include "macro.h" #include "path-util.h" #include "process-util.h" +#include "stat-util.h" #include "strv.h" #include "terminal-util.h" #include "tests.h" diff --git a/src/tmpfiles/offline-passwd.c b/src/tmpfiles/offline-passwd.c index b4b16fcd524..48244d18b86 100644 --- a/src/tmpfiles/offline-passwd.c +++ b/src/tmpfiles/offline-passwd.c @@ -1,10 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "alloc-util.h" #include "chase.h" #include "fd-util.h" #include "log.h" #include "offline-passwd.h" #include "path-util.h" +#include "strv.h" #include "user-util.h" DEFINE_PRIVATE_HASH_OPS_WITH_KEY_DESTRUCTOR(uid_gid_hash_ops, char, string_hash_func, string_compare_func, free); diff --git a/src/udev/udevadm-util.c b/src/udev/udevadm-util.c index ed69dd17958..5bede0e4daa 100644 --- a/src/udev/udevadm-util.c +++ b/src/udev/udevadm-util.c @@ -12,6 +12,7 @@ #include "log.h" #include "path-util.h" #include "string-table.h" +#include "strv.h" #include "udev-ctrl.h" #include "udev-rules.h" #include "udev-varlink.h" diff --git a/src/varlinkctl/varlinkctl.c b/src/varlinkctl/varlinkctl.c index 75c656d13cf..e5ce16d1cdc 100644 --- a/src/varlinkctl/varlinkctl.c +++ b/src/varlinkctl/varlinkctl.c @@ -19,6 +19,7 @@ #include "path-util.h" #include "pretty-print.h" #include "process-util.h" +#include "strv.h" #include "terminal-util.h" #include "varlink-idl-util.h" #include "varlink-util.h" diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c index 6335775d437..5ec99705294 100644 --- a/src/veritysetup/veritysetup-generator.c +++ b/src/veritysetup/veritysetup-generator.c @@ -20,6 +20,7 @@ #include "proc-cmdline.h" #include "specifier.h" #include "string-util.h" +#include "strv.h" #include "unit-name.h" static const char *arg_dest = NULL; diff --git a/src/vmspawn/vmspawn-mount.c b/src/vmspawn/vmspawn-mount.c index 1845a872f23..a57baaa3e8a 100644 --- a/src/vmspawn/vmspawn-mount.c +++ b/src/vmspawn/vmspawn-mount.c @@ -5,6 +5,7 @@ #include "macro.h" #include "parse-argument.h" #include "path-util.h" +#include "stat-util.h" #include "string-util.h" #include "vmspawn-mount.h" -- 2.47.3