]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
fs-util: Reduce transitive includes
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 5 May 2025 08:50:25 +0000 (10:50 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 7 May 2025 13:04:46 +0000 (22:04 +0900)
45 files changed:
src/basic/btrfs.c
src/basic/cgroup-util.c
src/basic/chase.c
src/basic/fs-util.c
src/basic/fs-util.h
src/basic/lock-util.c
src/basic/mkdir.c
src/basic/mountpoint-util.c
src/basic/os-util.c
src/basic/path-util.c
src/basic/sync-util.c
src/basic/time-util.c
src/basic/tmpfile-util.c
src/binfmt/binfmt.c
src/core/exec-credential.c
src/core/exec-invoke.c
src/delta/delta.c
src/factory-reset/factory-reset-tool.c
src/libsystemd/sd-journal/catalog.c
src/libsystemd/sd-json/json-util.c
src/libsystemd/sd-network/sd-network.c
src/locale/localed-util.c
src/network/generator/main.c
src/pcrlock/pcrlock.c
src/random-seed/random-seed.c
src/shared/chown-recursive.c
src/shared/creds-util.c
src/shared/devnode-acl.c
src/shared/edit-util.c
src/shared/fstab-util.c
src/shared/label-util.c
src/shared/portable-util.c
src/shared/tpm2-util.c
src/shutdown/umount.c
src/sysupdate/sysupdate-instance.c
src/test/test-chase.c
src/test/test-conf-parser.c
src/test/test-socket-util.c
src/udev/udev-error.c
src/udev/udev-node.c
src/udev/udev-watch.c
src/update-done/update-done.c
src/validatefs/validatefs.c
src/vmspawn/vmspawn.c
src/xdg-autostart-generator/test-xdg-autostart.c

index bb07374def9d790a3b7cd2b74fbc1e2e3924d150..dc2d6a5ddbd3b14621cd48a56d344603a43ba268 100644 (file)
@@ -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"
index 8db7f07ba2d94ec79cfd166874559080a0c1ff7b..aa88975bd92545405397cfbaf4385aac865a07c5 100644 (file)
@@ -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"
index 776c50ad181706705e8fc938262e2653ae836341..954586dbf034f4fda823526fade7ebbe72b1d929 100644 (file)
@@ -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"
index 3b619a15ac61d2f6c9ee3203d03797ccd2c78f56..d306cc6d11285168aba4c12f17e54e443c0e055e 100644 (file)
@@ -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);
 
index b2c01079901b9fdcef9b944e92a4eb2dd1f92612..9f2b37a2d6cb40de4af7d3fcf1fb654b823eda15 100644 (file)
 #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) {
index ea0dcf720ed2c82b81e9ffd6702fb57ecdb84c0b..f87ebb05c4ba15ee66b75a5d6a2a0a53d046d1b5 100644 (file)
@@ -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"
index 90c06681bcd49518b84a16653ab4732882417f16..a44add67de890a9b15022c9dbb9291d635e2c01c 100644 (file)
@@ -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"
index 23653160a0fd6ec87bdc520b53458589988199be..a66b9169d0aed9a4baec0ea72cc37f0d7bdd8ce2 100644 (file)
@@ -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"
index bde36a9d4d6fe77e390ae45a662120f82938c81c..cc6b0a7f51ed518fbec3c61253dbb5c12b6fc9f6 100644 (file)
@@ -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"
index dbde364effd91fc2098b7d66a7495f70d1d541d4..dff1b0ebe4e530f1523faf7b504fef94cb6463ad 100644 (file)
@@ -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"
index aaae53529bba09c111dd046b0e6d3503c3695a61..4f0d41848a6f74d07e3af9bfaf32e2e251f10207 100644 (file)
@@ -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"
index 17850c7e163fe37d954379dec610f1774f9a908d..59fb371e9fffd6b62baa080f28c48564333d81fd 100644 (file)
@@ -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"
index 371f2ae3a8bfd5c8a3681dd6d69e97d12b11e710..9d2c0b71b9c6b98d571ebd769ea2c0f410f9ae47 100644 (file)
@@ -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"
index 76c0056212123e081b265f950f6f0378b5885cbe..eb91e916ded9101a2b043a117d04e733d47e10ac 100644 (file)
@@ -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"
index bed7ff3672c81af6eb8366c401f415398cddd470..1608e4c9b07777775e902313a61389fd3dead2c0 100644 (file)
@@ -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)
index d0c69d98ecfb69dd6cfc7133d7ee78802899ab60..b0bf50257679d52d636f56771a3d9f5e7a82c249 100644 (file)
@@ -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"
 
