]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
util-lib: split out fd-related operations into fd-util.[ch]
authorLennart Poettering <lennart@poettering.net>
Sun, 25 Oct 2015 12:14:12 +0000 (13:14 +0100)
committerLennart Poettering <lennart@poettering.net>
Sun, 25 Oct 2015 12:19:18 +0000 (13:19 +0100)
There are more than enough to deserve their own .c file, hence move them
over.

275 files changed:
Makefile.am
src/activate/activate.c
src/basic/async.c
src/basic/audit.c
src/basic/barrier.c
src/basic/btrfs-util.c
src/basic/capability.c
src/basic/cgroup-util.c
src/basic/clock-util.c
src/basic/clock-util.h
src/basic/conf-files.c
src/basic/copy.c
src/basic/extract-word.c
src/basic/fd-util.c [new file with mode: 0644]
src/basic/fd-util.h [new file with mode: 0644]
src/basic/fdset.c
src/basic/fileio.c
src/basic/hostname-util.c
src/basic/locale-util.c
src/basic/lockfile-util.c
src/basic/log.c
src/basic/memfd-util.c
src/basic/memfd-util.h
src/basic/path-util.c
src/basic/process-util.c
src/basic/random-util.c
src/basic/rm-rf.c
src/basic/socket-label.c
src/basic/terminal-util.c
src/basic/time-util.c
src/basic/util.c
src/basic/util.h
src/binfmt/binfmt.c
src/boot/bootctl.c
src/bootchart/bootchart.c
src/bootchart/store.c
src/bootchart/svg.c
src/bus-proxyd/bus-proxyd.c
src/bus-proxyd/proxy.c
src/cgtop/cgtop.c
src/core/audit-fd.c
src/core/automount.c
src/core/busname.c
src/core/cgroup.c
src/core/dbus-cgroup.c
src/core/dbus-execute.c
src/core/dbus-manager.c
src/core/dbus-service.c
src/core/dbus.c
src/core/execute.c
src/core/ima-setup.c
src/core/killall.c
src/core/load-fragment.c
src/core/machine-id-setup.c
src/core/main.c
src/core/manager.c
src/core/namespace.c
src/core/path.c
src/core/service.c
src/core/smack-setup.c
src/core/socket.c
src/core/swap.c
src/core/umount.c
src/cryptsetup/cryptsetup-generator.c
src/dbus1-generator/dbus1-generator.c
src/delta/delta.c
src/firstboot/firstboot.c
src/fsck/fsck.c
src/fstab-generator/fstab-generator.c
src/getty-generator/getty-generator.c
src/gpt-auto-generator/gpt-auto-generator.c
src/hwdb/hwdb.c
src/import/curl-util.c
src/import/export-raw.c
src/import/export-tar.c
src/import/export.c
src/import/import-common.c
src/import/import-raw.c
src/import/import-tar.c
src/import/import.c
src/import/importd.c
src/import/pull-common.c
src/import/pull-dkr.c
src/import/pull-job.c
src/import/pull-raw.c
src/import/pull-tar.c
src/import/test-qcow2.c
src/initctl/initctl.c
src/journal-remote/journal-gatewayd.c
src/journal-remote/journal-remote-parse.c
src/journal-remote/journal-remote.c
src/journal-remote/journal-upload.c
src/journal/cat.c
src/journal/catalog.c
src/journal/compress.c
src/journal/coredump-vacuum.c
src/journal/coredump.c
src/journal/coredumpctl.c
src/journal/journal-authenticate.c
src/journal/journal-def.h
src/journal/journal-file.c
src/journal/journal-qrcode.h
src/journal/journal-send.c
src/journal/journal-vacuum.c
src/journal/journal-verify.c
src/journal/journalctl.c
src/journal/journald-audit.c
src/journal/journald-console.c
src/journal/journald-kmsg.c
src/journal/journald-native.c
src/journal/journald-server.c
src/journal/journald-stream.c
src/journal/journald-syslog.c
src/journal/sd-journal.c
src/journal/stacktrace.c
src/journal/test-catalog.c
src/journal/test-compress.c
src/journal/test-journal-init.c
src/journal/test-journal-send.c
src/journal/test-journal-verify.c
src/journal/test-mmap-cache.c
src/libsystemd-network/arp-util.c
src/libsystemd-network/dhcp-network.c
src/libsystemd-network/dhcp6-network.c
src/libsystemd-network/icmp6-util.c
src/libsystemd-network/lldp-network.c
src/libsystemd-network/sd-dhcp-lease.c
src/libsystemd-network/sd-dhcp-server.c
src/libsystemd-network/sd-dhcp6-client.c
src/libsystemd-network/sd-ipv4acd.c
src/libsystemd-network/sd-lldp.c
src/libsystemd-network/sd-pppoe.c
src/libsystemd-network/test-dhcp-client.c
src/libsystemd-network/test-dhcp6-client.c
src/libsystemd-network/test-ipv4ll.c
src/libsystemd-network/test-lldp.c
src/libsystemd/sd-bus/bus-container.c
src/libsystemd/sd-bus/bus-creds.c
src/libsystemd/sd-bus/bus-introspect.c
src/libsystemd/sd-bus/bus-kernel.c
src/libsystemd/sd-bus/bus-match.c
src/libsystemd/sd-bus/bus-message.c
src/libsystemd/sd-bus/bus-socket.c
src/libsystemd/sd-bus/bus-track.c
src/libsystemd/sd-bus/busctl.c
src/libsystemd/sd-bus/sd-bus.c
src/libsystemd/sd-bus/test-bus-benchmark.c
src/libsystemd/sd-bus/test-bus-chat.c
src/libsystemd/sd-bus/test-bus-kernel-bloom.c
src/libsystemd/sd-bus/test-bus-kernel.c
src/libsystemd/sd-bus/test-bus-marshal.c
src/libsystemd/sd-bus/test-bus-zero-copy.c
src/libsystemd/sd-daemon/sd-daemon.c
src/libsystemd/sd-device/device-enumerator.c
src/libsystemd/sd-device/device-private.c
src/libsystemd/sd-device/sd-device.c
src/libsystemd/sd-event/sd-event.c
src/libsystemd/sd-event/test-event.c
src/libsystemd/sd-hwdb/sd-hwdb.c
src/libsystemd/sd-id128/sd-id128.c
src/libsystemd/sd-login/sd-login.c
src/libsystemd/sd-login/test-login.c
src/libsystemd/sd-netlink/sd-netlink.c
src/libsystemd/sd-network/network-util.c
src/libsystemd/sd-network/sd-network.c
src/libsystemd/sd-path/sd-path.c
src/libsystemd/sd-resolve/sd-resolve.c
src/libudev/libudev-monitor.c
src/libudev/libudev-queue.c
src/libudev/libudev.c
src/locale/localectl.c
src/locale/localed.c
src/login/inhibit.c
src/login/logind-acl.c
src/login/logind-button.c
src/login/logind-core.c
src/login/logind-dbus.c
src/login/logind-inhibit.c
src/login/logind-seat.c
src/login/logind-session-dbus.c
src/login/logind-session-device.c
src/login/logind-session.c
src/login/logind-user.c
src/login/logind.c
src/login/pam_systemd.c
src/login/test-inhibit.c
src/machine/machine-dbus.c
src/machine/machine.c
src/machine/machinectl.c
src/machine/machined-dbus.c
src/machine/machined.c
src/modules-load/modules-load.c
src/network/networkd-link.c
src/network/networkd-manager.c
src/network/networkd-netdev-tuntap.c
src/network/networkd-netdev.c
src/network/networkd-network.c
src/nspawn/nspawn-cgroup.c
src/nspawn/nspawn-expose-ports.c
src/nspawn/nspawn-setuid.c
src/nspawn/nspawn.c
src/random-seed/random-seed.c
src/reply-password/reply-password.c
src/resolve/resolved-dns-scope.c
src/resolve/resolved-dns-stream.c
src/resolve/resolved-dns-transaction.c
src/resolve/resolved-llmnr.c
src/resolve/resolved-manager.c
src/rfkill/rfkill.c
src/run/run.c
src/shared/acpi-fpdt.c
src/shared/ask-password-api.c
src/shared/base-filesystem.c
src/shared/bus-util.c
src/shared/cgroup-show.c
src/shared/clean-ipc.c
src/shared/condition.c
src/shared/conf-parser.c
src/shared/dropin.c
src/shared/efivars.c
src/shared/generator.c
src/shared/install.c
src/shared/logs-show.c
src/shared/machine-image.c
src/shared/machine-pool.c
src/shared/pager.c
src/shared/ptyfwd.c
src/shared/sleep-config.c
src/shared/spawn-polkit-agent.c
src/shared/switch-root.c
src/shared/utmp-wtmp.c
src/shared/watchdog.c
src/sleep/sleep.c
src/socket-proxy/socket-proxyd.c
src/sysctl/sysctl.c
src/systemctl/systemctl.c
src/sysusers/sysusers.c
src/sysv-generator/sysv-generator.c
src/test/test-btrfs.c
src/test/test-capability.c
src/test/test-cgroup-util.c
src/test/test-copy.c
src/test/test-fdset.c
src/test/test-fileio.c
src/test/test-namespace.c
src/test/test-path-util.c
src/test/test-path.c
src/test/test-sigbus.c
src/test/test-socket-util.c
src/test/test-terminal-util.c
src/test/test-tmpfiles.c
src/test/test-unit-file.c
src/test/test-util.c
src/timesync/timesyncd-manager.c
src/timesync/timesyncd.c
src/tmpfiles/tmpfiles.c
src/tty-ask-password-agent/tty-ask-password-agent.c
src/udev/ata_id/ata_id.c
src/udev/net/link-config.c
src/udev/scsi_id/scsi_id.c
src/udev/udev-builtin-blkid.c
src/udev/udev-builtin-btrfs.c
src/udev/udev-builtin-input_id.c
src/udev/udev-builtin-keyboard.c
src/udev/udev-builtin-net_id.c
src/udev/udev-builtin-usb_id.c
src/udev/udev-ctrl.c
src/udev/udev-event.c
src/udev/udev-rules.c
src/udev/udevadm-info.c
src/udev/udevadm-monitor.c
src/udev/udevd.c
src/udev/v4l_id/v4l_id.c
src/update-done/update-done.c
src/vconsole/vconsole-setup.c

index 9ef55f4e435f36f75421a9d4b860e3fe082d52bb..2bfd3aeea1e3ccc36085a4142c644908c8ce64cf 100644 (file)
@@ -783,6 +783,8 @@ libbasic_la_SOURCES = \
        src/basic/util.h \
        src/basic/string-util.c \
        src/basic/string-util.h \
+       src/basic/fd-util.c \
+       src/basic/fd-util.h \
        src/basic/extract-word.c \
        src/basic/extract-word.h \
        src/basic/escape.c \
index adb43623cfa2efb754f8c854386ae1f6353cc7d9..0e6ead310efc03de31f3ecda3f87101dd2aea64c 100644 (file)
@@ -34,6 +34,7 @@
 #include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "fd-util.h"
 
 static char** arg_listen = NULL;
 static bool arg_accept = false;
index 7725e6d7d363e7ee17821214863525dd062e4c18..c3135f0efe2c8abdaca148e5209e6a7b294671bc 100644 (file)
@@ -23,6 +23,7 @@
 #include <unistd.h>
 
 #include "async.h"
+#include "fd-util.h"
 #include "log.h"
 #include "util.h"
 
index 1f593aa813571673b448873ce6bad9ad35f60cc5..af43ec809745a4af577389d9908e13c4bf675620 100644 (file)
 #include <errno.h>
 #include <stdio.h>
 
-#include "macro.h"
 #include "audit.h"
-#include "util.h"
-#include "process-util.h"
+#include "fd-util.h"
 #include "fileio.h"
+#include "macro.h"
+#include "process-util.h"
+#include "util.h"
 
 int audit_session_from_pid(pid_t pid, uint32_t *id) {
         _cleanup_free_ char *s = NULL;
index 436ba9598910a861b59312effa26622f7cdee1c8..2d55bab4abb39c5c9fca8dbaa47b6de284973e3e 100644 (file)
@@ -30,6 +30,7 @@
 #include <unistd.h>
 
 #include "barrier.h"
+#include "fd-util.h"
 #include "macro.h"
 #include "util.h"
 
index df7b959c125b08dc4a75c5485ba994972224114c..f799f8dcc20914a908aad2a8eb139c378fb2dd71 100644 (file)
@@ -27,7 +27,9 @@
 #endif
 
 #include "btrfs-ctree.h"
+#include "btrfs-util.h"
 #include "copy.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "macro.h"
 #include "missing.h"
@@ -36,7 +38,6 @@
 #include "smack-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "btrfs-util.h"
 
 /* WARNING: Be careful with file system ioctls! When we get an fd, we
  * need to make sure it either refers to only a regular file or
index 8dbe4da5bbbe1280518e81bca9af166549f06bf1..6f25b5dee943dd3ad875282859c8ae4beb1650f8 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
 #include <errno.h>
+#include <grp.h>
 #include <stdio.h>
 #include <sys/capability.h>
 #include <sys/prctl.h>
-#include "grp.h"
+#include <unistd.h>
 
+#include "capability.h"
+#include "fileio.h"
+#include "log.h"
 #include "macro.h"
 #include "util.h"
-#include "log.h"
-#include "fileio.h"
-#include "capability.h"
 
 int have_effective_cap(int value) {
         _cleanup_cap_free_ cap_t cap;
index ce21ef73eb85e0aff5ec5c857784c0f0022bc781..958497543afdc154e14d52d16e2e628a148a9d4c 100644 (file)
@@ -29,7 +29,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "cgroup-util.h"
 #include "extract-word.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "login-util.h"
@@ -42,7 +44,6 @@
 #include "string-util.h"
 #include "unit-name.h"
 #include "util.h"
-#include "cgroup-util.h"
 
 int cg_enumerate_processes(const char *controller, const char *path, FILE **_f) {
         _cleanup_free_ char *fs = NULL;
index 03ec5725ae517f0586660588e81aa7c6172ddd85..00ee4c2796df7391876de0abf07e052f28f1c9b6 100644 (file)
 #include <sys/ioctl.h>
 #include <sys/time.h>
 
+#include "clock-util.h"
+#include "fd-util.h"
 #include "macro.h"
 #include "string-util.h"
 #include "util.h"
-#include "clock-util.h"
 
 int clock_get_hwclock(struct tm *tm) {
         _cleanup_close_ int fd = -1;
index 8c2d2354302fc7771bf3e4f71d124f415db84325..fef2d471a6f37f45c83d13cb7bbc1b56f8e257f5 100644 (file)
@@ -21,6 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <time.h>
 
 int clock_is_localtime(void);
 int clock_set_timezone(int *min);
index 0e44d1bbad3504350d78dc9239291c0350d6799c..3af3fe392cc3f7a6418f42765348a49f4211007f 100644 (file)
@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "conf-files.h"
+#include "fd-util.h"
 #include "hashmap.h"
 #include "log.h"
 #include "macro.h"
@@ -33,7 +35,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "conf-files.h"
 
 static int files_add(Hashmap *h, const char *root, const char *path, const char *suffix) {
         _cleanup_closedir_ DIR *dir = NULL;
index 7702d906c778edce41efa37e819d6e65b7d0726c..c15527df22928039e65e14f9730f8584cda6cd86 100644 (file)
 #include <sys/xattr.h>
 
 #include "btrfs-util.h"
+#include "copy.h"
+#include "fd-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "copy.h"
 
 #define COPY_BUFFER_SIZE (16*1024)
 
index 52d2672390eb452058ffbc153ef07d55979d77ba..f2b74802fa494ba0d40849d55dd2e68d04c635fa 100644 (file)
@@ -22,7 +22,6 @@
 #include "escape.h"
 #include "utf8.h"
 #include "util.h"
-
 #include "extract-word.h"
 
 int extract_first_word(const char **p, char **ret, const char *separators, ExtractFlags flags) {
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
new file mode 100644 (file)
index 0000000..e54c104
--- /dev/null
@@ -0,0 +1,321 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  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 <http://www.gnu.org/licenses/>.
+***/
+
+#include "fd-util.h"
+#include "util.h"
+
+int close_nointr(int fd) {
+        assert(fd >= 0);
+
+        if (close(fd) >= 0)
+                return 0;
+
+        /*
+         * Just ignore EINTR; a retry loop is the wrong thing to do on
+         * Linux.
+         *
+         * http://lkml.indiana.edu/hypermail/linux/kernel/0509.1/0877.html
+         * https://bugzilla.gnome.org/show_bug.cgi?id=682819
+         * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR
+         * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain
+         */
+        if (errno == EINTR)
+                return 0;
+
+        return -errno;
+}
+
+int safe_close(int fd) {
+
+        /*
+         * Like close_nointr() but cannot fail. Guarantees errno is
+         * unchanged. Is a NOP with negative fds passed, and returns
+         * -1, so that it can be used in this syntax:
+         *
+         * fd = safe_close(fd);
+         */
+
+        if (fd >= 0) {
+                PROTECT_ERRNO;
+
+                /* The kernel might return pretty much any error code
+                 * via close(), but the fd will be closed anyway. The
+                 * only condition we want to check for here is whether
+                 * the fd was invalid at all... */
+
+                assert_se(close_nointr(fd) != -EBADF);
+        }
+
+        return -1;
+}
+
+void safe_close_pair(int p[]) {
+        assert(p);
+
+        if (p[0] == p[1]) {
+                /* Special case pairs which use the same fd in both
+                 * directions... */
+                p[0] = p[1] = safe_close(p[0]);
+                return;
+        }
+
+        p[0] = safe_close(p[0]);
+        p[1] = safe_close(p[1]);
+}
+
+void close_many(const int fds[], unsigned n_fd) {
+        unsigned i;
+
+        assert(fds || n_fd <= 0);
+
+        for (i = 0; i < n_fd; i++)
+                safe_close(fds[i]);
+}
+
+int fclose_nointr(FILE *f) {
+        assert(f);
+
+        /* Same as close_nointr(), but for fclose() */
+
+        if (fclose(f) == 0)
+                return 0;
+
+        if (errno == EINTR)
+                return 0;
+
+        return -errno;
+}
+
+FILE* safe_fclose(FILE *f) {
+
+        /* Same as safe_close(), but for fclose() */
+
+        if (f) {
+                PROTECT_ERRNO;
+
+                assert_se(fclose_nointr(f) != EBADF);
+        }
+
+        return NULL;
+}
+
+DIR* safe_closedir(DIR *d) {
+
+        if (d) {
+                PROTECT_ERRNO;
+
+                assert_se(closedir(d) >= 0 || errno != EBADF);
+        }
+
+        return NULL;
+}
+
+int fd_nonblock(int fd, bool nonblock) {
+        int flags, nflags;
+
+        assert(fd >= 0);
+
+        flags = fcntl(fd, F_GETFL, 0);
+        if (flags < 0)
+                return -errno;
+
+        if (nonblock)
+                nflags = flags | O_NONBLOCK;
+        else
+                nflags = flags & ~O_NONBLOCK;
+
+        if (nflags == flags)
+                return 0;
+
+        if (fcntl(fd, F_SETFL, nflags) < 0)
+                return -errno;
+
+        return 0;
+}
+
+int fd_cloexec(int fd, bool cloexec) {
+        int flags, nflags;
+
+        assert(fd >= 0);
+
+        flags = fcntl(fd, F_GETFD, 0);
+        if (flags < 0)
+                return -errno;
+
+        if (cloexec)
+                nflags = flags | FD_CLOEXEC;
+        else
+                nflags = flags & ~FD_CLOEXEC;
+
+        if (nflags == flags)
+                return 0;
+
+        if (fcntl(fd, F_SETFD, nflags) < 0)
+                return -errno;
+
+        return 0;
+}
+
+_pure_ static bool fd_in_set(int fd, const int fdset[], unsigned n_fdset) {
+        unsigned i;
+
+        assert(n_fdset == 0 || fdset);
+
+        for (i = 0; i < n_fdset; i++)
+                if (fdset[i] == fd)
+                        return true;
+
+        return false;
+}
+
+int close_all_fds(const int except[], unsigned n_except) {
+        _cleanup_closedir_ DIR *d = NULL;
+        struct dirent *de;
+        int r = 0;
+
+        assert(n_except == 0 || except);
+
+        d = opendir("/proc/self/fd");
+        if (!d) {
+                int fd;
+                struct rlimit rl;
+
+                /* When /proc isn't available (for example in chroots)
+                 * the fallback is brute forcing through the fd
+                 * table */
+
+                assert_se(getrlimit(RLIMIT_NOFILE, &rl) >= 0);
+                for (fd = 3; fd < (int) rl.rlim_max; fd ++) {
+
+                        if (fd_in_set(fd, except, n_except))
+                                continue;
+
+                        if (close_nointr(fd) < 0)
+                                if (errno != EBADF && r == 0)
+                                        r = -errno;
+                }
+
+                return r;
+        }
+
+        while ((de = readdir(d))) {
+                int fd = -1;
+
+                if (hidden_file(de->d_name))
+                        continue;
+
+                if (safe_atoi(de->d_name, &fd) < 0)
+                        /* Let's better ignore this, just in case */
+                        continue;
+
+                if (fd < 3)
+                        continue;
+
+                if (fd == dirfd(d))
+                        continue;
+
+                if (fd_in_set(fd, except, n_except))
+                        continue;
+
+                if (close_nointr(fd) < 0) {
+                        /* Valgrind has its own FD and doesn't want to have it closed */
+                        if (errno != EBADF && r == 0)
+                                r = -errno;
+                }
+        }
+
+        return r;
+}
+
+int same_fd(int a, int b) {
+        struct stat sta, stb;
+        pid_t pid;
+        int r, fa, fb;
+
+        assert(a >= 0);
+        assert(b >= 0);
+
+        /* Compares two file descriptors. Note that semantics are
+         * quite different depending on whether we have kcmp() or we
+         * don't. If we have kcmp() this will only return true for
+         * dup()ed file descriptors, but not otherwise. If we don't
+         * have kcmp() this will also return true for two fds of the same
+         * file, created by separate open() calls. Since we use this
+         * call mostly for filtering out duplicates in the fd store
+         * this difference hopefully doesn't matter too much. */
+
+        if (a == b)
+                return true;
+
+        /* Try to use kcmp() if we have it. */
+        pid = getpid();
+        r = kcmp(pid, pid, KCMP_FILE, a, b);
+        if (r == 0)
+                return true;
+        if (r > 0)
+                return false;
+        if (errno != ENOSYS)
+                return -errno;
+
+        /* We don't have kcmp(), use fstat() instead. */
+        if (fstat(a, &sta) < 0)
+                return -errno;
+
+        if (fstat(b, &stb) < 0)
+                return -errno;
+
+        if ((sta.st_mode & S_IFMT) != (stb.st_mode & S_IFMT))
+                return false;
+
+        /* We consider all device fds different, since two device fds
+         * might refer to quite different device contexts even though
+         * they share the same inode and backing dev_t. */
+
+        if (S_ISCHR(sta.st_mode) || S_ISBLK(sta.st_mode))
+                return false;
+
+        if (sta.st_dev != stb.st_dev || sta.st_ino != stb.st_ino)
+                return false;
+
+        /* The fds refer to the same inode on disk, let's also check
+         * if they have the same fd flags. This is useful to
+         * distinguish the read and write side of a pipe created with
+         * pipe(). */
+        fa = fcntl(a, F_GETFL);
+        if (fa < 0)
+                return -errno;
+
+        fb = fcntl(b, F_GETFL);
+        if (fb < 0)
+                return -errno;
+
+        return fa == fb;
+}
+
+void cmsg_close_all(struct msghdr *mh) {
+        struct cmsghdr *cmsg;
+
+        assert(mh);
+
+        CMSG_FOREACH(cmsg, mh)
+                if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS)
+                        close_many((int*) CMSG_DATA(cmsg), (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int));
+}
diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
new file mode 100644 (file)
index 0000000..be00d88
--- /dev/null
@@ -0,0 +1,69 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  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 <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdio.h>
+#include <dirent.h>
+#include <stdbool.h>
+#include <sys/socket.h>
+
+#include "macro.h"
+
+int close_nointr(int fd);
+int safe_close(int fd);
+void safe_close_pair(int p[]);
+
+void close_many(const int fds[], unsigned n_fd);
+
+int fclose_nointr(FILE *f);
+FILE* safe_fclose(FILE *f);
+DIR* safe_closedir(DIR *f);
+
+static inline void closep(int *fd) {
+        safe_close(*fd);
+}
+
+static inline void close_pairp(int (*p)[2]) {
+        safe_close_pair(*p);
+}
+
+static inline void fclosep(FILE **f) {
+        safe_fclose(*f);
+}
+
+DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, pclose);
+DEFINE_TRIVIAL_CLEANUP_FUNC(DIR*, closedir);
+
+#define _cleanup_close_ _cleanup_(closep)
+#define _cleanup_fclose_ _cleanup_(fclosep)
+#define _cleanup_pclose_ _cleanup_(pclosep)
+#define _cleanup_closedir_ _cleanup_(closedirp)
+#define _cleanup_close_pair_ _cleanup_(close_pairp)
+
+int fd_nonblock(int fd, bool nonblock);
+int fd_cloexec(int fd, bool cloexec);
+
+int close_all_fds(const int except[], unsigned n_except);
+
+int same_fd(int a, int b);
+
+void cmsg_close_all(struct msghdr *mh);
index 2882f515b59886ae4760a299d9f5fcd543f501d7..96691108283d3c9052bdc284f04e731ba2c7db44 100644 (file)
 
 #include "sd-daemon.h"
 
