fs-util: Reduce transitive includes

src/basic/btrfs.c

@@ -4,6 +4,7 @@
 #include <sys/ioctl.h>
 
 #include "btrfs.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "path-util.h"

src/basic/cgroup-util.c

@@ -16,6 +16,7 @@
 #include "cgroup-util.h"
 #include "constants.h"
 #include "dirent-util.h"
+#include "errno-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"

src/basic/chase.c

@@ -4,6 +4,7 @@
 
 #include "alloc-util.h"
 #include "chase.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/basic/fs-util.c

@@ -12,6 +12,7 @@
 #include "btrfs.h"
 #include "chattr-util.h"
 #include "dirent-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
@@ -376,6 +377,10 @@ int fd_warn_permissions(const char *path, int fd) {
         return stat_warn_permissions(path, &st);
 }
 
+int access_nofollow(const char *path, mode_t mode) {
+        return RET_NERRNO(faccessat(AT_FDCWD, path, mode, AT_SYMLINK_NOFOLLOW));
+}
+
 int touch_fd(int fd, usec_t stamp) {
         assert(fd >= 0);
 
@@ -425,6 +430,10 @@ int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gi
         return RET_GATHER(ret, touch_fd(fd, stamp));
 }
 
+int touch(const char *path) {
+        return touch_file(path, false, USEC_INFINITY, UID_INVALID, GID_INVALID, MODE_INVALID);
+}
+
 int symlinkat_idempotent(const char *from, int atfd, const char *to, bool make_relative) {
         _cleanup_free_ char *relpath = NULL;
         int r;
@@ -676,6 +685,16 @@ int unlink_or_warn(const char *filename) {
         return 0;
 }
 
+char *rmdir_and_free(char *p) {
+        PROTECT_ERRNO;
+
+        if (!p)
+                return NULL;
+
+        (void) rmdir(p);
+        return mfree(p);
+}
+
 int access_fd(int fd, int mode) {
         assert(fd >= 0);
 

src/basic/fs-util.h

@@ -10,11 +10,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
-#include "errno-util.h"
 #include "lock-util.h"
+#include "memory-util.h"
 #include "time-util.h"
-#include "user-util.h"
 
 #define MODE_INVALID ((mode_t) -1)
 
@@ -51,16 +49,11 @@ 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 access_nofollow(path, mode)                                             \
-        RET_NERRNO(faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW))
+int access_nofollow(const char *path, mode_t mode);
 
 int touch_fd(int fd, usec_t stamp);
-
 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
-
-static inline int touch(const char *path) {
-        return touch_file(path, false, USEC_INFINITY, UID_INVALID, GID_INVALID, MODE_INVALID);
-}
+int touch(const char *path);
 
 int symlinkat_idempotent(const char *from, int atfd, const char *to, bool make_relative);
 static inline int symlink_idempotent(const char *from, const char *to, bool make_relative) {
@@ -90,15 +83,7 @@ int var_tmp_dir(const char **ret);
 int unlink_or_warn(const char *filename);
 
 /* Useful for usage with _cleanup_(), removes a directory and frees the pointer */
-static inline char *rmdir_and_free(char *p) {
-        PROTECT_ERRNO;
-
-        if (!p)
-                return NULL;
-
-        (void) rmdir(p);
-        return mfree(p);
-}
+char *rmdir_and_free(char *p);
 DEFINE_TRIVIAL_CLEANUP_FUNC(char*, rmdir_and_free);
 
 static inline char* unlink_and_free(char *p) {

src/basic/lock-util.c

@@ -10,6 +10,7 @@
 #include <sys/wait.h>
 
 #include "alloc-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "lock-util.h"

src/basic/mkdir.c

@@ -7,6 +7,7 @@
 #include "alloc-util.h"
 #include "btrfs.h"
 #include "chase.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "fs-util.h"

src/basic/mountpoint-util.c

@@ -6,6 +6,7 @@
 
 #include "alloc-util.h"
 #include "chase.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "filesystems.h"

src/basic/os-util.c

@@ -5,6 +5,7 @@
 #include "dirent-util.h"
 #include "env-file.h"
 #include "env-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/basic/path-util.c

@@ -9,6 +9,7 @@
 
 #include "alloc-util.h"
 #include "chase.h"
+#include "errno-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fs-util.h"

src/basic/sync-util.c

@@ -3,6 +3,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "log.h"

src/basic/time-util.c

@@ -12,6 +12,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/basic/tmpfile-util.c

@@ -3,6 +3,7 @@
 #include <sys/mman.h>
 
 #include "alloc-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/binfmt/binfmt.c

@@ -14,6 +14,7 @@
 #include "build.h"
 #include "conf-files.h"
 #include "constants.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"

src/core/exec-credential.c

@@ -20,6 +20,7 @@
 #include "recurse-dir.h"
 #include "rm-rf.h"
 #include "tmpfile-util.h"
+#include "user-util.h"
 
 ExecSetCredential* exec_set_credential_free(ExecSetCredential *sc) {
         if (!sc)

src/core/exec-invoke.c

@@ -64,6 +64,7 @@
 #include "string-table.h"
 #include "strv.h"
 #include "terminal-util.h"
+#include "user-util.h"
 #include "utmp-wtmp.h"
 #include "vpick.h"
 

src/delta/delta.c

@@ -9,6 +9,7 @@
 #include "build.h"
 #include "chase.h"
 #include "dirent-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "glyph-util.h"

src/factory-reset/factory-reset-tool.c

@@ -9,6 +9,7 @@
 #include "build.h"
 #include "device-util.h"
 #include "efivars.h"
+#include "errno-util.h"
 #include "factory-reset.h"
 #include "fs-util.h"
 #include "json-util.h"

src/libsystemd/sd-journal/catalog.c

@@ -14,6 +14,7 @@
 #include "alloc-util.h"
 #include "catalog.h"
 #include "conf-files.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/libsystemd/sd-json/json-util.c

@@ -3,6 +3,7 @@
 #include "alloc-util.h"
 #include "devnum-util.h"
 #include "env-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "glyph-util.h"
 #include "in-addr-util.h"

src/libsystemd/sd-network/sd-network.c

@@ -8,6 +8,7 @@
 
 #include "alloc-util.h"
 #include "env-file.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "inotify-util.h"

src/locale/localed-util.c

@@ -9,6 +9,7 @@
 #include "env-file.h"
 #include "env-file-label.h"
 #include "env-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "kbd-util.h"

src/network/generator/main.c

@@ -4,6 +4,7 @@
 
 #include "build.h"
 #include "creds-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "generator.h"

src/pcrlock/pcrlock.c

@@ -53,6 +53,7 @@
 #include "tpm2-util.h"
 #include "unaligned.h"
 #include "unit-name.h"
+#include "user-util.h"
 #include "utf8.h"
 #include "varlink-io.systemd.PCRLock.h"
 #include "varlink-util.h"

src/random-seed/random-seed.c

@@ -13,6 +13,7 @@
 
 #include "alloc-util.h"
 #include "build.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "io-util.h"

src/shared/chown-recursive.c

@@ -6,6 +6,7 @@
 
 #include "chown-recursive.h"
 #include "dirent-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "macro.h"

src/shared/creds-util.c

@@ -18,6 +18,7 @@
 #include "creds-util.h"
 #include "efi-api.h"
 #include "env-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "find-esp.h"

src/shared/devnode-acl.c

@@ -9,6 +9,7 @@
 #include "device-util.h"
 #include "devnode-acl.h"
 #include "dirent-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "fs-util.h"

src/shared/edit-util.c

@@ -6,6 +6,7 @@
 #include "alloc-util.h"
 #include "copy.h"
 #include "edit-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/shared/fstab-util.c

@@ -6,6 +6,7 @@
 
 #include "alloc-util.h"
 #include "device-nodes.h"
+#include "errno-util.h"
 #include "fstab-util.h"
 #include "initrd-util.h"
 #include "libmount-util.h"

src/shared/label-util.c

@@ -5,6 +5,7 @@
 #include <unistd.h>
 
 #include "btrfs-util.h"
+#include "errno-util.h"
 #include "fs-util.h"
 #include "label.h"
 #include "label-util.h"

src/shared/portable-util.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "fs-util.h"
 #include "log.h"
 #include "nulstr-util.h"

src/shared/tpm2-util.c

@@ -38,6 +38,7 @@
 #include "sync-util.h"
 #include "time-util.h"
 #include "tpm2-util.h"
+#include "user-util.h"
 #include "virt.h"
 
 #if HAVE_OPENSSL

src/shutdown/umount.c

@@ -28,6 +28,7 @@
 #include "random-util.h"
 #include "signal-util.h"
 #include "umount.h"
+#include "user-util.h"
 #include "virt.h"
 
 static void mount_point_free(MountPoint **head, MountPoint *m) {

src/sysupdate/sysupdate-instance.c

@@ -3,6 +3,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#include "alloc-util.h"
 #include "log.h"
 #include "sysupdate-instance.h"
 

src/test/test-chase.c

@@ -15,6 +15,7 @@
 #include "string-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
+#include "user-util.h"
 
 static const char *arg_test_dir = NULL;
 

src/test/test-conf-parser.c

@@ -12,6 +12,7 @@
 #include "strv.h"
 #include "tests.h"
 #include "tmpfile-util.h"
+#include "user-util.h"
 
 static void test_config_parse_path_one(const char *rvalue, const char *expected) {
         _cleanup_free_ char *path = NULL;

src/test/test-socket-util.c

@@ -25,6 +25,7 @@
 #include "string-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
+#include "user-util.h"
 
 assert_cc(SUN_PATH_LEN == 108);
 

src/udev/udev-error.c

@@ -1,7 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <stdlib.h>
+
 #include "device-private.h"
 #include "errno-list.h"
+#include "errno-util.h"
 #include "signal-util.h"
 #include "udev-error.h"
 

src/udev/udev-node.c

@@ -9,6 +9,7 @@
 #include "device-util.h"
 #include "devnum-util.h"
 #include "dirent-util.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"

src/udev/udev-watch.c

@@ -9,6 +9,7 @@
 #include "daemon-util.h"
 #include "device-util.h"
 #include "dirent-util.h"
+#include "errno-util.h"
 #include "event-util.h"
 #include "fd-util.h"
 #include "fs-util.h"

src/update-done/update-done.c

@@ -7,6 +7,7 @@
 
 #include "alloc-util.h"
 #include "chase.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"

src/validatefs/validatefs.c

@@ -7,6 +7,7 @@
 #include "build.h"
 #include "chase.h"
 #include "device-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "initrd-util.h"
 #include "main-func.h"

src/vmspawn/vmspawn.c

@@ -74,6 +74,7 @@
 #include "time-util.h"
 #include "tmpfile-util.h"
 #include "unit-name.h"
+#include "user-util.h"
 #include "utf8.h"
 #include "vmspawn-mount.h"
 #include "vmspawn-register.h"

src/xdg-autostart-generator/test-xdg-autostart.c

@@ -7,6 +7,7 @@
 #include "strv.h"
 #include "tests.h"
 #include "tmpfile-util.h"
+#include "user-util.h"
 #include "xdg-autostart-service.h"
 
 TEST(translate_name) {