index 89815758b386062a43650208c42ee0acae6b0c1c..eb53999da904126a880bcdcb7ca444ce3a13580c 100644 (file)
@@ -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"
index b32839656a2f330779e50ff732721cba004607eb..73f37e7490b7ff1f6ac6c40bda09bc2fff30a46e 100644 (file)
@@ -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"
index 4e3733ce2e9947bdbf2c6adb3ddc25af48725439..1ecf335fb864c4e68add041bb55b52f9f1fa8583 100644 (file)
@@ -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"
index 83c098b0ceac2692b6b53c78a2000381870b123b..9bc12febe7782125880d2fd9b53403c2510f6cb4 100644 (file)
@@ -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"
index a7d860c8bab8a20254bf83edcfd099bc6663d201..a4b432b6ee2e90306233c23db2bd5fcc755990b4 100644 (file)
@@ -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"
index 76383589c08d4ec8538e9913ba39f5932308136a..bc0b2b9878413ca7b940652f7e76d392ce1efcce 100644 (file)
@@ -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"
index c15dfa16cd7333643457fa47c18e5da280ad14d5..78389ba31943bb754da9c449012e1b1284270dd9 100644 (file)
@@ -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"
index 8e3a38929c10f53756958eec8fa4e405cad7d744..8dcea2052014ee1aec7af9d48fc48b96ab2597e9 100644 (file)
@@ -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"
index 3ddaea04a32b3870b5e00602b2ce000791918c43..8ba359c93a05e13030ea77112db6ef34be4d956f 100644 (file)
@@ -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"
index 06c5adb1e500f7fee76699a24baaa3a643f16fb3..1bd2bb57057f8cc4c7e6771cfb05502a9ffa201a 100644 (file)
@@ -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"
index a4284075adcc910fe46796991fb892159a3bf397..67707dee1ecfa04b20f6f28213cfdc7327f389e8 100644 (file)
@@ -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"
index 2015bd76416eda85f03b81c144cd49f0529f2a53..81961c5b05dbcb32eb3c25e8ef30a38a808c9b64 100644 (file)
@@ -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"
index 56c6133db79c3b14c36f11005a0835c571ef8716..becb9c54b76b1104dc282b92ff9607ae3373ae6d 100644 (file)
@@ -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"
index 6cfff217430013db53c776168863579800a1e738..b59e4838d806d4398659baf0c690ec1156a851c3 100644 (file)
@@ -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"
index 2c482daaf6c4d786ae19b5c43dea2453c24e1328..a7723438662e8f39aa23f7d44ed6dba817399364 100644 (file)
@@ -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"
index 1766171164afe4c1dbd5c52b632aad46d0a1e3cf..c472c2fea6e5a0990cb703081034f019c757ad87 100644 (file)
@@ -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"
index f14e9eeae486e1a80861ff6562daa705ed48c87c..afef7abc4eae9e8b5ebd458025bf6ae649ebf46f 100644 (file)
@@ -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
index ba87a992bc7da6d07b30a301d5a16dae801cd290..9b083d2492109fcf24764d6cb6c05309b400d4bb 100644 (file)
@@ -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) {
index aef16c35dcd2fdd388a0238c5fb6ac1a835aa1c2..b06fe9bc965d7e9cc790b757e37207fd7987a73a 100644 (file)
@@ -3,6 +3,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#include "alloc-util.h"
 #include "log.h"
 #include "sysupdate-instance.h"
 
index 09baae64fd0caf8e41679ca8c612a96c91ce6b89..469e0b5a39b4715d7e4431901231dbbcb694fa1c 100644 (file)
@@ -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;
 
index 6989d470b15bb931ec52e539e7c3b9e68faebea3..d00444e24f85d750e2368cffbcfe3c8cb30cedf7 100644 (file)
@@ -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;
index acf11f3639d293de0dc70040bdc4c44d628f8584..ba2b4470d1c451c2c9a3ddb1565318771be5203f 100644 (file)
@@ -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);
 
index fea14e3ffe760bf31f2b7f1d92f3a1bc48461f83..bc438dfaf8d038d7558b795e8326ad63ff4a4c23 100644 (file)
@@ -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"
 
index 673f723ff21e66f00d459aeb9eae324800e36dec..2df5d54feefcb3e6ed95c491e83e6947a15fd47c 100644 (file)
@@ -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"
index 2d3127eee998595189f9376a689c8351141f1806..003f61293f438e55430675430940fd44b0984a73 100644 (file)
@@ -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"
index cb6822bdddaf23e2c4ca8a2375aa7699a82aef65..b39b9c44581792400e721c91a5f343b518199326 100644 (file)
@@ -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"
index 2499a7e20fa898b1ddd9c16cbd53eece52d9e132..db32fe3c230ec697f3b5d7ad06f62ed87c4b65f6 100644 (file)
@@ -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"
index 1034349e872646a5624ec857d4749de56307c9d6..7c12b5e6120f27893e789eb347308e57bb95a119 100644 (file)
@@ -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"
index 81f85d6b1563a873709cb7da55a40b4c06300d6f..edad2452bec1959e7158f4c197a9b20ae6efd881 100644 (file)
@@ -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) {