+#include "fd-util.h"
+#include "fdset.h"
+#include "macro.h"
 #include "set.h"
 #include "util.h"
-#include "macro.h"
-#include "fdset.h"
 
 #define MAKE_SET(s) ((Set*) s)
 #define MAKE_FDSET(s) ((FDSet*) s)
index f8ccf792212ba133483430219616fbb30e2ca949..5d33309ab2f80b0893303ab835fcf4bb975ffba3 100644 (file)
 
 #include "ctype.h"
 #include "escape.h"
+#include "fd-util.h"
+#include "fileio.h"
 #include "string-util.h"
 #include "strv.h"
 #include "utf8.h"
 #include "util.h"
-#include "fileio.h"
 
 int write_string_stream(FILE *f, const char *line, bool enforce_newline) {
 
index 8d10615682f29b9241ecc8727d4084032e272759..7d058416e5bc6cda0451b8e7a31faeba2597d174 100644 (file)
 #include <ctype.h>
 #include <sys/utsname.h>
 
+#include "fd-util.h"
+#include "hostname-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "hostname-util.h"
 
 bool hostname_is_set(void) {
         struct utsname u;
index a44daf8f5ee5da192f01fcd476e96e388a4f7225..44e16286646178aebf92217fa4e1266efda2cc10 100644 (file)
 
 #include <sys/mman.h>
 
+#include "fd-util.h"
+#include "locale-util.h"
 #include "set.h"
 #include "string-util.h"
 #include "strv.h"
 #include "utf8.h"
 #include "util.h"
-#include "locale-util.h"
 
 static int add_locales_from_archive(Set *locales) {
         /* Stolen from glibc... */
index f3ec6a3e5243431988ee37ac356ba71e1b7ac3d5..e573dcb56f416ad9f4ee349cfdc4e5ec7ba298b0 100644 (file)
 #include <limits.h>
 #include <sys/file.h>
 
-#include "util.h"
-#include "lockfile-util.h"
+#include "fd-util.h"
 #include "fileio.h"
+#include "lockfile-util.h"
+#include "util.h"
 
 int make_lock_file(const char *p, int operation, LockFile *ret) {
         _cleanup_close_ int fd = -1;
index acc390b8d35a17529944a8e8e544ad472f0a3dbe..99dccb1f103cf83c8288611006121068357cd4a8 100644 (file)
@@ -31,7 +31,9 @@
 
 #include "sd-messages.h"
 
+#include "fd-util.h"
 #include "formats-util.h"
+#include "log.h"
 #include "macro.h"
 #include "missing.h"
 #include "process-util.h"
@@ -40,7 +42,6 @@
 #include "string-util.h"
 #include "terminal-util.h"
 #include "util.h"
-#include "log.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 
index 4dafd69daf5a62e3ff531f44d8cdfd74acbdf10c..9d638b27f086df9ac9295458df0d06594bd77ec2 100644 (file)
 #include <sys/mman.h>
 #include <sys/prctl.h>
 
+#include "fd-util.h"
+#include "memfd-util.h"
 #include "missing.h"
 #include "string-util.h"
 #include "utf8.h"
 #include "util.h"
-#include "memfd-util.h"
 
 int memfd_new(const char *name) {
         _cleanup_free_ char *g = NULL;
index 3ed551fb372874971d7815f8505cc23e76877527..2cb404ea811099f1cdc05b5d15be44a8032aecac 100644 (file)
@@ -21,7 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-
+#include <sys/types.h>
+#include <inttypes.h>
 
 int memfd_new(const char *name);
 int memfd_new_and_map(const char *name, size_t sz, void **p);
index 31328807f4fb6a4f07ee4087e9cbf917310b49fb..7b01633f5f19ebad778ebd6147bd05bbde9cb08a 100644 (file)
 #include <sys/statvfs.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
+#include "path-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "path-util.h"
 
 bool path_is_absolute(const char *p) {
         return p[0] == '/';
index bfde17a956bc19728745dfeb7e1dc53f9cfa2ce3..949bd1f64d933afb1342fa932d1289e65cee77d4 100644 (file)
 #include <unistd.h>
 
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
+#include "process-util.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "process-util.h"
 
 int get_process_state(pid_t pid) {
         const char *p;
index b230044f50994a12070c3a842c18563148211438..e183165b9f878fa540d42c326209ac9fa6172fad 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdint.h>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <time.h>
+#include <linux/random.h>
+#include <stdint.h>
 #ifdef HAVE_SYS_AUXV_H
 #include <sys/auxv.h>
 #endif
-#include <linux/random.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <time.h>
 
+#include "fd-util.h"
+#include "missing.h"
 #include "random-util.h"
 #include "time-util.h"
-#include "missing.h"
 #include "util.h"
 
 int dev_urandom(void *p, size_t n) {
index 5a75090a6d30882c1fc66ada7b23b7c119b63e93..a5daa23f869d4ff35f6407e4adc5a07cfc803dbd 100644 (file)
 ***/
 
 #include "btrfs-util.h"
+#include "fd-util.h"
 #include "path-util.h"
+#include "rm-rf.h"
 #include "string-util.h"
 #include "util.h"
-#include "rm-rf.h"
 
 int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev) {
         _cleanup_closedir_ DIR *d = NULL;
index 937124cc022c8ff41b20da2dad91aa67de510eae..4099ea6f9ff6254f5ea2b6565c0dc7988d822a6f 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
-#include <sys/stat.h>
 #include <stddef.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
+#include "fd-util.h"
 #include "macro.h"
-#include "util.h"
-#include "mkdir.h"
 #include "missing.h"
+#include "mkdir.h"
 #include "selinux-util.h"
 #include "socket-util.h"
+#include "util.h"
 
 int socket_address_listen(
                 const SocketAddress *a,
index 47236535666400c01dda1bc6ee1b33639d3d9346..5949b99c95446008dee32b827faec932ed4a3998 100644 (file)
 #include <time.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "fileio.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "string-util.h"
+#include "terminal-util.h"
 #include "time-util.h"
 #include "util.h"
-#include "terminal-util.h"
 
 static volatile unsigned cached_columns = 0;
 static volatile unsigned cached_lines = 0;
index a516d2807b9333dfc3c3e5c8d8f1b1da4e357e01..d117380d52843a6ba8d557cb1e72372188e74ad3 100644 (file)
 #include <sys/timerfd.h>
 #include <sys/timex.h>
 
+#include "fd-util.h"
 #include "path-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 #include "time-util.h"
+#include "util.h"
 
 usec_t now(clockid_t clock_id) {
         struct timespec ts;
index 233a6c2e351da066a6eb5ba179f6d0a2cbf7cb17..05f34ea52c67c55bde356f24cad111a59cdbeb58 100644 (file)
@@ -79,6 +79,7 @@
 #include "env-util.h"
 #include "escape.h"
 #include "exit-status.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "gunicode.h"
@@ -98,8 +99,8 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "utf8.h"
-#include "virt.h"
 #include "util.h"
+#include "virt.h"
 
 /* Put this test here for a lack of better place */
 assert_cc(EAGAIN == EWOULDBLOCK);
@@ -121,98 +122,6 @@ size_t page_size(void) {
         return pgsz;
 }
 
-int close_nointr(int fd) {
-        assert(fd >= 0);
-
-        if (close(fd) >= 0)
-                return 0;
-
-        /*
-         * Just ignore EINTR; a retry loop is the wrong thing to do on
-         * Linux.
-         *
-         * http://lkml.indiana.edu/hypermail/linux/kernel/0509.1/0877.html
-         * https://bugzilla.gnome.org/show_bug.cgi?id=682819
-         * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR
-         * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain
-         */
-        if (errno == EINTR)
-                return 0;
-
-        return -errno;
-}
-
-int safe_close(int fd) {
-
-        /*
-         * Like close_nointr() but cannot fail. Guarantees errno is
-         * unchanged. Is a NOP with negative fds passed, and returns
-         * -1, so that it can be used in this syntax:
-         *
-         * fd = safe_close(fd);
-         */
-
-        if (fd >= 0) {
-                PROTECT_ERRNO;
-
-                /* The kernel might return pretty much any error code
-                 * via close(), but the fd will be closed anyway. The
-                 * only condition we want to check for here is whether
-                 * the fd was invalid at all... */
-
-                assert_se(close_nointr(fd) != -EBADF);
-        }
-
-        return -1;
-}
-
-void close_many(const int fds[], unsigned n_fd) {
-        unsigned i;
-
-        assert(fds || n_fd <= 0);
-
-        for (i = 0; i < n_fd; i++)
-                safe_close(fds[i]);
-}
-
-int fclose_nointr(FILE *f) {
-        assert(f);
-
-        /* Same as close_nointr(), but for fclose() */
-
-        if (fclose(f) == 0)
-                return 0;
-
-        if (errno == EINTR)
-                return 0;
-
-        return -errno;
-}
-
-FILE* safe_fclose(FILE *f) {
-
-        /* Same as safe_close(), but for fclose() */
-
-        if (f) {
-                PROTECT_ERRNO;
-
-                assert_se(fclose_nointr(f) != EBADF);
-        }
-
-        return NULL;
-}
-
-DIR* safe_closedir(DIR *d) {
-
-        if (d) {
-                PROTECT_ERRNO;
-
-                assert_se(closedir(d) >= 0 || errno != EBADF);
-        }
-
-        return NULL;
-}
-
 int unlink_noerrno(const char *path) {
         PROTECT_ERRNO;
         int r;
@@ -1304,123 +1213,6 @@ bool hidden_file(const char *filename) {
         return hidden_file_allow_backup(filename);
 }
 
-int fd_nonblock(int fd, bool nonblock) {
-        int flags, nflags;
-
-        assert(fd >= 0);
-
-        flags = fcntl(fd, F_GETFL, 0);
-        if (flags < 0)
-                return -errno;
-
-        if (nonblock)
-                nflags = flags | O_NONBLOCK;
-        else
-                nflags = flags & ~O_NONBLOCK;
-
-        if (nflags == flags)
-                return 0;
-
-        if (fcntl(fd, F_SETFL, nflags) < 0)
-                return -errno;
-
-        return 0;
-}
-
-int fd_cloexec(int fd, bool cloexec) {
-        int flags, nflags;
-
-        assert(fd >= 0);
-
-        flags = fcntl(fd, F_GETFD, 0);
-        if (flags < 0)
-                return -errno;
-
-        if (cloexec)
-                nflags = flags | FD_CLOEXEC;
-        else
-                nflags = flags & ~FD_CLOEXEC;
-
-        if (nflags == flags)
-                return 0;
-
-        if (fcntl(fd, F_SETFD, nflags) < 0)
-                return -errno;
-
-        return 0;
-}
-
-_pure_ static bool fd_in_set(int fd, const int fdset[], unsigned n_fdset) {
-        unsigned i;
-
-        assert(n_fdset == 0 || fdset);
-
-        for (i = 0; i < n_fdset; i++)
-                if (fdset[i] == fd)
-                        return true;
-
-        return false;
-}
-
-int close_all_fds(const int except[], unsigned n_except) {
-        _cleanup_closedir_ DIR *d = NULL;
-        struct dirent *de;
-        int r = 0;
-
-        assert(n_except == 0 || except);
-
-        d = opendir("/proc/self/fd");
-        if (!d) {
-                int fd;
-                struct rlimit rl;
-
-                /* When /proc isn't available (for example in chroots)
-                 * the fallback is brute forcing through the fd
-                 * table */
-
-                assert_se(getrlimit(RLIMIT_NOFILE, &rl) >= 0);
-                for (fd = 3; fd < (int) rl.rlim_max; fd ++) {
-
-                        if (fd_in_set(fd, except, n_except))
-                                continue;
-
-                        if (close_nointr(fd) < 0)
-                                if (errno != EBADF && r == 0)
-                                        r = -errno;
-                }
-
-                return r;
-        }
-
-        while ((de = readdir(d))) {
-                int fd = -1;
-
-                if (hidden_file(de->d_name))
-                        continue;
-
-                if (safe_atoi(de->d_name, &fd) < 0)
-                        /* Let's better ignore this, just in case */
-                        continue;
-
-                if (fd < 3)
-                        continue;
-
-                if (fd == dirfd(d))
-                        continue;
-
-                if (fd_in_set(fd, except, n_except))
-                        continue;
-
-                if (close_nointr(fd) < 0) {
-                        /* Valgrind has its own FD and doesn't want to have it closed */
-                        if (errno != EBADF && r == 0)
-                                r = -errno;
-                }
-        }
-
-        return r;
-}
-
 bool fstype_is_network(const char *fstype) {
         static const char table[] =
                 "afs\0"
@@ -1480,20 +1272,6 @@ int flush_fd(int fd) {
         }
 }
 
-void safe_close_pair(int p[]) {
-        assert(p);
-
-        if (p[0] == p[1]) {
-                /* Special case pairs which use the same fd in both
-                 * directions... */
-                p[0] = p[1] = safe_close(p[0]);
-                return;
-        }
-
-        p[0] = safe_close(p[0]);
-        p[1] = safe_close(p[1]);
-}
-
 ssize_t loop_read(int fd, void *buf, size_t nbytes, bool do_poll) {
         uint8_t *p = buf;
         ssize_t n = 0;
@@ -4804,71 +4582,6 @@ int fd_setcrtime(int fd, usec_t usec) {
         return 0;
 }
 
-int same_fd(int a, int b) {
-        struct stat sta, stb;
-        pid_t pid;
-        int r, fa, fb;
-
-        assert(a >= 0);
-        assert(b >= 0);
-
-        /* Compares two file descriptors. Note that semantics are
-         * quite different depending on whether we have kcmp() or we
-         * don't. If we have kcmp() this will only return true for
-         * dup()ed file descriptors, but not otherwise. If we don't
-         * have kcmp() this will also return true for two fds of the same
-         * file, created by separate open() calls. Since we use this
-         * call mostly for filtering out duplicates in the fd store
-         * this difference hopefully doesn't matter too much. */
-
-        if (a == b)
-                return true;
-
-        /* Try to use kcmp() if we have it. */
-        pid = getpid();
-        r = kcmp(pid, pid, KCMP_FILE, a, b);
-        if (r == 0)
-                return true;
-        if (r > 0)
-                return false;
-        if (errno != ENOSYS)
-                return -errno;
-
-        /* We don't have kcmp(), use fstat() instead. */
-        if (fstat(a, &sta) < 0)
-                return -errno;
-
-        if (fstat(b, &stb) < 0)
-                return -errno;
-
-        if ((sta.st_mode & S_IFMT) != (stb.st_mode & S_IFMT))
-                return false;
-
-        /* We consider all device fds different, since two device fds
-         * might refer to quite different device contexts even though
-         * they share the same inode and backing dev_t. */
-
-        if (S_ISCHR(sta.st_mode) || S_ISBLK(sta.st_mode))
-                return false;
-
-        if (sta.st_dev != stb.st_dev || sta.st_ino != stb.st_ino)
-                return false;
-
-        /* The fds refer to the same inode on disk, let's also check
-         * if they have the same fd flags. This is useful to
-         * distinguish the read and write side of a pipe created with
-         * pipe(). */
-        fa = fcntl(a, F_GETFL);
-        if (fa < 0)
-                return -errno;
-
-        fb = fcntl(b, F_GETFL);
-        if (fb < 0)
-                return -errno;
-
-        return fa == fb;
-}
-
 int chattr_fd(int fd, unsigned value, unsigned mask) {
         unsigned old_attr, new_attr;
         struct stat st;
@@ -5075,16 +4788,6 @@ ssize_t string_table_lookup(const char * const *table, size_t len, const char *k
         return -1;
 }
 
-void cmsg_close_all(struct msghdr *mh) {
-        struct cmsghdr *cmsg;
-
-        assert(mh);
-
-        CMSG_FOREACH(cmsg, mh)
-                if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS)
-                        close_many((int*) CMSG_DATA(cmsg), (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int));
-}
-
 int rename_noreplace(int olddirfd, const char *oldpath, int newdirfd, const char *newpath) {
         struct stat buf;
         int ret;
index d1da9ce106e374186e6d9a598104ab3c0e61ff32..e50fd6966437a758ef294efed8bac2dfaecace4e 100644 (file)
@@ -87,16 +87,6 @@ static inline const char* one_zero(bool b) {
         return b ? "1" : "0";
 }
 
-int close_nointr(int fd);
-int safe_close(int fd);
-void safe_close_pair(int p[]);
-
-void close_many(const int fds[], unsigned n_fd);
-
-int fclose_nointr(FILE *f);
-FILE* safe_fclose(FILE *f);
-DIR* safe_closedir(DIR *f);
-
 int parse_size(const char *t, uint64_t base, uint64_t *size);
 
 int parse_boolean(const char *v) _pure_;
@@ -245,11 +235,6 @@ ssize_t string_table_lookup(const char * const *table, size_t len, const char *k
         }                                                               \
         struct __useless_struct_to_allow_trailing_semicolon__
 
-int fd_nonblock(int fd, bool nonblock);
-int fd_cloexec(int fd, bool cloexec);
-
-int close_all_fds(const int except[], unsigned n_except);
-
 bool fstype_is_network(const char *fstype);
 
 int flush_fd(int fd);
@@ -410,35 +395,16 @@ static inline void freep(void *p) {
         free(*(void**) p);
 }
 
-static inline void closep(int *fd) {
-        safe_close(*fd);
-}
-
 static inline void umaskp(mode_t *u) {
         umask(*u);
 }
 
-static inline void close_pairp(int (*p)[2]) {
-        safe_close_pair(*p);
-}
-
-static inline void fclosep(FILE **f) {
-        safe_fclose(*f);
-}
-
-DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, pclose);
-DEFINE_TRIVIAL_CLEANUP_FUNC(DIR*, closedir);
 DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, endmntent);
 
 #define _cleanup_free_ _cleanup_(freep)
-#define _cleanup_close_ _cleanup_(closep)
 #define _cleanup_umask_ _cleanup_(umaskp)
 #define _cleanup_globfree_ _cleanup_(globfree)
-#define _cleanup_fclose_ _cleanup_(fclosep)
-#define _cleanup_pclose_ _cleanup_(pclosep)
-#define _cleanup_closedir_ _cleanup_(closedirp)
 #define _cleanup_endmntent_ _cleanup_(endmntentp)
-#define _cleanup_close_pair_ _cleanup_(close_pairp)
 
 _malloc_  _alloc_(1, 2) static inline void *malloc_multiply(size_t a, size_t b) {
         if (_unlikely_(b != 0 && a > ((size_t) -1) / b))
@@ -747,8 +713,6 @@ int fd_getcrtime(int fd, usec_t *usec);
 int path_getcrtime(const char *p, usec_t *usec);
 int fd_getcrtime_at(int dirfd, const char *name, usec_t *usec, int flags);
 
-int same_fd(int a, int b);
-
 int chattr_fd(int fd, unsigned value, unsigned mask);
 int chattr_path(const char *p, unsigned value, unsigned mask);
 
@@ -764,8 +728,6 @@ void sigkill_wait(pid_t *pid);
 
 int syslog_parse_priority(const char **p, int *priority, bool with_facility);
 
-void cmsg_close_all(struct msghdr *mh);
-
 int rename_noreplace(int olddirfd, const char *oldpath, int newdirfd, const char *newpath);
 
 int parse_mode(const char *s, mode_t *ret);
index ca3f26a66f3beb607dfc50afb854217e83e9bf4a..b96695c353cf354ebde77307b0c8eff798faa8fd 100644 (file)
@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include "conf-files.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
 #include "string-util.h"
index 101689076824707654f762a24fa1232fb4a6ccd0..a167f8086ca4d32b357dc0a08ba3ac84484c6d65 100644 (file)
@@ -39,6 +39,7 @@
 
 #include "blkid-util.h"
 #include "efivars.h"
+#include "fd-util.h"
 #include "rm-rf.h"
 #include "string-util.h"
 #include "util.h"
index 7842e0766db530d071724c95a636e4bad6ea5350..a1699f8736b000dc7d3698ec7250c19dfb8f35df 100644 (file)
@@ -50,6 +50,7 @@
 
 #include "bootchart.h"
 #include "conf-parser.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "list.h"
 #include "macro.h"
index f3f55781ad39d12b651343ad5c3e8ed2259866c9..6066e142886f2ba9121f5b9c2a455b3733769ac9 100644 (file)
 
 #include "bootchart.h"
 #include "cgroup-util.h"
+#include "fd-util.h"
 #include "fileio.h"
+#include "store.h"
 #include "string-util.h"
 #include "strxcpyx.h"
 #include "time-util.h"
 #include "util.h"
-#include "store.h"
 
 /*
  * Alloc a static 4k buffer for stdio - primarily used to increase
index db5fc863b0fee84910f49024bb5875c8544e1acf..43eca906188c30946ddb608c608a46c47eb135bf 100644 (file)
@@ -39,6 +39,7 @@
 #include "bootchart.h"
 #include "list.h"
 #include "utf8.h"
+#include "fd-util.h"
 
 #define time_to_graph(t) ((t) * arg_scale_x)
 #define ps_to_graph(n) ((n) * arg_scale_y)
index e558578bd0f59df0c6f71895bbbb82238c6294e5..1bbf984a2e7c7beec311d893a1c5aa3c129ec240 100644 (file)
@@ -37,6 +37,7 @@
 #include "bus-xml-policy.h"
 #include "capability.h"
 #include "def.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "log.h"
 #include "proxy.h"
index bc8516f5c66338c074f449f9d9809a68d05d3b05..ea2a01fdae33cb121c70da9e314b466eec802da8 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <string.h>
 #include <errno.h>
 #include <poll.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 
-#include "log.h"
-#include "util.h"
-#include "sd-daemon.h"
 #include "sd-bus.h"
+#include "sd-daemon.h"
+
+#include "bus-control.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"
-#include "strv.h"
-#include "bus-control.h"
-#include "set.h"
 #include "bus-xml-policy.h"
 #include "driver.h"
+#include "fd-util.h"
+#include "formats-util.h"
+#include "log.h"
 #include "proxy.h"
+#include "set.h"
+#include "strv.h"
 #include "synthesize.h"
-#include "formats-util.h"
+#include "util.h"
 
 static int proxy_create_destination(Proxy *p, const char *destination, const char *local_sec, bool negotiate_fds) {
         _cleanup_bus_flush_close_unref_ sd_bus *b = NULL;
index ad9cd2532f990767380d4361a5aa6f46ff009c00..3786dae2d982b6dde86f0cdd986fbca6e1afdd4b 100644 (file)
@@ -33,6 +33,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "cgroup-util.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "hashmap.h"
 #include "path-util.h"
index 5a18e263a85e80fde448fe4b6ce34a5d63869a73..3ae46d8cfb8d3cf6bc37f12515a71f109c7f2c4a 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "log.h"
 #include "util.h"
+#include "fd-util.h"
 
 static bool initialized = false;
 static int audit_fd;
index 1995bb8b7dd27cab2839148a627db9a0b25c6bae..c25038ca50b72b553860714a68a72e57c9038e38 100644 (file)
 #include <unistd.h>
 
 #include "async.h"
+#include "automount.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "dbus-automount.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "label.h"
 #include "mkdir.h"
@@ -43,7 +45,6 @@
 #include "string-util.h"
 #include "unit-name.h"
 #include "unit.h"
-#include "automount.h"
 
 static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = {
         [AUTOMOUNT_DEAD] = UNIT_INACTIVE,
index a7cb56dcbf1a08a2ec421e70dc430da80200ee2d..335a1fdc4c9efc96193ba89cf5c8d19dbc6421c2 100644 (file)
 #include "bus-kernel.h"
 #include "bus-policy.h"
 #include "bus-util.h"
+#include "busname.h"
 #include "dbus-busname.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "kdbus.h"
 #include "service.h"
 #include "signal-util.h"
 #include "special.h"
 #include "string-util.h"
-#include "busname.h"
 
 static const UnitActiveState state_translation_table[_BUSNAME_STATE_MAX] = {
         [BUSNAME_DEAD] = UNIT_INACTIVE,
index 73e58f867c9add6252c0cd09800e80ebd30a48fb..2a2cf02774d8be7b446eab86954447b148729ee6 100644 (file)
 #include <fnmatch.h>
 
 #include "cgroup-util.h"
+#include "cgroup.h"
+#include "fd-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "special.h"
 #include "string-util.h"
-#include "cgroup.h"
 
 #define CGROUP_CPU_QUOTA_PERIOD_USEC ((usec_t) 100 * USEC_PER_MSEC)
 
index affb9973041da1badec985353c5a8dfa35036620..6a43be873a8b2a298aa6bcad975d1dc7543f469e 100644 (file)
 ***/
 
 #include "bus-util.h"
-#include "path-util.h"
 #include "cgroup-util.h"
 #include "cgroup.h"
 #include "dbus-cgroup.h"
+#include "fd-util.h"
+#include "path-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy);
 
index b8da66c9858c753a30684f3087b43324faf8d63b..cfd89d0fa865f6fe52178b8d4b494a50f12050b1 100644 (file)
 #include <seccomp.h>
 #endif
 
+#include "af-list.h"
 #include "bus-util.h"
-#include "missing.h"
-#include "ioprio.h"
-#include "strv.h"
-#include "fileio.h"
-#include "execute.h"
 #include "capability.h"
+#include "dbus-execute.h"
 #include "env-util.h"
-#include "af-list.h"
+#include "execute.h"
+#include "fd-util.h"
+#include "fileio.h"
+#include "ioprio.h"
+#include "missing.h"
 #include "namespace.h"
 #include "path-util.h"
+#include "strv.h"
 #include "utf8.h"
-#include "dbus-execute.h"
 
 #ifdef HAVE_SECCOMP
 #include "seccomp-util.h"
index 3cd4467efed7ee41df96a366500f6044cc1f85a2..1ef259ec7aebd02c7c48f2c618b14b6ff3b45754 100644 (file)
 #include "clock-util.h"
 #include "dbus-execute.h"
 #include "dbus-job.h"
+#include "dbus-manager.h"
 #include "dbus-snapshot.h"
 #include "dbus-unit.h"
 #include "dbus.h"
 #include "env-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "install.h"
 #include "log.h"
@@ -42,7 +44,6 @@
 #include "strv.h"
 #include "virt.h"
 #include "watchdog.h"
-#include "dbus-manager.h"
 
 static int property_get_version(
                 sd_bus *bus,
index 0062f1f7f01fc0c230866112a105048183810249..22b8690c540df6c4ca30eb7b724870832781f808 100644 (file)
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-kill.h"
+#include "dbus-service.h"
+#include "fd-util.h"
 #include "path-util.h"
 #include "service.h"
 #include "string-util.h"
 #include "strv.h"
 #include "unit.h"
-#include "dbus-service.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, service_type, ServiceType);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, service_result, ServiceResult);
index 5f27ec4952c31ccf8948fb8f193abf1cefeb89f3..37410a9870de8ba341ae84fab621cec02e3b89ee 100644 (file)
@@ -35,6 +35,8 @@
 #include "dbus-kill.h"
 #include "dbus-manager.h"
 #include "dbus-unit.h"
+#include "dbus.h"
+#include "fd-util.h"
 #include "log.h"
 #include "missing.h"
 #include "mkdir.h"
@@ -43,7 +45,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "strxcpyx.h"
-#include "dbus.h"
 
 #define CONNECTIONS_MAX 4096
 
index a99e636d86bf402a57449c432727e111515112ad..83ae3f6253e969a02b6db0c51e8d5558a3ec6de1 100644 (file)
@@ -53,6 +53,9 @@
 #include "sd-messages.h"
 
 #include "af-list.h"
+#ifdef HAVE_APPARMOR
+#include "apparmor-util.h"
+#endif
 #include "async.h"
 #include "barrier.h"
 #include "bus-endpoint.h"
@@ -61,7 +64,9 @@
 #include "def.h"
 #include "env-util.h"
 #include "errno-list.h"
+#include "execute.h"
 #include "exit-status.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "ioprio.h"
@@ -73,6 +78,9 @@
 #include "path-util.h"
 #include "process-util.h"
 #include "rm-rf.h"
+#ifdef HAVE_SECCOMP
+#include "seccomp-util.h"
+#endif
 #include "securebits.h"
 #include "selinux-util.h"
 #include "signal-util.h"
 #include "util.h"
 #include "utmp-wtmp.h"
 
-#ifdef HAVE_APPARMOR
-#include "apparmor-util.h"
-#endif
-
-#ifdef HAVE_SECCOMP
-#include "seccomp-util.h"
-#endif
-
-#include "execute.h"
-
 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
 
index 42a3e9745920f30dda38475581039ea320bc7e0c..0c0982b0b4cbc1c71627856bc4b988b6a36acba9 100644 (file)
 #include <unistd.h>
 #include <errno.h>
 
+#include "fd-util.h"
 #include "ima-setup.h"
-#include "util.h"
 #include "log.h"
+#include "util.h"
 
 #define IMA_SECFS_DIR "/sys/kernel/security/ima"
 #define IMA_SECFS_POLICY IMA_SECFS_DIR "/policy"
index 6857b0bbf9ce833a9afbb0cb16dd0769a8fa9951..cb11987166626f5e0b497869c1b0e4f0aa98fca8 100644 (file)
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "formats-util.h"
+#include "killall.h"
 #include "process-util.h"
 #include "set.h"
 #include "string-util.h"
 #include "terminal-util.h"
 #include "util.h"
-#include "killall.h"
 
 #define TIMEOUT_USEC (10 * USEC_PER_SEC)
 
index 3212ed24d28efeaa46abbf0f17cd43cde480a8c2..31fdc48823e084eff9703c80efb783e27763eac8 100644 (file)
@@ -43,7 +43,9 @@
 #include "env-util.h"
 #include "errno-list.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "ioprio.h"
+#include "load-fragment.h"
 #include "log.h"
 #include "missing.h"
 #include "path-util.h"
@@ -58,7 +60,6 @@
 #include "unit-printf.h"
 #include "unit.h"
 #include "utf8.h"
-#include "load-fragment.h"
 
 int config_parse_warn_compat(
                 const char *unit,
index caa5f3717aa841cfe408b0f15c404c6bdeede141..f59bf56c73cceda8a61d0cc7057f0f408593c5fb 100644 (file)
 
 #include "sd-id128.h"
 
+#include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
+#include "machine-id-setup.h"
 #include "macro.h"
 #include "mkdir.h"
 #include "path-util.h"
@@ -38,7 +40,6 @@
 #include "string-util.h"
 #include "util.h"
 #include "virt.h"
-#include "machine-id-setup.h"
 
 static int shorten_uuid(char destination[34], const char source[36]) {
         unsigned i, j;
index 87b3af92bcd4704dc6239d8b2e9c51cba5c12dc4..68ec730406f5a7ce94ee5788a340974faf1e0387 100644 (file)
@@ -51,6 +51,7 @@
 #include "dbus-manager.h"
 #include "def.h"
 #include "env-util.h"
+#include "fd-util.h"
 #include "fdset.h"
 #include "fileio.h"
 #include "formats-util.h"
index 2d30340828c7a29fb22afe753a14f5694c71f475..400c66977b4c400f74bceb248d6fd1156c265d1e 100644 (file)
 #include "env-util.h"
 #include "escape.h"
 #include "exit-status.h"
+#include "fd-util.h"
 #include "hashmap.h"
 #include "locale-setup.h"
 #include "log.h"
 #include "macro.h"
+#include "manager.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "path-lookup.h"
@@ -75,7 +77,6 @@
 #include "util.h"
 #include "virt.h"
 #include "watchdog.h"
-#include "manager.h"
 
 /* Initial delay and the interval for printing status messages about running jobs */
 #define JOBS_IN_PROGRESS_WAIT_USEC (5*USEC_PER_SEC)
index 6806fc27e6c8813921aa282b3e4ee99cada627a0..470f38405672569c623332714902770e7c0e98b6 100644 (file)
 #include <linux/fs.h>
 
 #include "dev-setup.h"
+#include "fd-util.h"
 #include "loopback-setup.h"
 #include "missing.h"
 #include "mkdir.h"
+#include "namespace.h"
 #include "path-util.h"
 #include "selinux-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "namespace.h"
 
 typedef enum MountMode {
         /* This is ordered by priority! */
index 4d276a79db7c729ceb8ac60bb3c672d64e67936c..11054d8c78bc0390512b597e81ae3138eb62a156 100644 (file)
 #include "bus-error.h"
 #include "bus-util.h"
 #include "dbus-path.h"
+#include "fd-util.h"
 #include "macro.h"
 #include "mkdir.h"
+#include "path.h"
 #include "special.h"
 #include "string-util.h"
 #include "unit-name.h"
 #include "unit.h"
-#include "path.h"
 
 static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
         [PATH_DEAD] = UNIT_INACTIVE,
index 042ce5d54dfd98b72fe0fd51035fd1a79730d101..abcbd4954f181de77f3fe42798956ec1df0c5062 100644 (file)
@@ -32,6 +32,7 @@
 #include "env-util.h"
 #include "escape.h"
 #include "exit-status.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "load-dropin.h"
@@ -40,6 +41,7 @@
 #include "manager.h"
 #include "path-util.h"
 #include "process-util.h"
+#include "service.h"
 #include "signal-util.h"
 #include "special.h"
 #include "string-util.h"
@@ -49,7 +51,6 @@
 #include "unit.h"
 #include "utf8.h"
 #include "util.h"
-#include "service.h"
 
 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
         [SERVICE_DEAD] = UNIT_INACTIVE,
index fb04e1135d881e33cfc00d190210f8765418db40..34df3921849d14b563fbc0c22e22aebbc54e4320 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
+#include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
 #include "macro.h"
+#include "smack-setup.h"
 #include "string-util.h"
 #include "util.h"
-#include "smack-setup.h"
 
 #ifdef HAVE_SMACK
 
index cfa17b33257bf1cd8bd0ebfd8bce684939ee37f0..e2085dac1c6c6488a46c4f9cf8fdd2ac4ab2d02f 100644 (file)
@@ -37,6 +37,7 @@
 #include "dbus-socket.h"
 #include "def.h"
 #include "exit-status.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "label.h"
 #include "log.h"
@@ -108,11 +109,9 @@ static void socket_unwatch_control_pid(Socket *s) {
 }
 
 static void socket_cleanup_fd_list(SocketPort *p) {
-        int k = p->n_auxiliary_fds;
-
-        while (k--)
-                safe_close(p->auxiliary_fds[k]);
+        assert(p);
 
+        close_many(p->auxiliary_fds, p->n_auxiliary_fds);
         p->auxiliary_fds = mfree(p->auxiliary_fds);
         p->n_auxiliary_fds = 0;
 }
index eeb53d06322d64a05c80b30faa81983c74f4bf2d..d864c7b3041e0ac61f297175ad582d80633df321 100644 (file)
 #include "dbus-swap.h"
 #include "escape.h"
 #include "exit-status.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "fstab-util.h"
 #include "path-util.h"
 #include "special.h"
 #include "string-util.h"
+#include "swap.h"
 #include "udev-util.h"
 #include "unit-name.h"
 #include "unit.h"
 #include "virt.h"
-#include "swap.h"
 
 static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
         [SWAP_DEAD] = UNIT_INACTIVE,
index ec887760a1fd9bcb0494268dd1c86b7a76ef41c3..0e61bcaebbd91685cf86245dddb15907bdf58043 100644 (file)
 #include "libudev.h"
 
 #include "escape.h"
+#include "fd-util.h"
 #include "list.h"
 #include "mount-setup.h"
 #include "path-util.h"
 #include "string-util.h"
 #include "udev-util.h"
+#include "umount.h"
 #include "util.h"
 #include "virt.h"
-#include "umount.h"
 
 typedef struct MountPoint {
         char *path;
index fde508ac2501cfa8eb5500cb8844b33876c07ddc..78adcf18d6f23b648bb5b595e9348cd196b94b0a 100644 (file)
@@ -22,6 +22,7 @@
 #include <errno.h>
 
 #include "dropin.h"
+#include "fd-util.h"
 #include "fstab-util.h"
 #include "generator.h"
 #include "hashmap.h"
index 7bbec5467ec316dac6bf95d4d972961fe0429cca..8dd75f332409dcc31eb6bd8a4025398195b357f9 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
+#include "bus-internal.h"
+#include "bus-util.h"
+#include "cgroup-util.h"
 #include "conf-parser.h"
-#include "special.h"
+#include "fd-util.h"
 #include "mkdir.h"
-#include "bus-util.h"
-#include "bus-internal.h"
+#include "special.h"
 #include "unit-name.h"
-#include "cgroup-util.h"
+#include "util.h"
 
 static const char *arg_dest_late = "/tmp", *arg_dest = "/tmp";
 
index fbb6ab564b227473ca4db3d74d542c7f4fc8a1de..5dbd526b9b3a3654bed723b5463153e7b5d6d799 100644 (file)
@@ -26,6 +26,7 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "hashmap.h"
 #include "log.h"
 #include "pager.h"
index f6b9c095bf1891877c0c5495e51d0b7cf0aeae06..5aa247b2ae0c80c320fb85c71e2f409905c7b8fe 100644 (file)
@@ -36,6 +36,7 @@
 #include "terminal-util.h"
 #include "time-util.h"
 #include "string-util.h"
+#include "fd-util.h"
 
 static char *arg_root = NULL;
 static char *arg_locale = NULL;  /* $LANG */
index 72a694084957e65221e232499f8697cde296a829..9c49557787d22c8ef2cbfe3c0aabd80e74d604e0 100644 (file)
 #include "sd-bus.h"
 #include "sd-device.h"
 
-#include "util.h"
-#include "process-util.h"
-#include "signal-util.h"
-#include "special.h"
-#include "bus-util.h"
-#include "bus-error.h"
 #include "bus-common-errors.h"
+#include "bus-error.h"
+#include "bus-util.h"
 #include "device-util.h"
+#include "fd-util.h"
 #include "path-util.h"
+#include "process-util.h"
+#include "signal-util.h"
 #include "socket-util.h"
+#include "special.h"
+#include "util.h"
 
 /* exit codes as defined in fsck(8) */
 enum {
index de2962d6008cb5a397d89e25453f11ab2cac0a71..0a3917b7ba3cc26360706c75585c7ff1dc6ac2ae 100644 (file)
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "fstab-util.h"
 #include "generator.h"
 #include "log.h"
index eff9ee236f9324d83468ac27372cfab5dedd0c14..0997cc5faebbbd23ee936b2ceffd9bb24499408c 100644 (file)
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
 #include "mkdir.h"
index 3e8c745238864dd882c5e4b9e9e93b4900394649..ba97c98d6f22939e0d4a1156325e8c6b31dd5450 100644 (file)
@@ -30,6 +30,7 @@
 #include "blkid-util.h"
 #include "btrfs-util.h"
 #include "efivars.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "fstab-util.h"
 #include "generator.h"
index f60ed4b28b9e0c3b2eb2f531880e39a4cac45fb7..3b800e99d37f3a9085cd64a846f47231d1a197c4 100644 (file)
@@ -31,6 +31,7 @@
 #include "strv.h"
 #include "util.h"
 #include "verbs.h"
+#include "fd-util.h"
 
 /*
  * Generic udev properties, key/value database based on modalias strings.
index 422d517529db2d56db830702d0051e0d04967c8b..455fa1e07d6d0ccdd0dff8885f89c5da343a2259 100644 (file)
@@ -19,8 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "string-util.h"
 #include "curl-util.h"
+#include "fd-util.h"
+#include "string-util.h"
 
 static void curl_glue_check_finished(CurlGlue *g) {
         CURLMsg *msg;
index dc4db481cac007a521694ec40d5cdd8feb078548..24c0ec930999b7b161c6ce93fdd077eecc759738 100644 (file)
@@ -28,6 +28,7 @@
 #include "btrfs-util.h"
 #include "copy.h"
 #include "export-raw.h"
+#include "fd-util.h"
 #include "import-common.h"
 #include "ratelimit.h"
 #include "string-util.h"
index 93f2fdbd44bd98f50ed09c97c975eac5c4471d2a..aa9b7f1a91b66302edd8d34c810c0a9c7fa90e3b 100644 (file)
 #include "sd-daemon.h"
 
 #include "btrfs-util.h"
+#include "export-tar.h"
+#include "fd-util.h"
 #include "import-common.h"
 #include "process-util.h"
 #include "ratelimit.h"
 #include "string-util.h"
 #include "util.h"
-#include "export-tar.h"
 
 #define COPY_BUFFER_SIZE (16*1024)
 
index 89e23899b18f03f0288b85b9134dc22ebb875da3..1ecd1e4e1008b401d1d1aae6b05bc48517aaddfc 100644 (file)
@@ -26,6 +26,7 @@
 #include "event-util.h"
 #include "export-raw.h"
 #include "export-tar.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-util.h"
 #include "machine-image.h"
index 9b86dbfa7986da7b9a709d308d14da7afd1ad71f..d96a000f816b0764d879e4a723725f3e65694860 100644 (file)
 
 #include "btrfs-util.h"
 #include "capability.h"
+#include "fd-util.h"
+#include "import-common.h"
 #include "signal-util.h"
 #include "util.h"
-#include "import-common.h"
 
 int import_make_read_only_fd(int fd) {
         int r;
index b13e80584d82d9f9e7f9aa8dafc2da5616247212..f8fc6c108a7b0292f8e21d1c7d9a52375e8b2193 100644 (file)
 
 #include "btrfs-util.h"
 #include "copy.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-compress.h"
+#include "import-raw.h"
 #include "machine-pool.h"
 #include "mkdir.h"
 #include "path-util.h"
@@ -37,7 +39,6 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "util.h"
-#include "import-raw.h"
 
 struct RawImport {
         sd_event *event;
index 0145dcb452287177c1d692442b3908d96e893d8f..bc0cd9f5ba8b19953d16d891a94854d252b4ffe6 100644 (file)
 
 #include "btrfs-util.h"
 #include "copy.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-compress.h"
+#include "import-tar.h"
 #include "machine-pool.h"
 #include "mkdir.h"
 #include "path-util.h"
@@ -38,7 +40,6 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "util.h"
-#include "import-tar.h"
 
 struct TarImport {
         sd_event *event;
index bc0bc78924fac1b1d170ca4bb119281f9d5b7ee2..e50ded92198b481662f691e2837c28b48abea39b 100644 (file)
@@ -24,6 +24,7 @@
 #include "sd-event.h"
 
 #include "event-util.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-raw.h"
 #include "import-tar.h"
index a29e9d4bd5035237e9d1a9c28762e902d4431e90..b712cedcc6b3ce547a356a687b49216351e01caa 100644 (file)
 #include <sys/prctl.h>
 
 #include "sd-bus.h"
-#include "util.h"
-#include "strv.h"
-#include "bus-util.h"
+
 #include "bus-common-errors.h"
-#include "socket-util.h"
-#include "mkdir.h"
+#include "bus-util.h"
 #include "def.h"
-#include "missing.h"
+#include "fd-util.h"
+#include "hostname-util.h"
+#include "import-util.h"
 #include "machine-pool.h"
+#include "missing.h"
+#include "mkdir.h"
 #include "path-util.h"
-#include "import-util.h"
 #include "process-util.h"
 #include "signal-util.h"
-#include "hostname-util.h"
+#include "socket-util.h"
+#include "strv.h"
+#include "util.h"
 
 typedef struct Transfer Transfer;
 typedef struct Manager Manager;
index a79cc5825bad4185f092069069006c2375d06969..e98554b60c1e2e2b4b973b38844896dc55473adc 100644 (file)
@@ -25,7 +25,9 @@
 #include "capability.h"
 #include "copy.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "process-util.h"
+#include "pull-common.h"
 #include "pull-job.h"
 #include "rm-rf.h"
 #include "signal-util.h"
@@ -33,7 +35,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "pull-common.h"
 
 #define FILENAME_ESCAPE "/.#\"\'"
 #define HASH_URL_THRESHOLD_LENGTH (_POSIX_PATH_MAX - 16)
index ea31d116411b4994935bfcd042ef1dba8a68236d..1cd9e7b0bd1cbe7a84fbaa9c89d39adbcc4e76cd 100644 (file)
@@ -27,6 +27,7 @@
 #include "aufs-util.h"
 #include "btrfs-util.h"
 #include "curl-util.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-util.h"
index f8b597c9c38284fcc8a27e3a7a90dd84135e6aac..7a0fb54bbe519bde9bfcdcbc4769c64572c86a5e 100644 (file)
 
 #include <sys/xattr.h>
 
+#include "fd-util.h"
 #include "machine-pool.h"
+#include "pull-job.h"
 #include "string-util.h"
 #include "strv.h"
-#include "pull-job.h"
 
 PullJob* pull_job_unref(PullJob *j) {
         if (!j)
index a8b2c245074fa420821a1086ca61a4dfee9a2e16..848a4fcd4465c94eea56c0320c4050426c240765 100644 (file)
@@ -28,6 +28,7 @@
 #include "btrfs-util.h"
 #include "copy.h"
 #include "curl-util.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-util.h"
 #include "path-util.h"
 #include "pull-common.h"
 #include "pull-job.h"
+#include "pull-raw.h"
 #include "qcow2-util.h"
 #include "rm-rf.h"
 #include "string-util.h"
 #include "strv.h"
 #include "utf8.h"
 #include "util.h"
-#include "pull-raw.h"
 
 typedef enum RawProgress {
         RAW_DOWNLOADING,
index fb4d5bf512e1894b5964b4c290d2359aecb2b07b..3540bbff4162358bc5b481f81bd8522ac97fd9ea 100644 (file)
@@ -27,6 +27,7 @@
 #include "btrfs-util.h"
 #include "copy.h"
 #include "curl-util.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-util.h"
 #include "process-util.h"
 #include "pull-common.h"
 #include "pull-job.h"
+#include "pull-tar.h"
 #include "rm-rf.h"
 #include "string-util.h"
 #include "strv.h"
 #include "utf8.h"
 #include "util.h"
-#include "pull-tar.h"
 
 typedef enum TarProgress {
         TAR_DOWNLOADING,
index 9a6c3e8b35ae96bf81dde0b745c438f95567800a..4b600796194b74dda29032f6725ff196f8f8e3f5 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "fd-util.h"
 #include "log.h"
-#include "util.h"
-
 #include "qcow2-util.h"
+#include "util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_close_ int sfd = -1, dfd = -1;
index 2d5f7501e7b013e7c04fe0c1746674adcf4bb848..2b374c0288759c9ccbbee4393c8547760a9a2e67 100644 (file)
 #include <sys/epoll.h>
 #include <ctype.h>
 
-#include "sd-daemon.h"
 #include "sd-bus.h"
+#include "sd-daemon.h"
 
-#include "util.h"
-#include "log.h"
-#include "list.h"
-#include "initreq.h"
-#include "special.h"
-#include "bus-util.h"
 #include "bus-error.h"
+#include "bus-util.h"
 #include "def.h"
+#include "fd-util.h"
 #include "formats-util.h"
+#include "initreq.h"
+#include "list.h"
+#include "log.h"
+#include "special.h"
+#include "util.h"
 
 #define SERVER_FD_MAX 16
 #define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC))
index b839e5979b1deb9234c30a97d347dc4e6b4847b8..92ef723affff703321ace3b3d7b16f48123b0536 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <microhttpd.h>
 #ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
 #endif
+#include <microhttpd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
-#include "sd-journal.h"
-#include "sd-daemon.h"
 #include "sd-bus.h"
+#include "sd-daemon.h"
+#include "sd-journal.h"
 
 #include "bus-util.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "hostname-util.h"
 #include "log.h"
index e9bca39a20085077537efa8b18c9fe32b1bdbbc4..bb299e378c66dd85f81b0b133fd1b9d7eecb7395 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "fd-util.h"
+#include "journal-remote-parse.h"
 #include "journald-native.h"
 #include "string-util.h"
-#include "journal-remote-parse.h"
 
 #define LINE_CHUNK 8*1024u
 
index 27385d9b9438146bc887d412c29e5c097ef4f33c..de207f8d249e6f9d0dbf78312cd58ab3d5a1e9fe 100644 (file)
 
 #include "conf-parser.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "journal-file.h"
 #include "journal-remote-write.h"
+#include "journal-remote.h"
 #include "journald-native.h"
 #include "macro.h"
 #include "signal-util.h"
 #include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "journal-remote.h"
 
 #define REMOTE_JOURNAL_PATH "/var/log/journal/remote"
 
index 471a8cad49413d62aa0bff7611361e4fca239ab7..a945a9971a637364136bc01df340322a970af9af 100644 (file)
 #include "sd-daemon.h"
 
 #include "conf-parser.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
+#include "journal-upload.h"
 #include "log.h"
 #include "mkdir.h"
 #include "sigbus.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "journal-upload.h"
 
 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem"
 #define CERT_FILE     CERTIFICATE_ROOT "/certs/journal-upload.pem"
index 7074552a15031bba30bae347750a11ace090ccac..ff1887604a59fed529610fdfe893ee62ff4ef6d9 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "sd-journal.h"
 
+#include "fd-util.h"
 #include "string-util.h"
 #include "util.h"
 
index 32b851aea38e8ab6fee136abeabc41de601d43e8..d5bc17b4b61ad4572c7f835e2e2dde79d7ca423f 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "catalog.h"
 #include "conf-files.h"
+#include "fd-util.h"
 #include "hashmap.h"
 #include "log.h"
 #include "mkdir.h"
index 46a54104821eb61f9be7ed1b14faef51e43d09b1..6c5078c110920b1e9b4566c2c9a0d574240a1acf 100644 (file)
 #include <unistd.h>
 
 #ifdef HAVE_XZ
-#  include <lzma.h>
+#include <lzma.h>
 #endif
 
 #ifdef HAVE_LZ4
-#  include <lz4.h>
-#  include <lz4frame.h>
+#include <lz4.h>
+#include <lz4frame.h>
 #endif
 
+#include "compress.h"
+#include "fd-util.h"
 #include "journal-def.h"
 #include "macro.h"
 #include "sparse-endian.h"
 #include "string-util.h"
 #include "util.h"
-#include "compress.h"
 
 #ifdef HAVE_LZ4
 DEFINE_TRIVIAL_CLEANUP_FUNC(LZ4F_compressionContext_t, LZ4F_freeCompressionContext);
index ba9994ac47dd1bf0752392d398d7c4dbf16ed513..92259fd5ef0641c9ca0374a07ae6807e560492c3 100644 (file)
 
 #include <sys/statvfs.h>
 
+#include "coredump-vacuum.h"
+#include "fd-util.h"
 #include "hashmap.h"
 #include "macro.h"
 #include "string-util.h"
 #include "time-util.h"
 #include "util.h"
-#include "coredump-vacuum.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 */
index 5c1badd66da96115a919dc6cc2b408a13cbaca2b..3b87eb53554e791ffea2e802f7d4b3cff70b7f40 100644 (file)
@@ -41,6 +41,7 @@
 #include "copy.h"
 #include "coredump-vacuum.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "journald-native.h"
 #include "log.h"
index 80f692e044dff344cb018af0f3d486f3606a61ae..a497a4781b37c83337eed0f4858f90466443738e 100644 (file)
@@ -29,6 +29,7 @@
 #include "sd-journal.h"
 
 #include "compress.h"
+#include "fd-util.h"
 #include "journal-internal.h"
 #include "log.h"
 #include "macro.h"
index cdc80e2d26fa89a81607e30eabfc2c53eb1d2659..dc51a5ab2f6f0172f4b2aa00324c9e1d9602438a 100644 (file)
 #include <fcntl.h>
 #include <sys/mman.h>
 
+#include "fd-util.h"
+#include "fsprg.h"
+#include "journal-authenticate.h"
 #include "journal-def.h"
 #include "journal-file.h"
-#include "journal-authenticate.h"
-#include "fsprg.h"
 
 static uint64_t journal_file_tag_seqnum(JournalFile *f) {
         uint64_t r;
index 39c9dd0dbfba65c5a29a856c7ffefc922fe97363..c003ac05dd027eeefaa2a1fe1688b31644ef7f2e 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sparse-endian.h"
-
-#include "systemd/sd-id128.h"
+#include "sd-id128.h"
 
 #include "macro.h"
+#include "sparse-endian.h"
 
 /*
  * If you change this file you probably should also change its documentation:
index f0962faeb5150d54dfc7df79a37862e7e6b31d19..6256c8133c690df71d6a794317fb3a179e1cce60 100644 (file)
 
 #include "btrfs-util.h"
 #include "compress.h"
+#include "fd-util.h"
 #include "journal-authenticate.h"
 #include "journal-def.h"
+#include "journal-file.h"
 #include "lookup3.h"
 #include "random-util.h"
 #include "string-util.h"
-#include "journal-file.h"
 
 #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
 #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))
index 3ff6a3ad4aee2291dfb8eba76bbd0d832322995e..7d14e8754b3526a4957aa0c3c48b55e1ffd4387e 100644 (file)
@@ -21,8 +21,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <inttypes.h>
 #include <stdio.h>
 
-#include "systemd/sd-id128.h"
+#include "sd-id128.h"
 
 int print_qr_code(FILE *f, const void *seed, size_t seed_size, uint64_t start, uint64_t interval, const char *hn, sd_id128_t machine);
index 79ef5b13d2db63bfa169251f15654c9003f2747a..d42f8262a57881db04a2f72c7c040949bdd60ebd 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "sd-journal.h"
 
+#include "fd-util.h"
 #include "memfd-util.h"
 #include "socket-util.h"
 #include "string-util.h"
index 692b875fae37299e1acf57a7640ba85d8ec93a76..dca5bf5000d7abbc3dc727b6f373c33ec12dee0f 100644 (file)
 
 #include "sd-id128.h"
 
+#include "fd-util.h"
 #include "journal-def.h"
 #include "journal-file.h"
+#include "journal-vacuum.h"
 #include "string-util.h"
 #include "util.h"
 
-#include "journal-vacuum.h"
-
 struct vacuum_info {
         uint64_t usage;
         char *filename;
index 4f1d125bb93ae1ef50a970c09113f6a880999e08..de4f73a471301469cfac60a911e9175196cf52b5 100644 (file)
 #include <fcntl.h>
 #include <stddef.h>
 
-#include "util.h"
-#include "macro.h"
+#include "compress.h"
+#include "fd-util.h"
+#include "journal-authenticate.h"
 #include "journal-def.h"
 #include "journal-file.h"
-#include "journal-authenticate.h"
 #include "journal-verify.h"
 #include "lookup3.h"
-#include "compress.h"
+#include "macro.h"
 #include "terminal-util.h"
+#include "util.h"
 
 static void draw_progress(uint64_t p, usec_t *last_usec) {
         unsigned n, i, j, k;
index 1307bd563050bdfa02f5964c0c79b91cd7586934..dbb05e0527e3d4113877ef5448fee0f07aae4cc3 100644 (file)
@@ -42,6 +42,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "catalog.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "fsprg.h"
 #include "hostname-util.h"
index 58778a697af6c0263f4dd9baa4d9c9b415dcb2d8..4c102fd5301b8e66d8e86f160d4110af3a919411 100644 (file)
 ***/
 
 #include "audit-type.h"
+#include "fd-util.h"
+#include "journald-audit.h"
 #include "missing.h"
 #include "string-util.h"
-#include "journald-audit.h"
 
 typedef struct MapField {
         const char *audit_field;
index 307bdc3949e8d334b5eec68dc00fd758d0892320..5f3eb052752785afbd26be869711382c8a18dc8d 100644 (file)
@@ -29,6 +29,7 @@
 #include "formats-util.h"
 #include "process-util.h"
 #include "terminal-util.h"
+#include "fd-util.h"
 
 static bool prefix_timestamp(void) {
 
index a8be704716a960725f5d2cb7cc0dfef8a5ef541e..5a05632e56e0b0210ccf217fc4e7ba2a0dc1bea8 100644 (file)
 #include "sd-messages.h"
 
 #include "escape.h"
+#include "fd-util.h"
 #include "formats-util.h"
+#include "journald-kmsg.h"
 #include "journald-server.h"
 #include "journald-syslog.h"
 #include "process-util.h"
 #include "string-util.h"
-#include "journald-kmsg.h"
 
 void server_forward_kmsg(
         Server *s,
index 7a514b2848f0cdb7fef5fbd631ed0116ee42fe67..7d4aac687e42d9763f32b8972420c13e80614039 100644 (file)
 #include <sys/mman.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "journald-console.h"
 #include "journald-kmsg.h"
+#include "journald-native.h"
 #include "journald-server.h"
 #include "journald-syslog.h"
 #include "journald-wall.h"
@@ -34,7 +36,6 @@
 #include "selinux-util.h"
 #include "socket-util.h"
 #include "string-util.h"
-#include "journald-native.h"
 
 bool valid_user_field(const char *p, size_t l, bool allow_protected) {
         const char *a;
index 2dfd3093100f93e65b340f984118d6155490104f..012970bad3ead98cea8195a16f5a1bb25d3705b5 100644 (file)
@@ -36,6 +36,7 @@
 #include "acl-util.h"
 #include "cgroup-util.h"
 #include "conf-parser.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "hashmap.h"
 #include "hostname-util.h"
@@ -47,6 +48,7 @@
 #include "journald-kmsg.h"
 #include "journald-native.h"
 #include "journald-rate-limit.h"
+#include "journald-server.h"
 #include "journald-stream.h"
 #include "journald-syslog.h"
 #include "missing.h"
@@ -57,7 +59,6 @@
 #include "signal-util.h"
 #include "socket-util.h"
 #include "string-util.h"
-#include "journald-server.h"
 
 #define USER_JOURNALS_MAX 1024
 
index e06be6267f77a11d9547edd285b990c7b089009a..0dd511519c5be1be633aed264af35e50f074c592 100644 (file)
 #include "sd-event.h"
 
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "journald-console.h"
 #include "journald-kmsg.h"
 #include "journald-server.h"
+#include "journald-stream.h"
 #include "journald-syslog.h"
 #include "journald-wall.h"
 #include "mkdir.h"
 #include "selinux-util.h"
 #include "socket-util.h"
 #include "string-util.h"
-#include "journald-stream.h"
 
 #define STDOUT_STREAMS_MAX 4096
 
index fc69cd7d9e1301513e06be3c034c4fe81272cce6..7e9ba1256029933ae7c810e2dfd00a3973e291bf 100644 (file)
 
 #include "sd-messages.h"
 
+#include "fd-util.h"
 #include "formats-util.h"
 #include "journald-console.h"
 #include "journald-kmsg.h"
 #include "journald-server.h"
+#include "journald-syslog.h"
 #include "journald-wall.h"
 #include "process-util.h"
 #include "selinux-util.h"
 #include "socket-util.h"
 #include "string-util.h"
-#include "journald-syslog.h"
 
 /* Warn once every 30s if we missed syslog message */
 #define WARN_FORWARD_SYSLOG_MISSED_USEC (30 * USEC_PER_SEC)
index 442e352ae226b90321ff3e5db4a0925e1f8a2320..d39c0a900c8b15cd01b5af84dbae9884c2f7ef08 100644 (file)
@@ -29,9 +29,9 @@
 #include <unistd.h>
 
 #include "sd-journal.h"
-
 #include "catalog.h"
 #include "compress.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "hashmap.h"
index c4ba9e38903a0b29329b3d691c4e17da2717a3f7..e32550d6448539c2351749c798d8ad05d852d8be 100644 (file)
 #include <dwarf.h>
 #include <elfutils/libdwfl.h>
 
+#include "fd-util.h"
 #include "formats-util.h"
 #include "macro.h"
+#include "stacktrace.h"
 #include "string-util.h"
 #include "util.h"
-#include "stacktrace.h"
 
 #define FRAMES_MAX 64
 #define THREADS_MAX 64
index 222d6cc72a65841777137b0d6cb72788f9b1cbb5..72c1f60f023400bd7c5a6e62680ef9d69a67609b 100644 (file)
 
 #include "sd-messages.h"
 
-#include "util.h"
+#include "catalog.h"
+#include "fd-util.h"
 #include "log.h"
 #include "macro.h"
-#include "catalog.h"
 #include "string-util.h"
+#include "util.h"
 
 static const char *catalog_dirs[] = {
         CATALOG_DIR,
index e51b12407f2c9b14f73666180b7dcdb17c5e2fff..e562fa19482510611d4adb87469a28211075fc7c 100644 (file)
 ***/
 
 #include "compress.h"
-#include "util.h"
+#include "fd-util.h"
 #include "macro.h"
 #include "random-util.h"
+#include "util.h"
 
 #ifdef HAVE_XZ
 # define XZ_OK 0
index e6599f366d90be1342313287a8da7b41b88b8d9d..717b703d19108c0f27c139885f606b986b6c757f 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "systemd/sd-journal.h"
+#include "sd-journal.h"
 
 #include "log.h"
-#include "util.h"
 #include "rm-rf.h"
+#include "util.h"
 
 int main(int argc, char *argv[]) {
         sd_journal *j;
index 81ca47ed8deb58927cc29fecc385f150c3c6ac61..694376670d069750a604417141d5dcea5083eb9a 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "systemd/sd-journal.h"
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "sd-journal.h"
+
 #include "log.h"
 
 int main(int argc, char *argv[]) {
index d89123dc6449dc525c3890a55745a10d984c72e9..887a83efe1de9edf73defd9600c90bbc85845fb0 100644 (file)
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "util.h"
-#include "log.h"
-#include "rm-rf.h"
+#include "fd-util.h"
 #include "journal-file.h"
 #include "journal-verify.h"
+#include "log.h"
+#include "rm-rf.h"
 #include "terminal-util.h"
+#include "util.h"
 
 #define N_ENTRIES 6000
 #define RANDOM_RANGE 77
index 3258b227022a719e671f40e366814219726fea9b..ac1239acc400a16f868e415b32a9ab208cc65013 100644 (file)
 #include <unistd.h>
 #include <fcntl.h>
 
+#include "fd-util.h"
 #include "macro.h"
-#include "util.h"
 #include "mmap-cache.h"
+#include "util.h"
 
 int main(int argc, char *argv[]) {
         int x, y, z, r;
index 2f5b9b37318691b4136baa2df4df9228d5e8a907..4660c7ea096eeb47c2c0576e9e762879970e5019 100644 (file)
@@ -21,8 +21,9 @@
 #include <linux/filter.h>
 #include <arpa/inet.h>
 
-#include "util.h"
 #include "arp-util.h"
+#include "fd-util.h"
+#include "util.h"
 
 int arp_network_bind_raw_socket(int ifindex, be32_t address, const struct ether_addr *eth_mac) {
         struct sock_filter filter[] = {
index 7f10838de147aa46b70059828060de95d3486e25..fac25e0fa2e059047cdb54c17ba2a99862ea7d14 100644 (file)
 ***/
 
 #include <errno.h>
-#include <sys/socket.h>
-#include <string.h>
-#include <linux/if_packet.h>
-#include <linux/if_infiniband.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <stdio.h>
+#include <string.h>
+#include <sys/socket.h>
 #include <linux/filter.h>
-
-#include "socket-util.h"
+#include <linux/if_infiniband.h>
+#include <linux/if_packet.h>
 
 #include "dhcp-internal.h"
+#include "fd-util.h"
+#include "socket-util.h"
 
 static int _bind_raw_socket(int ifindex, union sockaddr_union *link,
                             uint32_t xid, const uint8_t *mac_addr,
index ccb8363e77581e83c3fdaaacb2ba39af02dbb239..318ee9c4b40e7eb896c073427913e681ca657052 100644 (file)
 ***/
 
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <string.h>
-#include <linux/if_packet.h>
+#include <netinet/in.h>
+#include <netinet/ip6.h>
 #include <stdio.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <netinet/ip6.h>
-#include <netinet/in.h>
-
-#include "socket-util.h"
+#include <linux/if_packet.h>
 
 #include "dhcp6-internal.h"
 #include "dhcp6-protocol.h"
+#include "fd-util.h"
+#include "socket-util.h"
 
 int dhcp6_network_bind_udp_socket(int index, struct in6_addr *local_address) {
         struct in6_pktinfo pktinfo = {
index 140429b1e9ebd2f0fb265fd7491a3db0527db900..91308bf6c33ccadf0e14e3346cd6a1ce9cef1295 100644 (file)
 ***/
 
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <string.h>
-#include <linux/if_packet.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 #include <netinet/in.h>
+#include <netinet/ip6.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <linux/if_packet.h>
 
-#include "socket-util.h"
-
+#include "fd-util.h"
 #include "icmp6-util.h"
+#include "socket-util.h"
 
 #define IN6ADDR_ALL_ROUTERS_MULTICAST_INIT \
         { { { 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
index 12a6599ff1db8ddbd5793d5707068de4a6963e97..f483cd9c8ec2692263b7fadba07299cfa8559656 100644 (file)
 #include <linux/filter.h>
 #include <linux/if_ether.h>
 
-#include "socket-util.h"
-#include "lldp-tlv.h"
-#include "lldp-network.h"
+#include "fd-util.h"
 #include "lldp-internal.h"
+#include "lldp-network.h"
+#include "lldp-tlv.h"
+#include "socket-util.h"
 
 int lldp_network_bind_raw_socket(int ifindex) {
         typedef struct LLDPFrame {
index bc01b5b53544d1f79b67d9a2a82c12228025e33c..d982936a28f7d7fbabaafc9f9dc385021de53a99 100644 (file)
@@ -29,6 +29,7 @@
 #include "dhcp-lease-internal.h"
 #include "dhcp-protocol.h"
 #include "dns-domain.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "hostname-util.h"
 #include "in-addr-util.h"
index 52f7579c5e7ef942b06afa1b15c0d6eef09f6e1e..a2a8c16fc8a69dcc6e9a1f1e6a38627ab7c4ced3 100644 (file)
@@ -26,6 +26,7 @@
 
 #include "dhcp-internal.h"
 #include "dhcp-server-internal.h"
+#include "fd-util.h"
 #include "in-addr-util.h"
 #include "siphash24.h"
 #include "string-util.h"
index d4d4b771d941c517670c0953263e2623f61e5417..ade1b470d449689507b5911f86e0a37807f19940 100644 (file)
@@ -30,6 +30,7 @@
 #include "dhcp6-internal.h"
 #include "dhcp6-lease-internal.h"
 #include "dhcp6-protocol.h"
+#include "fd-util.h"
 #include "network-internal.h"
 #include "random-util.h"
 #include "util.h"
index d2ad5f75a42aa43247f5c680c3a813fec46499d7..3053724ea2643601f587e4d76450af69a62a3ca0 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "arp-util.h"
 #include "event-util.h"
+#include "fd-util.h"
 #include "in-addr-util.h"
 #include "list.h"
 #include "random-util.h"
index b73673c55cdba5e3e2129fa57bdf4e1cf4c4315d..b2b85e56e817f2133354daf79e24dede82a1ccbe 100644 (file)
@@ -24,6 +24,7 @@
 
 #include "sd-lldp.h"
 
+#include "fd-util.h"
 #include "hashmap.h"
 #include "lldp-internal.h"
 #include "lldp-port.h"
index 7456b3218a6c3fa4b13137e40c5a74fe99abae56..03a88973bf148afb59ebfeecdeed5adca3d11724 100644 (file)
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <linux/if_pppox.h>
-#include <linux/ppp-ioctl.h>
 #include <linux/ppp_defs.h>
+#include <linux/ppp-ioctl.h>
 
 #include "sd-pppoe.h"
 
 #include "async.h"
 #include "event-util.h"
+#include "fd-util.h"
 #include "random-util.h"
 #include "socket-util.h"
 #include "sparse-endian.h"
index 41c817e3d3b551b8e62be7e60f2d35bde547e7d8..40a85eb25ef76314f54d406bc4199a93c4bed2f6 100644 (file)
@@ -32,6 +32,7 @@
 #include "dhcp-protocol.h"
 #include "event-util.h"
 #include "util.h"
+#include "fd-util.h"
 
 static uint8_t mac_addr[] = {'A', 'B', 'C', '1', '2', '3'};
 
index 4872567894ecbe3d19090abe4a4e11e5f042d2c2..17ed6d58f35a5d08379643675ca3141aa66863f2 100644 (file)
@@ -33,6 +33,7 @@
 #include "dhcp6-lease-internal.h"
 #include "dhcp6-protocol.h"
 #include "event-util.h"
+#include "fd-util.h"
 #include "macro.h"
 #include "socket-util.h"
 #include "virt.h"
index 3958a98a368fa999ccde065734f76a8f2a03cd1b..6f416c51e4359d06fa228b8f7f80ca3caecda223 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "arp-util.h"
 #include "event-util.h"
+#include "fd-util.h"
 #include "socket-util.h"
 #include "util.h"
 
index 4e84caa4b074fce2bd61ec16f89c199fb7247e74..109462662fc12b9ac1b118d9a6d85776c0ff24aa 100644 (file)
@@ -29,6 +29,7 @@
 #include "sd-lldp.h"
 
 #include "event-util.h"
+#include "fd-util.h"
 #include "lldp-network.h"
 #include "lldp-tlv.h"
 #include "lldp.h"
index 435ec92d6fab3c7915fbc1eff63501bb5d899d4a..589a90bbfff246bbdf20512944662552dbc8bd72 100644 (file)
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "util.h"
-#include "process-util.h"
+#include "bus-container.h"
 #include "bus-internal.h"
 #include "bus-socket.h"
-#include "bus-container.h"
+#include "fd-util.h"
+#include "process-util.h"
+#include "util.h"
 
 int bus_container_connect_socket(sd_bus *b) {
         _cleanup_close_pair_ int pair[2] = { -1, -1 };
index 92978da09c8b46d84cac5556d22c557f5321b2eb..d7bff784b8d3fb960943c21536d1647ab13b3b94 100644 (file)
@@ -29,6 +29,7 @@
 #include "bus-util.h"
 #include "capability.h"
 #include "cgroup-util.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "process-util.h"
index 7ad5474439dc35316cded2b394ee684a6021ff70..f5a8885332b470d2fba9d00fd0efefe1d05eb0f6 100644 (file)
 ***/
 
 #include "bus-internal.h"
+#include "bus-introspect.h"
 #include "bus-protocol.h"
 #include "bus-signature.h"
+#include "fd-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "bus-introspect.h"
 
 int introspect_begin(struct introspect *i, bool trusted) {
         assert(i);
index 32246cbf59c453bb4beb81e0e4b2c47fa9fc2a74..f311e86d4466e3c282c94826e2a084eeb0ab101f 100644 (file)
 
 #include "bus-bloom.h"
 #include "bus-internal.h"
+#include "bus-kernel.h"
 #include "bus-label.h"
 #include "bus-message.h"
 #include "bus-util.h"
 #include "capability.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "memfd-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "bus-kernel.h"
 
 #define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t))
 
index efab756ef4a79810f482b2a63c8a9dbb8d9a25f4..58b19fbdc777b57fe990957e92dea06b09fab5cd 100644 (file)
 ***/
 
 #include "bus-internal.h"
+#include "bus-match.h"
 #include "bus-message.h"
 #include "bus-util.h"
+#include "fd-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "bus-match.h"
 
 /* Example:
  *
index 0e35b3a358eac86609580be3c57e30ae99d9f971..447e25db8a10cb89ebdb53dbb23e4b0a4df5138d 100644 (file)
 
 #include "bus-gvariant.h"
 #include "bus-internal.h"
+#include "bus-message.h"
 #include "bus-signature.h"
 #include "bus-type.h"
 #include "bus-util.h"
+#include "fd-util.h"
 #include "memfd-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "time-util.h"
 #include "utf8.h"
 #include "util.h"
-#include "bus-message.h"
 
 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
 
index e4994b491f1b0ea4d0c446f2f4c5e82b0e8e6464..3273d9b0c2c9f5c39825bd86964010001a747038 100644 (file)
@@ -29,6 +29,8 @@
 
 #include "bus-internal.h"
 #include "bus-message.h"
+#include "bus-socket.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "macro.h"
 #include "missing.h"
@@ -36,7 +38,6 @@
 #include "string-util.h"
 #include "utf8.h"
 #include "util.h"
-#include "bus-socket.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 
index e43891be258477a686b397855e741d979e2e613e..0911156e195eb2c1cd3f53f5aab1ea21cff87d54 100644 (file)
 ***/
 
 #include "sd-bus.h"
-#include "bus-util.h"
+
 #include "bus-internal.h"
 #include "bus-track.h"
+#include "bus-util.h"
 
 struct sd_bus_track {
         unsigned n_ref;
index 04c6b1e8efb70f5360ef13a17ac7df65e9ccc6b0..b55e81ce973c3ea45f8c6894cd1db18dcecfe752 100644 (file)
@@ -30,6 +30,7 @@
 #include "bus-util.h"
 #include "busctl-introspect.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "log.h"
 #include "pager.h"
 #include "path-util.h"
index 2fb483171e132bc7bc0a0fb2edb7aa8b83eae928..7b91c2583dfb3da917bc55c683341f91705f8d30 100644 (file)
@@ -44,6 +44,7 @@
 #include "bus-util.h"
 #include "cgroup-util.h"
 #include "def.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "macro.h"
 #include "missing.h"
index 4c7c58f57e3efe403c84f0ee447be3b873e0d0a1..549c88cd2d69b4f3d3e92f56d89adad74c6f4a64 100644 (file)
@@ -27,6 +27,7 @@
 #include "bus-kernel.h"
 #include "bus-util.h"
 #include "def.h"
+#include "fd-util.h"
 #include "time-util.h"
 #include "util.h"
 
index c6a81a18941d34c7272385324e259888470b0d1d..e9e5e4a8e354989f0a8b69c730dc4ed083de89e8 100644 (file)
@@ -34,6 +34,7 @@
 #include "log.h"
 #include "macro.h"
 #include "util.h"
+#include "fd-util.h"
 
 static int match_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
         log_info("Match triggered! interface=%s member=%s", strna(sd_bus_message_get_interface(m)), strna(sd_bus_message_get_member(m)));
index 02ccbd7260954de91b10f76495a8dc68636dfab3..ff7f9cdafa1da39e9cd00914d69e9a74688b107b 100644 (file)
@@ -23,6 +23,7 @@
 
 #include "bus-kernel.h"
 #include "bus-util.h"
+#include "fd-util.h"
 #include "log.h"
 #include "util.h"
 
index 436bc017a4f6c5020f295b524b7e2dbba4e9feb0..7d05953cd0d695df68ace4d8f431a8053af3bf45 100644 (file)
@@ -26,6 +26,7 @@
 #include "bus-dump.h"
 #include "bus-kernel.h"
 #include "bus-util.h"
+#include "fd-util.h"
 #include "log.h"
 #include "util.h"
 
index b54d931c1cceb4257c94038239247548b6cd8aaf..c0daa451ec672482a4ba6eb619996de35e2024a8 100644 (file)
@@ -36,6 +36,7 @@
 #include "bus-label.h"
 #include "bus-message.h"
 #include "bus-util.h"
+#include "fd-util.h"
 #include "log.h"
 #include "util.h"
 
index 42c95240d45989bc519e09f9a36b20368770c93d..1be0dbcd82768f6c34e0b7bd148282249e58b4fd 100644 (file)
@@ -30,6 +30,7 @@
 #include "memfd-util.h"
 #include "string-util.h"
 #include "util.h"
+#include "fd-util.h"
 
 #define FIRST_ARRAY 17
 #define SECOND_ARRAY 33
index bae37e803493b7a55718153c59edbd22c6fcb59c..85c73722df466f1fa77af17911458ad7ee75b2c2 100644 (file)
@@ -35,6 +35,7 @@
 
 #include "sd-daemon.h"
 
+#include "fd-util.h"
 #include "path-util.h"
 #include "socket-util.h"
 #include "strv.h"
index 9379209a583abc87d3acefb4ee742cc3842dd264..c98053220c55297a750c0c1a9d5c33b8138d967e 100644 (file)
@@ -22,6 +22,7 @@
 
 #include "device-enumerator-private.h"
 #include "device-util.h"
+#include "fd-util.h"
 #include "prioq.h"
 #include "set.h"
 #include "string-util.h"
index f6263121b64522d5f05df7b54b2be28015ae895e..bcabf9468d4a0132b2891244742f77814ff37274 100644 (file)
@@ -27,6 +27,7 @@
 #include "device-internal.h"
 #include "device-private.h"
 #include "device-util.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "hashmap.h"
 #include "macro.h"
index ca42b4318e214060948c1188b0ea9b71786e5314..593dda52f2ab38c8a7104edec805dd948d1403cb 100644 (file)
@@ -27,6 +27,7 @@
 #include "device-internal.h"
 #include "device-private.h"
 #include "device-util.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "hashmap.h"
 #include "macro.h"
index cab35e185e699c9edb550f336893fbc0d82be0b6..b3f888171493e4f06585f01048561401709d3699 100644 (file)
@@ -27,6 +27,7 @@
 #include "sd-event.h"
 #include "sd-id128.h"
 
+#include "fd-util.h"
 #include "hashmap.h"
 #include "list.h"
 #include "macro.h"
index c092e56b7a7aa54e018e9576bf8deddb5e9b7a3f..c1a3b494836e7dc658a8f96fd35798797b5336b8 100644 (file)
 ***/
 
 #include "sd-event.h"
+
+#include "fd-util.h"
 #include "log.h"
-#include "util.h"
 #include "macro.h"
 #include "signal-util.h"
+#include "util.h"
 
 static int prepare_handler(sd_event_source *s, void *userdata) {
         log_info("preparing %c", PTR_TO_INT(userdata));
index 4932c191993cfedadb2f418987c3f9fb36df8e28..9304fd376ef78dcc4e4f4a2d8492b9f53f480d11 100644 (file)
@@ -29,6 +29,7 @@
 
 #include "sd-hwdb.h"
 
+#include "fd-util.h"
 #include "hashmap.h"
 #include "hwdb-internal.h"
 #include "hwdb-util.h"
index a6dbc413ac7bab9d0e33a9a7cb9ba30eb530309e..ef89fd2572fcdbc3b218d09fdc824b0b9c12cc23 100644 (file)
@@ -28,6 +28,7 @@
 #include "macro.h"
 #include "random-util.h"
 #include "util.h"
+#include "fd-util.h"
 
 _public_ char *sd_id128_to_string(sd_id128_t id, char s[SD_ID128_STRING_MAX]) {
         unsigned n;
index 28f935aa66ad63a0589cb89cfc3e088d23eb0b6c..399918f834149640cf96a523e18055514c298cf2 100644 (file)
@@ -29,6 +29,7 @@
 
 #include "cgroup-util.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "hostname-util.h"
index 014323321e8ab4247b63d2f76efc3dc21aa31523..46aa73b38ab28a3c7624fa1581b4226208bd64c3 100644 (file)
@@ -24,6 +24,7 @@
 
 #include "sd-login.h"
 
+#include "fd-util.h"
 #include "formats-util.h"
 #include "string-util.h"
 #include "strv.h"
index 2adc4499b6376d79ce30b9bf24826356e3b7a1ee..57c5db1231cef090103f5da9e9d6a9cc2ef75186 100644 (file)
@@ -24,6 +24,7 @@
 
 #include "sd-netlink.h"
 
+#include "fd-util.h"
 #include "hashmap.h"
 #include "macro.h"
 #include "missing.h"
index 48958e8a9fccd128121c96583b573457cb023cbc..8070ff07c419012feef8e8ab36d7b190419a2f7f 100644 (file)
@@ -19,8 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "strv.h"
+#include "fd-util.h"
 #include "network-util.h"
+#include "strv.h"
 
 bool network_is_online(void) {
         _cleanup_free_ char *state = NULL;
index d330712aaf10b392c91e0a7e9e3431514bbc8c60..ad1227264c4ec4a1a4bf68ea6ea00a924eaa2c72 100644 (file)
@@ -32,6 +32,7 @@
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
+#include "fd-util.h"
 
 _public_ int sd_network_get_operational_state(char **state) {
         _cleanup_free_ char *s = NULL;
index 927b6f8b2d667fce76e1888739b8ce841a9f540d..2467c126aee5e35bbaa10f10aee9118a9c483b3b 100644 (file)
@@ -20,6 +20,7 @@
 #include "sd-path.h"
 
 #include "architecture.h"
+#include "fd-util.h"
 #include "missing.h"
 #include "path-util.h"
 #include "string-util.h"
index 024ad9ead14675da0764cc149e2fb312ff42c16a..38e2dc0fdd23052b6e9cfb3bad63c3714d76c37b 100644 (file)
@@ -33,6 +33,7 @@
 
 #include "sd-resolve.h"
 
+#include "fd-util.h"
 #include "list.h"
 #include "missing.h"
 #include "resolve-util.h"
index 00472fedc9a499037f794faa04110e8f19f07d53..5590aec2b75e2e2b651a4aff9e5e6f1ed698aefe 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "libudev.h"
 
+#include "fd-util.h"
 #include "formats-util.h"
 #include "libudev-private.h"
 #include "missing.h"
index 11e15d13e62806014c494e97dfb57b5055c3bd3d..4d1a0adbf21a8150fb1ed672dadb08f617c6e55a 100644 (file)
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <sys/inotify.h>
 
+#include "fd-util.h"
 #include "libudev-private.h"
 
 /**
index 00605d01260f2715310cb6b754ef51be5ac9ce94..afadfe6993825b5f035e5c7ce3f983971f667641 100644 (file)
@@ -26,6 +26,7 @@
 
 #include "libudev.h"
 
+#include "fd-util.h"
 #include "libudev-private.h"
 #include "missing.h"
 #include "string-util.h"
index 880a1794aa42e5b1d05a7a908174845d758abcfb..4a339dcfd44bd95088f714fef8f4452a54431421 100644 (file)
@@ -32,6 +32,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "def.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "locale-util.h"
 #include "pager.h"
index e3eef4a610492b4bf8104ff8fd92ae27f0892fa2..73e25f06428ecef0c95046b7ea653b300b8295dd 100644 (file)
 #include <string.h>
 #include <unistd.h>
 
+#ifdef HAVE_XKBCOMMON
+#include <xkbcommon/xkbcommon.h>
+#endif
+
 #include "sd-bus.h"
 
 #include "util.h"
 #include "event-util.h"
 #include "locale-util.h"
 #include "selinux-util.h"
-
-#ifdef HAVE_XKBCOMMON
-#include <xkbcommon/xkbcommon.h>
-#endif
+#include "fd-util.h"
 
 enum {
         /* We don't list LC_ALL here on purpose. People should be
index e671341b42055622603674da7bdb8c2163e6ed13..5ff0957aed4b01979ceed4ff0bb9ad52ef807b4f 100644 (file)
@@ -29,6 +29,7 @@
 
 #include "bus-error.h"
 #include "bus-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "process-util.h"
 #include "signal-util.h"
index 1acdc5aa22c43c7cb479e84c6754a2566c4c3661..4d7bda3ee015407dde1241699c9ae780aeb6db5b 100644 (file)
 
 #include "acl-util.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "formats-util.h"
+#include "logind-acl.h"
 #include "set.h"
 #include "string-util.h"
 #include "udev-util.h"
 #include "util.h"
-#include "logind-acl.h"
 
 static int flush_acl(acl_t acl) {
         acl_entry_t i;
index caa844e6014f4501bdb911d146826c5ea8e855f9..b98035be2116ce79569fc93eb4dff5b35a703941 100644 (file)
 
 #include "sd-messages.h"
 
+#include "fd-util.h"
+#include "logind-button.h"
 #include "string-util.h"
 #include "util.h"
-#include "logind-button.h"
 
 Button* button_new(Manager *m, const char *name) {
         Button *b;
index 6c05c11dbd0fee4dedc48a1d57d276a7dfa6a3e1..3b6e982e9f3e10c1f766a9c363fd55d6282db967 100644 (file)
 #include <pwd.h>
 #include <linux/vt.h>
 
-#include "strv.h"
-#include "cgroup-util.h"
-#include "bus-util.h"
 #include "bus-error.h"
-#include "udev-util.h"
+#include "bus-util.h"
+#include "cgroup-util.h"
+#include "fd-util.h"
 #include "logind.h"
+#include "strv.h"
 #include "terminal-util.h"
+#include "udev-util.h"
 
 int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device) {
         Device *d;
index 66807b389494908d23d4cd9cdc67bebc0d060ed5..1677785467291c8bf0c4581a11b0e9e6b70cd9e5 100644 (file)
@@ -32,6 +32,7 @@
 #include "bus-util.h"
 #include "efivars.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio-label.h"
 #include "formats-util.h"
 #include "logind.h"
index 5b247f48d6a456b4f9cddabc940a44beb242a318..ec34535f83e30f5358b6608b2c1901b765d6750d 100644 (file)
 #include <unistd.h>
 
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
+#include "logind-inhibit.h"
 #include "mkdir.h"
 #include "string-util.h"
 #include "util.h"
-#include "logind-inhibit.h"
 
 Inhibitor* inhibitor_new(Manager *m, const char* id) {
         Inhibitor *i;
index 757993a9531509dae7a0e9cb5da88d7167e2eaa7..dad552d5f25e37da15a3e525fc2c800080f1a459 100644 (file)
 
 #include "sd-messages.h"
 
+#include "fd-util.h"
 #include "formats-util.h"
 #include "logind-acl.h"
+#include "logind-seat.h"
 #include "mkdir.h"
 #include "string-util.h"
 #include "terminal-util.h"
 #include "util.h"
-#include "logind-seat.h"
 
 Seat *seat_new(Manager *m, const char *id) {
         Seat *s;
index e6b4ccd7c6e46150a3fe0e2a432d748c25292822..fe398a5eb68194d3b7402a5bd621e80014ebf381 100644 (file)
 #include <errno.h>
 #include <string.h>
 
-#include "util.h"
-#include "strv.h"
-#include "bus-util.h"
 #include "bus-common-errors.h"
 #include "bus-label.h"
-
-#include "logind.h"
-#include "logind-session.h"
+#include "bus-util.h"
+#include "fd-util.h"
 #include "logind-session-device.h"
+#include "logind-session.h"
+#include "logind.h"
+#include "strv.h"
+#include "util.h"
 
 static int property_get_user(
                 sd_bus *bus,
index d4d9052d10c874358da9e7dd692692eaed696043..3a0bb720f909e8ba0f9c8ae27706714f4f692474 100644 (file)
 
 #include "libudev.h"
 
-#include "util.h"
-#include "missing.h"
 #include "bus-util.h"
+#include "fd-util.h"
 #include "logind-session-device.h"
+#include "missing.h"
+#include "util.h"
 
 enum SessionDeviceNotifications {
         SESSION_DEVICE_RESUME,
index e35b5e71a1e008b29491ddb5283779623305c172..ead79ad327d929b698eb35b0f50a621615f94aad 100644 (file)
 #include "bus-error.h"
 #include "bus-util.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
+#include "logind-session.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "terminal-util.h"
 #include "util.h"
-#include "logind-session.h"
 
 #define RELEASE_USEC (20*USEC_PER_SEC)
 
index ecfbf2c5cc9950b5dcc22efe9f46031217bbc646..80328068cdd9e9b55be660762d77491fe49f0e74 100644 (file)
 #include "clean-ipc.h"
 #include "conf-parser.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "hashmap.h"
 #include "label.h"
+#include "logind-user.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "rm-rf.h"
@@ -40,7 +42,6 @@
 #include "special.h"
 #include "unit-name.h"
 #include "util.h"
-#include "logind-user.h"
 
 User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) {
         User *u;
index 6ce7e1fd78f5d0d3fd55261961affd5c7730260d..02c87ca58ed5fc50d9769b1b68c47119fba11be0 100644 (file)
 #include "bus-error.h"
 #include "bus-util.h"
 #include "conf-parser.h"
+#include "fd-util.h"
 #include "formats-util.h"
+#include "logind.h"
 #include "signal-util.h"
 #include "strv.h"
 #include "udev-util.h"
-#include "logind.h"
 
 static void manager_free(Manager *m);
 
index 63c31a6f628a1f63cc1d17718ce16c4b8492755f..dbd055a79a09361b028d15d38ac4ea99be3be53f 100644 (file)
@@ -35,6 +35,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "def.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "hostname-util.h"
index f231e54cde885fca469d94861b8ef3b8d4ca2daf..d0727ff7c7e760b98eb381b947f30989c203f34f 100644 (file)
@@ -24,6 +24,7 @@
 #include "sd-bus.h"
 
 #include "bus-util.h"
+#include "fd-util.h"
 #include "macro.h"
 #include "util.h"
 
index 6e41e929621c74111f369d216e57484c558d1476..c17a98e90fa4182dfdd9a4bc4253c547c5d338f4 100644 (file)
 #include <libgen.h>
 #undef basename
 
-#include "bus-util.h"
-#include "bus-label.h"
-#include "strv.h"
 #include "bus-common-errors.h"
+#include "bus-internal.h"
+#include "bus-label.h"
+#include "bus-util.h"
 #include "copy.h"
+#include "env-util.h"
+#include "fd-util.h"
 #include "fileio.h"
+#include "formats-util.h"
 #include "in-addr-util.h"
 #include "local-addresses.h"
-#include "path-util.h"
-#include "mkdir.h"
-#include "bus-internal.h"
-#include "machine.h"
 #include "machine-dbus.h"
-#include "formats-util.h"
+#include "machine.h"
+#include "mkdir.h"
+#include "path-util.h"
 #include "process-util.h"
-#include "env-util.h"
+#include "strv.h"
 #include "terminal-util.h"
 
 static int property_get_id(
index e27d0af169d4d6a020584c489a9edf585040bf5c..e41f8add9860f9d66b4cae2bacd630d0babdbf64 100644 (file)
 #include "bus-error.h"
 #include "bus-util.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "hashmap.h"
 #include "machine-dbus.h"
+#include "machine.h"
 #include "mkdir.h"
 #include "special.h"
 #include "terminal-util.h"
 #include "unit-name.h"
 #include "util.h"
-#include "machine.h"
 
 Machine* machine_new(Manager *manager, MachineClass class, const char *name) {
         Machine *m;
index f44f4edc0a732fe13a29b53c8c292e88ea883b53..23cc74ab54261fecaa2d68b789f117a5d057c347 100644 (file)
@@ -40,6 +40,7 @@
 #include "copy.h"
 #include "env-util.h"
 #include "event-util.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "import-util.h"
 #include "log.h"
index 6e4c72e8a9d592d66ec35909ed4f316a92b40c95..b5ce6cdca2a8a09e68002ebd4ae610ed16c41cbe 100644 (file)
 #include <unistd.h>
 
 #include "sd-id128.h"
-#include "strv.h"
-#include "path-util.h"
-#include "unit-name.h"
-#include "bus-util.h"
+
+#include "btrfs-util.h"
 #include "bus-common-errors.h"
+#include "bus-util.h"
 #include "cgroup-util.h"
-#include "btrfs-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
-#include "process-util.h"
 #include "hostname-util.h"
+#include "image-dbus.h"
+#include "machine-dbus.h"
 #include "machine-image.h"
 #include "machine-pool.h"
-#include "image-dbus.h"
 #include "machined.h"
-#include "machine-dbus.h"
+#include "path-util.h"
+#include "process-util.h"
+#include "strv.h"
+#include "unit-name.h"
 
 static int property_get_pool_path(
                 sd_bus *bus,
index df3cc9972a04b910ef537300ec2960b51dbdd106..fe229c88a8c8f039a51b53b61628952336c86e0f 100644 (file)
 #include <unistd.h>
 
 #include "sd-daemon.h"
-#include "cgroup-util.h"
-#include "bus-util.h"
+
 #include "bus-error.h"
-#include "label.h"
+#include "bus-util.h"
+#include "cgroup-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
-#include "signal-util.h"
 #include "hostname-util.h"
+#include "label.h"
 #include "machine-image.h"
 #include "machined.h"
+#include "signal-util.h"
 
 Manager *manager_new(void) {
         Manager *m;
index 4a58ce10823c529b80a92cb0787f8a28761baecc..34bd65cb11f56b903b26b1bf2bd050ad4bf60ff1 100644 (file)
@@ -27,6 +27,7 @@
 #include <sys/stat.h>
 
 #include "conf-files.h"
+#include "fd-util.h"
 #include "log.h"
 #include "string-util.h"
 #include "strv.h"
index 09f4bd7029c572cead7e0640125d8bab1a11da5f..1144c82c17915e7ffd38a1b94e6b771770adfe17 100644 (file)
 
 #include "bus-util.h"
 #include "dhcp-lease-internal.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "netlink-util.h"
 #include "network-internal.h"
+#include "networkd-link.h"
+#include "networkd-netdev.h"
 #include "set.h"
 #include "socket-util.h"
 #include "udev-util.h"
 #include "util.h"
 #include "virt.h"
 
-#include "networkd-link.h"
-#include "networkd-netdev.h"
-
 bool link_dhcp6_enabled(Link *link) {
         if (link->flags & IFF_LOOPBACK)
                 return false;
index 23d3aac694114f23b6ee371dd31431441e386a4f..febfe2ff81fdfdc5e2a70ba6f89b52002056f6ed 100644 (file)
@@ -28,6 +28,7 @@
 #include "bus-util.h"
 #include "conf-parser.h"
 #include "def.h"
+#include "fd-util.h"
 #include "libudev-private.h"
 #include "local-addresses.h"
 #include "netlink-util.h"
index 6a808b6205bccc396b46fcfb751a5b25e1748867..3096c4f72a38b606c4c49c3a36937d7c556df1f5 100644 (file)
@@ -24,6 +24,7 @@
 #include <linux/if_tun.h>
 
 #include "networkd-netdev-tuntap.h"
+#include "fd-util.h"
 
 #define TUN_DEV "/dev/net/tun"
 
index d9ccc19d3d0cfcdf178bde996e593affc1aa186e..bd1129a09b9d52cce55e02ee732fdb8e198ff941 100644 (file)
 
 #include "conf-files.h"
 #include "conf-parser.h"
+#include "fd-util.h"
 #include "list.h"
 #include "netlink-util.h"
 #include "network-internal.h"
+#include "networkd-netdev.h"
 #include "networkd.h"
 #include "siphash24.h"
 #include "string-util.h"
-#include "networkd-netdev.h"
 
 const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = {
 
index 9f9a6911e3248e7913278fad43275bb58fa9a0b2..150fd052c25a523e16eb22d0b23d54e36d8368bf 100644 (file)
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "dns-domain.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "network-internal.h"
+#include "networkd-network.h"
 #include "networkd.h"
 #include "string-util.h"
 #include "util.h"
-#include "networkd-network.h"
 
 static int network_load_one(Manager *manager, const char *filename) {
         _cleanup_network_free_ Network *network = NULL;
index 9e1f58f730fbfd9c9bb5311f52b22435c5f9d962..4e86ed13cba1979435f3019105c00c1aee563d35 100644 (file)
 #include <sys/mount.h>
 
 #include "cgroup-util.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "mkdir.h"
+#include "nspawn-cgroup.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "nspawn-cgroup.h"
 
 int chown_cgroup(pid_t pid, uid_t uid_shift) {
         _cleanup_free_ char *path = NULL, *fs = NULL;
index 1081a38c580a776cb4406b441f471a13a1634ce8..df9fbe185bb6651ce7b2575b0697b0dfafc0d938 100644 (file)
 
 #include "sd-netlink.h"
 
+#include "fd-util.h"
 #include "firewall-util.h"
 #include "in-addr-util.h"
 #include "local-addresses.h"
 #include "netlink-util.h"
+#include "nspawn-expose-ports.h"
 #include "string-util.h"
 #include "util.h"
-#include "nspawn-expose-ports.h"
 
 int expose_port_parse(ExposePort **l, const char *s) {
 
index b6d18574e868d38d443563c3ff51fcdb551e5376..2a1dfd83a9bd568ea74cdefd631489fa94811e5c 100644 (file)
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "mkdir.h"
+#include "nspawn-setuid.h"
 #include "process-util.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "nspawn-setuid.h"
 
 static int spawn_getent(const char *database, const char *key, pid_t *rpid) {
         int pipe_fds[2];
index 8ef6cfd731d7776891dbbd7416bd0cd47552c7c7..f95842d2522ae2fb592a7d34e26fedcc03c1e838 100644 (file)
@@ -57,6 +57,7 @@
 #include "dev-setup.h"
 #include "env-util.h"
 #include "event-util.h"
+#include "fd-util.h"
 #include "fdset.h"
 #include "fileio.h"
 #include "formats-util.h"
index a21a0fb916ce035e15a25a7a63aa237fefcc6686..42841480c506acc23e45e019fc37bd3338ee5303 100644 (file)
@@ -25,6 +25,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "log.h"
 #include "mkdir.h"
 #include "string-util.h"
index 61deafe7285f1325083b9a5d2592aa1e0c3c341a..166ab470edc51620afdb33e9fee10f17db37040b 100644 (file)
@@ -25,6 +25,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
+#include "fd-util.h"
 #include "log.h"
 #include "macro.h"
 #include "string-util.h"
index 9e6f595a1b720d818305a757ae0948e0cc1ccd46..7c63c63b63c9b8aa17e5ad5d690ce5ca5ccf1d8a 100644 (file)
 
 #include <netinet/tcp.h>
 
-#include "missing.h"
-#include "strv.h"
-#include "socket-util.h"
 #include "af-list.h"
-#include "random-util.h"
-#include "hostname-util.h"
 #include "dns-domain.h"
-#include "resolved-llmnr.h"
+#include "fd-util.h"
+#include "hostname-util.h"
+#include "missing.h"
+#include "random-util.h"
 #include "resolved-dns-scope.h"
+#include "resolved-llmnr.h"
+#include "socket-util.h"
+#include "strv.h"
 
 #define MULTICAST_RATELIMIT_INTERVAL_USEC (1*USEC_PER_SEC)
 #define MULTICAST_RATELIMIT_BURST 1000
index 7f47e7223a8a79379005605f775d5e218861cebe..b2eebe09a2aa41dfe592675382521a2a8100d9fe 100644 (file)
@@ -21,6 +21,7 @@
 
 #include <netinet/tcp.h>
 
+#include "fd-util.h"
 #include "missing.h"
 #include "resolved-dns-stream.h"
 
index b30473dd7e9686978b2a4987843601eed23d706c..84472ca1bc9edb306c2c4652373ad102e134e8eb 100644 (file)
 
 #include "af-list.h"
 
-#include "resolved-llmnr.h"
-#include "resolved-dns-transaction.h"
-#include "random-util.h"
 #include "dns-domain.h"
+#include "fd-util.h"
+#include "random-util.h"
+#include "resolved-dns-transaction.h"
+#include "resolved-llmnr.h"
 
 DnsTransaction* dns_transaction_free(DnsTransaction *t) {
         DnsQuery *q;
index 8afaf8db6e6dfe4854705c71eb38a990358047c7..5c3a4a00c30a446a7365863a5cda9fafb7487694 100644 (file)
@@ -22,8 +22,9 @@
 #include <resolv.h>
 #include <netinet/in.h>
 
-#include "resolved-manager.h"
+#include "fd-util.h"
 #include "resolved-llmnr.h"
+#include "resolved-manager.h"
 
 void manager_llmnr_stop(Manager *m) {
         assert(m);
index b410e40308010caca87ecf9930c54dfbe865769f..65476fa38bfd8a9346fd38aa5f1bf200c184f546 100644 (file)
@@ -26,6 +26,7 @@
 
 #include "af-list.h"
 #include "dns-domain.h"
+#include "fd-util.h"
 #include "fileio-label.h"
 #include "hostname-util.h"
 #include "netlink-util.h"
index ece778b8efc2593c5eb1a4a9942807a6f1b5dde5..df8fc0690d8ec17e44d258e7101eb96003537f25 100644 (file)
@@ -26,6 +26,7 @@
 #include "sd-daemon.h"
 
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "mkdir.h"
 #include "string-util.h"
index 25ef04a7d2947acbb62e0fd5670d0cd7fa4f4a3e..6d3e739882dbd277574bcbe00104288ecfb8787e 100644 (file)
@@ -30,6 +30,7 @@
 #include "calendarspec.h"
 #include "env-util.h"
 #include "event-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "path-util.h"
 #include "ptyfwd.h"
index 64e50401b9d0a586a390cbdba8e11fa9af9d3044..b3d2f96885540d7a15aad571333c04c4364b26d9 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdio.h>
+#include <fcntl.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <fcntl.h>
 
-#include <util.h>
-#include <fileio.h>
-#include <time-util.h>
-#include <acpi-fpdt.h>
+#include "acpi-fpdt.h"
+#include "fd-util.h"
+#include "fileio.h"
+#include "time-util.h"
+#include "util.h"
 
 struct acpi_table_header {
         char signature[4];
index 4bf87576f2230e3b140f4e50f6bda7993d0e4ff5..baa6f159f834f50602a91fc45fb41f9d1a37de53 100644 (file)
@@ -32,6 +32,8 @@
 #include <termios.h>
 #include <unistd.h>
 
+#include "ask-password-api.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "missing.h"
 #include "mkdir.h"
@@ -42,7 +44,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "util.h"
-#include "ask-password-api.h"
 
 #define KEYRING_TIMEOUT_USEC ((5 * USEC_PER_MINUTE) / 2)
 
index f2796c6d64d890086eabc3689b1a684470ee9424..751dfdec45f3123013b8452b2499e07957d33f11 100644 (file)
@@ -29,6 +29,7 @@
 #include "string-util.h"
 #include "util.h"
 #include "base-filesystem.h"
+#include "fd-util.h"
 
 typedef struct BaseFilesystem {
         const char *dir;
index bc7788475180bed9776380900e4c8f9dcdd70d1c..e0a8ecc7fd9f597261104b29cb0458885e81fa82 100644 (file)
 #include "bus-internal.h"
 #include "bus-label.h"
 #include "bus-message.h"
+#include "bus-util.h"
 #include "cgroup-util.h"
 #include "def.h"
 #include "env-util.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "macro.h"
 #include "missing.h"
 #include "path-util.h"
@@ -43,7 +45,6 @@
 #include "unit-name.h"
 #include "utf8.h"
 #include "util.h"
-#include "bus-util.h"
 
 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
         sd_event *e = userdata;
index 57b7aeb228216b990ef1c32284f680402059c8fe..395e41930c8cc980ec6590d62637d28a64ea075c 100644 (file)
@@ -24,7 +24,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "cgroup-show.h"
 #include "cgroup-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "macro.h"
 #include "path-util.h"
@@ -32,7 +34,6 @@
 #include "string-util.h"
 #include "terminal-util.h"
 #include "util.h"
-#include "cgroup-show.h"
 
 static int compare(const void *a, const void *b) {
         const pid_t *p = a, *q = b;
index baf4bc0b871a2c46657d5c49e410b3ed92bebbb8..fe3187384fde841ad8eb527c3a057f29683ad5c0 100644 (file)
 #include <sys/shm.h>
 #include <sys/stat.h>
 
+#include "clean-ipc.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "clean-ipc.h"
 
 static int clean_sysvipc_shm(uid_t delete_uid) {
         _cleanup_fclose_ FILE *f = NULL;
index 255643654233b590adc9e868b977dbaea6fca016..b8915dab8a59d25435fcd109e41afc3dae0ccaeb 100644 (file)
@@ -31,7 +31,9 @@
 #include "architecture.h"
 #include "audit.h"
 #include "cap-list.h"
+#include "condition.h"
 #include "extract-word.h"
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "ima-util.h"
 #include "path-util.h"
@@ -40,7 +42,6 @@
 #include "string-util.h"
 #include "util.h"
 #include "virt.h"
-#include "condition.h"
 
 Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
         Condition *c;
index 3f2e34c2e31aa5a1bdeb41b28942ba8e6765d1ea..1b47c0ab527af0cfd2c1cc6bd7c83f0882d00750 100644 (file)
@@ -36,6 +36,7 @@
 #include "utf8.h"
 #include "util.h"
 #include "conf-parser.h"
+#include "fd-util.h"
 
 int config_item_table_lookup(
                 const void *table,
index 52ea8086fee6dd9da95ad954d734f73d8ea4cb18..1836e91acdae70ed526bc8eed5e794d20090c64b 100644 (file)
 ***/
 
 #include "conf-files.h"
+#include "dropin.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio-label.h"
 #include "mkdir.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "dropin.h"
 
 int drop_in_file(const char *dir, const char *unit, unsigned level,
                  const char *name, char **_p, char **_q) {
index f087c2a5663974bbd2cc61f56a7d361428f269aa..b482603bce987b987651a99f758e7e1be934c392 100644 (file)
 #include <string.h>
 #include <fcntl.h>
 
-#include "util.h"
+#include "efivars.h"
+#include "fd-util.h"
 #include "utf8.h"
+#include "util.h"
 #include "virt.h"
-#include "efivars.h"
 
 #ifdef ENABLE_EFI
 
index b52b9623fa205406ce39e47068a20f62f09845de..0a8e282949e16d3107c2b6e9e5a93e9453c022de 100644 (file)
 
 #include "dropin.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "fstab-util.h"
+#include "generator.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "special.h"
 #include "string-util.h"
 #include "unit-name.h"
 #include "util.h"
-#include "generator.h"
 
 static int write_fsck_sysroot_service(const char *dir, const char *what) {
         _cleanup_free_ char *device = NULL, *escaped = NULL;
index 5368623b74c5a429fe35a9bdc47ff7d45b038540..9b72f766628ba652ae33df3dcab5f7cf40c70d0d 100644 (file)
@@ -39,6 +39,7 @@
 #include "unit-name.h"
 #include "util.h"
 #include "install.h"
+#include "fd-util.h"
 
 typedef struct {
         OrderedHashmap *will_install;
index cb4a0d2172bf46a6b9d068f45ecef8571a605ac7..6f5b83d08d4e2c2019627fc8caa8c9d30fa99516 100644 (file)
 #include <sys/socket.h>
 #include <time.h>
 
+#include "fd-util.h"
 #include "formats-util.h"
 #include "hashmap.h"
 #include "hostname-util.h"
 #include "journal-internal.h"
 #include "log.h"
+#include "logs-show.h"
 #include "process-util.h"
 #include "string-util.h"
 #include "terminal-util.h"
 #include "utf8.h"
 #include "util.h"
-#include "logs-show.h"
 
 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
 #define PRINT_LINE_THRESHOLD 3
index 8261d8709192fec845fec9bf589914c60c4bb5a1..415d939fc65e7a480c555c6ebe53ef4a93599de7 100644 (file)
 
 #include "btrfs-util.h"
 #include "copy.h"
+#include "fd-util.h"
+#include "machine-image.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "rm-rf.h"
 #include "string-util.h"
 #include "strv.h"
 #include "utf8.h"
-#include "machine-image.h"
 
 static const char image_search_path[] =
         "/var/lib/machines\0"
index 597680ef5f33a020cda1597411c3533ca17febbf..a2cb5fc5a011a127e9694715fb47c17d7766fb87 100644 (file)
 #include <sys/vfs.h>
 
 #include "btrfs-util.h"
+#include "fd-util.h"
 #include "lockfile-util.h"
+#include "machine-pool.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "util.h"
-#include "machine-pool.h"
 
 #define VAR_LIB_MACHINES_SIZE_START (1024UL*1024UL*500UL)
 #define VAR_LIB_MACHINES_FREE_MIN (1024UL*1024UL*750UL)
index b82b5263096a38fd535914a761bec2ca8587e168..7029d6b2e229ad7486769572fd850befb830b4de 100644 (file)
 #include <unistd.h>
 
 #include "copy.h"
+#include "fd-util.h"
 #include "macro.h"
+#include "pager.h"
 #include "process-util.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "terminal-util.h"
 #include "util.h"
-#include "pager.h"
 
 static pid_t pager_pid = 0;
 
index 7749f205408b43691366c534dcc00cb953c36562..e5e0f37adf11dcec7d708fb2ebf41ef5c939b759 100644 (file)
@@ -24,8 +24,9 @@
 #include <limits.h>
 #include <termios.h>
 
-#include "util.h"
+#include "fd-util.h"
 #include "ptyfwd.h"
+#include "util.h"
 
 struct PTYForward {
         sd_event *event;
index e69300b1db88e3a5e27cb77135f2ff431e3c35c9..b5cb9508bf5fb02f705f494039ad9fc38806190c 100644 (file)
 #include <stdio.h>
 
 #include "conf-parser.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
+#include "sleep-config.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
-#include "sleep-config.h"
 
 #define USE(x, y) do{ (x) = (y); (y) = NULL; } while(0)
 
index 4db249e1cac8fd298fe072c15116d2925581f061..472cdecf2054b674204726f6926d862d0cf820b1 100644 (file)
@@ -29,6 +29,7 @@
 #include "util.h"
 #include "process-util.h"
 #include "spawn-polkit-agent.h"
+#include "fd-util.h"
 
 #ifdef ENABLE_POLKIT
 static pid_t agent_pid = 0;
index 205a2e144954f01856d2db6fbec3ad605de5aea3..60d7043fda289b474ab037738c86b57cf84051cb 100644 (file)
 #include <unistd.h>
 
 #include "base-filesystem.h"
+#include "fd-util.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "rm-rf.h"
 #include "string-util.h"
-#include "util.h"
 #include "switch-root.h"
+#include "util.h"
 
 int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,  unsigned long mountflags) {
 
index 235f10d1a6ef436c1ea3e63822950fed88ee0ed7..93e631336058248baff8a89fb8f6cc4011adf04f 100644 (file)
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <utmpx.h>
 
+#include "fd-util.h"
 #include "hostname-util.h"
 #include "macro.h"
 #include "path-util.h"
index 9d39beb3404deee679733c33f1d14ea43da890bc..d58f9873d507f82e1f71f04a84d0084530ae2d6f 100644 (file)
@@ -27,6 +27,7 @@
 
 #include "watchdog.h"
 #include "log.h"
+#include "fd-util.h"
 
 static int watchdog_fd = -1;
 static usec_t watchdog_timeout = USEC_INFINITY;
index b92b77c381996d308a09deed8f1ee215058ad387..95de369817382fbd556b23027dfc0226ad5810fc 100644 (file)
@@ -27,6 +27,7 @@
 #include "sd-messages.h"
 
 #include "def.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
 #include "sleep-config.h"
index 521dbb2840d5da9c4d16dd972538c38702e83265..e82fb064171ab5f667b004cc1e0738ab3f5a7129 100644 (file)
@@ -34,6 +34,7 @@
 #include "sd-event.h"
 #include "sd-resolve.h"
 
+#include "fd-util.h"
 #include "log.h"
 #include "path-util.h"
 #include "set.h"
index e247264a8385a4813210097dc6d4be1bb4c907e4..5e15dfba5318303def9ed944be414173b870d9c5 100644 (file)
@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include "conf-files.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "hashmap.h"
 #include "log.h"
index dbf9f600c0aa640988a9d19585eadff216164712..213c3c30a0870b17324c8939c30cc2a7626ca49a 100644 (file)
@@ -48,6 +48,7 @@
 #include "efivars.h"
 #include "env-util.h"
 #include "exit-status.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "hostname-util.h"
index 4c88f28e289304e2341ee768716dc1935ffdb18b..547bd1b34438396ec169d6bea088a8eb2a55b08f 100644 (file)
@@ -40,6 +40,7 @@
 #include "uid-range.h"
 #include "utf8.h"
 #include "util.h"
+#include "fd-util.h"
 
 typedef enum ItemType {
         ADD_USER = 'u',
index 4d1ecaff40ccf971ff2d768b2b257f7b018d67fe..33744569735e19b860e3b6c75a1cdda0af7b5f5c 100644 (file)
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "hashmap.h"
 #include "install.h"
 #include "log.h"
index b772e319636af924462e1db6dc4f0bebb8b9d81d..afe3ff8fc2c82ba29a684d56d6ea0ff6a35d4900 100644 (file)
 
 #include <fcntl.h>
 
-#include "log.h"
-#include "fileio.h"
-#include "util.h"
 #include "btrfs-util.h"
+#include "fd-util.h"
+#include "fileio.h"
+#include "log.h"
 #include "string-util.h"
+#include "util.h"
 
 int main(int argc, char *argv[]) {
         BtrfsQuotaInfo quota;
index f47452ce72502eb620c719d18b8f1b660c485e66..09d7e61e9206a47cff90e27211e2b8456799812f 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/wait.h>
-#include <sys/capability.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #include <pwd.h>
+#include <sys/capability.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 #include "capability.h"
-#include "util.h"
+#include "fd-util.h"
 #include "macro.h"
+#include "util.h"
 
 static uid_t test_uid = -1;
 static gid_t test_gid = -1;
-// We keep CAP_DAC_OVERRIDE to avoid errors with gcov when doing test coverage
+
+/* We keep CAP_DAC_OVERRIDE to avoid errors with gcov when doing test coverage */
 static uint64_t test_flags = 1ULL << CAP_DAC_OVERRIDE;
 
 static void fork_test(void (*test_func)(void)) {
index 267dda651d8ed9bf520befb9ce842a21faf3766f..7bf59a0aa21e723816e171735e9bf969712e37e8 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
 #include "cgroup-util.h"
-#include "test-helper.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "process-util.h"
 #include "string-util.h"
+#include "test-helper.h"
+#include "util.h"
 
 static void check_p_d_u(const char *path, int code, const char *result) {
         _cleanup_free_ char *unit = NULL;
index 000d407db1c8b39706919d9798004be436d1c3e7..1bd50edca242e2c5fca88d05656a2bcda6f9a775 100644 (file)
@@ -20,6 +20,7 @@
 #include <unistd.h>
 
 #include "copy.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "macro.h"
 #include "mkdir.h"
index 242c5d9dc29aa943aff619f6bef468806c815534..96d5e3817700e0710990ec3205660c3af67099be 100644 (file)
 #include <fcntl.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "fdset.h"
-#include "util.h"
 #include "macro.h"
+#include "util.h"
 
 static void test_fdset_new_fill(void) {
         int fd = -1;
index a72e84bc66799cd8be7a76b290c497b201efd686..a40f013491bdd93624409425e20e38e1eaa0d07b 100644 (file)
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "util.h"
-#include "process-util.h"
-#include "fileio.h"
-#include "strv.h"
-#include "env-util.h"
-#include "def.h"
 #include "ctype.h"
+#include "def.h"
+#include "env-util.h"
+#include "fd-util.h"
+#include "fileio.h"
+#include "process-util.h"
 #include "string-util.h"
+#include "strv.h"
+#include "util.h"
 
 static void test_parse_env_file(void) {
         char    t[] = "/tmp/test-fileio-in-XXXXXX",
index de11443c7a4a74b7451d662e4f1fb0acf93252fe..a060a7ba6f1dbed67f2c940cdbf1308a3855f3f3 100644 (file)
@@ -21,6 +21,7 @@
 
 #include <sys/socket.h>
 
+#include "fd-util.h"
 #include "namespace.h"
 #include "process-util.h"
 #include "string-util.h"
index 2977487c883c7700534d65b3752a8dd9c61d11db..89129c98942b3b1b19b6626c6f162a4021c3a86d 100644 (file)
@@ -23,6 +23,7 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "macro.h"
 #include "path-util.h"
 #include "rm-rf.h"
index 19796bd6cb7534fd9ed5afcc45ce229d9c500398..e9e0bfd41d8b24ca58cc79449712a9c369759b02 100644 (file)
@@ -28,6 +28,7 @@
 #include "strv.h"
 #include "unit.h"
 #include "util.h"
+#include "fd-util.h"
 
 typedef void (*test_function_t)(Manager *m);
 
index f5bae65bef26703f677fd105f98c491ecb8dfd3a..b3ccc7509d55f11482e108e8397ca78ba9be4735 100644 (file)
@@ -21,8 +21,9 @@
 
 #include <sys/mman.h>
 
-#include "util.h"
+#include "fd-util.h"
 #include "sigbus.h"
+#include "util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_close_ int fd = -1;
index ba1c7e6877942dac436181a341972833fb5f0e32..4a2d952c86882cc443064c8b1e8a606bec5fb825 100644 (file)
@@ -18,6 +18,7 @@
 ***/
 
 #include "async.h"
+#include "fd-util.h"
 #include "in-addr-util.h"
 #include "log.h"
 #include "macro.h"
index d81fdb99231fee7d1dd99eeba452ff7b4c2fec6a..a41de59719a28bc0e061467e60aeff8d3f23c7fd 100644 (file)
@@ -25,6 +25,7 @@
 #include "macro.h"
 #include "util.h"
 #include "log.h"
+#include "fd-util.h"
 
 static void test_default_term_for_tty(void) {
         puts(default_term_for_tty("/dev/tty23"));
index ab255c7c8300429ff935fbefdaff9458e3f1b2c5..6aa9cc847386469341e28df385cad19875e87465 100644 (file)
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "formats-util.h"
 #include "string-util.h"
 #include "util.h"
index e4573956a5a2c40b6d226235de2d9177770f6e78..226453d06e5dfc5d02af8d398866b11457046cf2 100644 (file)
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "fileio.h"
 #include "hashmap.h"
 #include "hostname-util.h"
index 49a30601bc5df6e19caaa3d8e8e29ee6bfa0f3bd..ddfcdd857b8b4e1f3039dd7f8e9097fa873665b3 100644 (file)
@@ -44,6 +44,7 @@
 #include "strv.h"
 #include "util.h"
 #include "virt.h"
+#include "fd-util.h"
 
 static void test_streq_ptr(void) {
         assert_se(streq_ptr(NULL, NULL));
index 2964aa7652083e83167eefc68c47fe13ec8a446b..d44cf0a80bfe86b60c381e7aca09cd5c7f7f5f20 100644 (file)
@@ -33,6 +33,7 @@
 
 #include "sd-daemon.h"
 
+#include "fd-util.h"
 #include "list.h"
 #include "log.h"
 #include "missing.h"
@@ -44,8 +45,8 @@
 #include "strv.h"
 #include "time-util.h"
 #include "timesyncd-conf.h"
-#include "util.h"
 #include "timesyncd-manager.h"
+#include "util.h"
 
 #ifndef ADJ_SETOFFSET
 #define ADJ_SETOFFSET                   0x0100  /* add 'time' to current time */
index 722b349b8192f420195c6912f02559a5daf507c5..7755a6d89f39e25d59f9ecd1399d9484bef70880 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-event.h"
 #include "sd-daemon.h"
+#include "sd-event.h"
+
 #include "capability.h"
 #include "clock-util.h"
+#include "fd-util.h"
 #include "network-util.h"
 #include "signal-util.h"
-
-#include "timesyncd-manager.h"
 #include "timesyncd-conf.h"
+#include "timesyncd-manager.h"
 
 static int load_clock_timestamp(uid_t uid, gid_t gid) {
         _cleanup_close_ int fd = -1;
index d81382528f3854cd10477972957473bdcaa120c5..e574e5ac26d013780845a85e6b1a331f8ff4fdbe 100644 (file)
@@ -44,6 +44,7 @@
 #include "conf-files.h"
 #include "copy.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "label.h"
 #include "log.h"
index d9b6cb3524f5e87d2aa6716509b43fe1dc16afcd..30f7f42a099d4c4aec1906e0a3d8ef823fc31ab9 100644 (file)
@@ -35,6 +35,7 @@
 #include "ask-password-api.h"
 #include "conf-parser.h"
 #include "def.h"
+#include "fd-util.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "process-util.h"
index 7acd7b4e928ab76d5cabb4086de3f97465ded854..1e414664ce74bc12551fef57ad4711d789be522a 100644 (file)
@@ -39,6 +39,7 @@
 
 #include "libudev.h"
 
+#include "fd-util.h"
 #include "libudev-private.h"
 #include "log.h"
 #include "udev-util.h"
index c308f898ea26eb8ae61d9d819e95415c581d9626..e9577930e326636e0fc5d01f837144aa56aa2d08 100644 (file)
@@ -27,6 +27,7 @@
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "ethtool-util.h"
+#include "fd-util.h"
 #include "libudev-private.h"
 #include "link-config.h"
 #include "log.h"
index cbf9478e72f043d2840278f1202c313a3480e858..46556916429b6352424b34e7e880332003e0ae56 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "libudev.h"
 
+#include "fd-util.h"
 #include "libudev-private.h"
 #include "scsi_id.h"
 #include "string-util.h"
index 004ddb023f3b337d886453c8cee60cdab340a8e4..0976525eb32673dfed341946386026dd88284b38 100644 (file)
@@ -30,6 +30,7 @@
 #include "sd-id128.h"
 
 #include "efivars.h"
+#include "fd-util.h"
 #include "gpt.h"
 #include "string-util.h"
 #include "udev.h"
index ce1a0c38823a1262a958cf22b04fb38765bd2c04..cfaa4638044cf707248428d327f5b545edc5a067 100644 (file)
@@ -25,6 +25,7 @@
 #include <linux/btrfs.h>
 #endif
 
+#include "fd-util.h"
 #include "missing.h"
 #include "string-util.h"
 #include "udev.h"
index f36f719a947b3a632569fe01b694b38a6dca7fa0..fddafbd4dc1b811a7b8a4e6022e2dea43586a772 100644 (file)
@@ -30,6 +30,7 @@
 #include <linux/limits.h>
 #include <linux/input.h>
 
+#include "fd-util.h"
 #include "string-util.h"
 #include "udev.h"
 #include "util.h"
index ce534ae0f90df3cce86f0931c9879291f4dc3aa6..5e97bdd614aa2a0d14b566fe98e84bb6d4438eab 100644 (file)
@@ -23,6 +23,7 @@
 #include <sys/ioctl.h>
 #include <linux/input.h>
 
+#include "fd-util.h"
 #include "string-util.h"
 #include "udev.h"
 
index bb721d6f0dc08152f5ffea8f7ce4064c28d7aa3a..ef9c398e595390020faf49f300fcef288d85d14d 100644 (file)
@@ -98,6 +98,7 @@
 #include <unistd.h>
 #include <linux/pci_regs.h>
 
+#include "fd-util.h"
 #include "fileio.h"
 #include "string-util.h"
 #include "udev.h"
index c7d47891a72f78ffc628ea0960cb110960212995..cb531bd168513feac4ea12fdb7236d1acbbbf13f 100644 (file)
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "string-util.h"
 #include "udev.h"
 
index 56277f551fef769e363f3f3f0651279f2648823b..937fc4ecd86d8035c31547ce5de00a5f063a013b 100644 (file)
@@ -18,8 +18,9 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "socket-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
+#include "socket-util.h"
 #include "udev.h"
 
 /* wire protocol magic must match */
index 49a45811a6375d09c4fc854a8da8d1bb650223b2..bf122f85c75c3b81ef0f104508b4f317d47ff2b8 100644 (file)
@@ -31,6 +31,7 @@
 #include <unistd.h>
 
 #include "event-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
 #include "netlink-util.h"
 #include "process-util.h"
index c8abac7fefa2aa256c3cf4822217691a367dce44..f99d1a86c9e1dc30b1edf30cdd9269b74822745f 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "conf-files.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "path-util.h"
 #include "strbuf.h"
 #include "string-util.h"
index 911818eb00de48d6d268cf89f1a4ccc1223a255b..7182668f234a18a935853491fcab4bcb03128b4e 100644 (file)
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "string-util.h"
 #include "udev-util.h"
 #include "udev.h"
index 5e93955186f7b474d4fdba730c32d8aa2a07f260..30aa53feb2b08b93100b3a9115e21746109f12c6 100644 (file)
 #include <sys/time.h>
 #include <sys/epoll.h>
 
-#include "udev.h"
-#include "udev-util.h"
+#include "fd-util.h"
 #include "formats-util.h"
+#include "udev-util.h"
+#include "udev.h"
 
 static bool udev_exit;
 
index a3f0298ae7da03de27fb1eab3282d885f24d1c06..a548f9ba4905be80f3ba1fb510a1e48df4653868 100644 (file)
@@ -47,6 +47,7 @@
 #include "cpu-set-util.h"
 #include "dev-setup.h"
 #include "event-util.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "hashmap.h"
index 5c57db44c161be5a0f629be57623c3d57a3074ea..607d78a0191e91f7b3370fa0a07e1f7d4f2acd9c 100644 (file)
@@ -26,6 +26,7 @@
 #include <sys/ioctl.h>
 #include <linux/videodev2.h>
 
+#include "fd-util.h"
 #include "util.h"
 
 int main(int argc, char *argv[]) {
index 01bbde8455495dccd0fdda4736fced23b696a4a2..4f67145b365913ca458f4ce31e2fdcca24981f7d 100644 (file)
@@ -19,8 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
+#include "fd-util.h"
 #include "selinux-util.h"
+#include "util.h"
 
 #define MESSAGE                                                         \
         "This file was created by systemd-update-done. Its only \n"     \
index b0c61cddc50e1a4db1393539ac227b3012345fb5..a06f61dd6fd62a5bbc0040ef0365d9f48f213e88 100644 (file)
@@ -31,6 +31,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
 #include "process-util.h"