diff options
Diffstat (limited to 'src/libcore')
72 files changed, 609 insertions, 605 deletions
diff --git a/src/libcore/Makefile b/src/libcore/Makefile index f40a115042..23032ea6f7 100644 --- a/src/libcore/Makefile +++ b/src/libcore/Makefile @@ -163,8 +163,13 @@ libcore_la_LIBADD = \ $(APPARMOR_LIBS) \ $(MOUNT_LIBS) -$(outdir)/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf - $(AM_V_at)$(MKDIR_P) $(dir $@) +$(outdir)/load-fragment-gperf-nulstr.c: $(outdir)/load-fragment-gperf.gperf $(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ +systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src +systemd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\" +systemd.CPPFLAGS += -DUMOUNT_PATH=\"$(UMOUNT_PATH)\" +systemd.CPPFLAGS += -DSYSTEMD_CGROUP_AGENT_PATH=\"$(libexecdir)/systemd-cgroups-agent\" +systemd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(libexecdir)/systemd\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libcore/audit-fd.c b/src/libcore/audit-fd.c index 76afe3fe15..8ea525eda3 100644 --- a/src/libcore/audit-fd.c +++ b/src/libcore/audit-fd.c @@ -27,9 +27,9 @@ #include <libaudit.h> #include <stdbool.h> -#include "fd-util.h" -#include "log.h" -#include "util.h" +#include "basic/fd-util.h" +#include "basic/log.h" +#include "basic/util.h" static bool initialized = false; static int audit_fd; diff --git a/src/libcore/automount.c b/src/libcore/automount.c index f06d837e30..145ed5ab5d 100644 --- a/src/libcore/automount.c +++ b/src/libcore/automount.c @@ -27,27 +27,27 @@ #include <sys/stat.h> #include <unistd.h> -#include "alloc-util.h" -#include "async.h" +#include "basic/alloc-util.h" +#include "basic/async.h" #include "automount.h" -#include "bus-error.h" -#include "bus-util.h" +#include "sd-bus/bus-error.h" +#include "shared/bus-util.h" #include "dbus-automount.h" -#include "fd-util.h" -#include "formats-util.h" -#include "io-util.h" -#include "label.h" -#include "mkdir.h" -#include "mount-util.h" +#include "basic/fd-util.h" +#include "basic/formats-util.h" +#include "basic/io-util.h" +#include "basic/label.h" +#include "basic/mkdir.h" +#include "basic/mount-util.h" #include "mount.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "special.h" -#include "stdio-util.h" -#include "string-table.h" -#include "string-util.h" -#include "unit-name.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/special.h" +#include "basic/stdio-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/unit-name.h" #include "unit.h" static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = { diff --git a/src/libcore/bus-policy.c b/src/libcore/bus-policy.c index 4907c268e8..cc228bc42f 100644 --- a/src/libcore/bus-policy.c +++ b/src/libcore/bus-policy.c @@ -19,13 +19,13 @@ #include <stdlib.h> -#include "alloc-util.h" -#include "bus-kernel.h" +#include "basic/alloc-util.h" +#include "sd-bus/bus-kernel.h" #include "bus-policy.h" -#include "kdbus.h" -#include "string-table.h" -#include "user-util.h" -#include "util.h" +#include "sd-bus/kdbus.h" +#include "basic/string-table.h" +#include "basic/user-util.h" +#include "basic/util.h" int bus_kernel_translate_access(BusPolicyAccess access) { assert(access >= 0); diff --git a/src/libcore/bus-policy.h b/src/libcore/bus-policy.h index 5b2c4d5953..a6d19c1e9a 100644 --- a/src/libcore/bus-policy.h +++ b/src/libcore/bus-policy.h @@ -19,9 +19,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "kdbus.h" -#include "list.h" -#include "macro.h" +#include "sd-bus/kdbus.h" +#include "basic/list.h" +#include "basic/macro.h" typedef struct BusNamePolicy BusNamePolicy; diff --git a/src/libcore/busname.c b/src/libcore/busname.c index f03a95c24e..765fd7a442 100644 --- a/src/libcore/busname.c +++ b/src/libcore/busname.c @@ -19,23 +19,23 @@ #include <sys/mman.h> -#include "alloc-util.h" -#include "bus-internal.h" -#include "bus-kernel.h" +#include "basic/alloc-util.h" +#include "sd-bus/bus-internal.h" +#include "sd-bus/bus-kernel.h" #include "bus-policy.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "busname.h" #include "dbus-busname.h" -#include "fd-util.h" -#include "formats-util.h" -#include "kdbus.h" -#include "parse-util.h" -#include "process-util.h" +#include "basic/fd-util.h" +#include "basic/formats-util.h" +#include "sd-bus/kdbus.h" +#include "basic/parse-util.h" +#include "basic/process-util.h" #include "service.h" -#include "signal-util.h" -#include "special.h" -#include "string-table.h" -#include "string-util.h" +#include "basic/signal-util.h" +#include "basic/special.h" +#include "basic/string-table.h" +#include "basic/string-util.h" static const UnitActiveState state_translation_table[_BUSNAME_STATE_MAX] = { [BUSNAME_DEAD] = UNIT_INACTIVE, diff --git a/src/libcore/cgroup.c b/src/libcore/cgroup.c index 0fb63b1bd1..43d494cee7 100644 --- a/src/libcore/cgroup.c +++ b/src/libcore/cgroup.c @@ -20,19 +20,19 @@ #include <fcntl.h> #include <fnmatch.h> -#include "alloc-util.h" -#include "cgroup-util.h" +#include "basic/alloc-util.h" +#include "basic/cgroup-util.h" #include "cgroup.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "special.h" -#include "string-table.h" -#include "string-util.h" -#include "stdio-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/fs-util.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/special.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/stdio-util.h" #define CGROUP_CPU_QUOTA_PERIOD_USEC ((usec_t) 100 * USEC_PER_MSEC) diff --git a/src/libcore/cgroup.h b/src/libcore/cgroup.h index 2b1edbafc4..69ff9832bf 100644 --- a/src/libcore/cgroup.h +++ b/src/libcore/cgroup.h @@ -21,9 +21,9 @@ #include <stdbool.h> -#include "list.h" -#include "time-util.h" -#include "cgroup-util.h" +#include "basic/list.h" +#include "basic/time-util.h" +#include "basic/cgroup-util.h" typedef struct CGroupContext CGroupContext; typedef struct CGroupDeviceAllow CGroupDeviceAllow; @@ -115,7 +115,7 @@ struct CGroupContext { bool delegate; }; -#include "cgroup-util.h" +#include "basic/cgroup-util.h" #include "unit.h" void cgroup_context_init(CGroupContext *c); diff --git a/src/libcore/dbus-automount.c b/src/libcore/dbus-automount.c index b2806ad86f..bc44dc1c0a 100644 --- a/src/libcore/dbus-automount.c +++ b/src/libcore/dbus-automount.c @@ -18,9 +18,9 @@ ***/ #include "automount.h" -#include "bus-util.h" +#include "shared/bus-util.h" #include "dbus-automount.h" -#include "string-util.h" +#include "basic/string-util.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, automount_result, AutomountResult); diff --git a/src/libcore/dbus-busname.c b/src/libcore/dbus-busname.c index cf816ba15b..80e7484f46 100644 --- a/src/libcore/dbus-busname.c +++ b/src/libcore/dbus-busname.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "bus-util.h" +#include "shared/bus-util.h" #include "busname.h" #include "dbus-busname.h" -#include "string-util.h" +#include "basic/string-util.h" #include "unit.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, busname_result, BusNameResult); diff --git a/src/libcore/dbus-cgroup.c b/src/libcore/dbus-cgroup.c index eef1c47c14..86f7c626c4 100644 --- a/src/libcore/dbus-cgroup.c +++ b/src/libcore/dbus-cgroup.c @@ -17,14 +17,14 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" -#include "bus-util.h" -#include "cgroup-util.h" +#include "basic/alloc-util.h" +#include "shared/bus-util.h" +#include "basic/cgroup-util.h" #include "cgroup.h" #include "dbus-cgroup.h" -#include "fd-util.h" -#include "fileio.h" -#include "path-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/path-util.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy); diff --git a/src/libcore/dbus-execute.c b/src/libcore/dbus-execute.c index 06943c6365..b5530d945e 100644 --- a/src/libcore/dbus-execute.c +++ b/src/libcore/dbus-execute.c @@ -23,28 +23,28 @@ #include <seccomp.h> #endif -#include "af-list.h" -#include "alloc-util.h" -#include "bus-util.h" -#include "capability-util.h" +#include "basic/af-list.h" +#include "basic/alloc-util.h" +#include "shared/bus-util.h" +#include "basic/capability-util.h" #include "dbus-execute.h" -#include "env-util.h" +#include "basic/env-util.h" #include "execute.h" -#include "fd-util.h" -#include "fileio.h" -#include "ioprio.h" -#include "missing.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/ioprio.h" +#include "basic/missing.h" #include "namespace.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "rlimit-util.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/rlimit-util.h" #ifdef HAVE_SECCOMP -#include "seccomp-util.h" +#include "shared/seccomp-util.h" #endif -#include "strv.h" -#include "syslog-util.h" -#include "utf8.h" +#include "basic/strv.h" +#include "basic/syslog-util.h" +#include "basic/utf8.h" BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); diff --git a/src/libcore/dbus-job.c b/src/libcore/dbus-job.c index 1d739787bb..dde6aa28ef 100644 --- a/src/libcore/dbus-job.c +++ b/src/libcore/dbus-job.c @@ -19,13 +19,13 @@ #include <systemd/sd-bus.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dbus-job.h" #include "dbus.h" #include "job.h" -#include "log.h" +#include "basic/log.h" #include "selinux-access.h" -#include "string-util.h" +#include "basic/string-util.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, job_type, JobType); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_state, job_state, JobState); diff --git a/src/libcore/dbus-kill.c b/src/libcore/dbus-kill.c index 0f54c6b84b..cd76682298 100644 --- a/src/libcore/dbus-kill.c +++ b/src/libcore/dbus-kill.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "bus-util.h" +#include "shared/bus-util.h" #include "dbus-kill.h" #include "kill.h" -#include "signal-util.h" +#include "basic/signal-util.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_kill_mode, kill_mode, KillMode); diff --git a/src/libcore/dbus-manager.c b/src/libcore/dbus-manager.c index 86722e1162..59f8a7908a 100644 --- a/src/libcore/dbus-manager.c +++ b/src/libcore/dbus-manager.c @@ -21,30 +21,30 @@ #include <sys/prctl.h> #include <unistd.h> -#include "alloc-util.h" -#include "architecture.h" -#include "build.h" -#include "bus-common-errors.h" -#include "clock-util.h" +#include "basic/alloc-util.h" +#include "basic/architecture.h" +#include "basic/build.h" +#include "sd-bus/bus-common-errors.h" +#include "basic/clock-util.h" #include "dbus-execute.h" #include "dbus-job.h" #include "dbus-manager.h" #include "dbus-unit.h" #include "dbus.h" -#include "env-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "formats-util.h" -#include "install.h" -#include "log.h" -#include "path-util.h" +#include "basic/env-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/formats-util.h" +#include "shared/install.h" +#include "basic/log.h" +#include "basic/path-util.h" #include "selinux-access.h" -#include "stat-util.h" -#include "string-util.h" -#include "strv.h" -#include "syslog-util.h" -#include "virt.h" -#include "watchdog.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/syslog-util.h" +#include "basic/virt.h" +#include "shared/watchdog.h" static int property_get_version( sd_bus *bus, diff --git a/src/libcore/dbus-mount.c b/src/libcore/dbus-mount.c index 935db7c48b..e6e824b6b9 100644 --- a/src/libcore/dbus-mount.c +++ b/src/libcore/dbus-mount.c @@ -17,13 +17,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "bus-util.h" +#include "shared/bus-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" #include "dbus-kill.h" #include "dbus-mount.h" #include "mount.h" -#include "string-util.h" +#include "basic/string-util.h" #include "unit.h" static int property_get_what( diff --git a/src/libcore/dbus-path.c b/src/libcore/dbus-path.c index 1e153e503f..2f2a65d4c1 100644 --- a/src/libcore/dbus-path.c +++ b/src/libcore/dbus-path.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "bus-util.h" +#include "shared/bus-util.h" #include "dbus-path.h" #include "path.h" -#include "string-util.h" +#include "basic/string-util.h" #include "unit.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, path_result, PathResult); diff --git a/src/libcore/dbus-scope.c b/src/libcore/dbus-scope.c index 34ee9a8fa9..3a9c3b98ec 100644 --- a/src/libcore/dbus-scope.c +++ b/src/libcore/dbus-scope.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" -#include "bus-common-errors.h" -#include "bus-internal.h" -#include "bus-util.h" +#include "basic/alloc-util.h" +#include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-internal.h" +#include "shared/bus-util.h" #include "dbus-cgroup.h" #include "dbus-kill.h" #include "dbus-scope.h" diff --git a/src/libcore/dbus-service.c b/src/libcore/dbus-service.c index 03eecca911..463d9da4e1 100644 --- a/src/libcore/dbus-service.c +++ b/src/libcore/dbus-service.c @@ -17,19 +17,19 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" -#include "async.h" -#include "bus-util.h" +#include "basic/alloc-util.h" +#include "basic/async.h" +#include "shared/bus-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" #include "dbus-kill.h" #include "dbus-service.h" -#include "fd-util.h" -#include "fileio.h" -#include "path-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/path-util.h" #include "service.h" -#include "string-util.h" -#include "strv.h" +#include "basic/string-util.h" +#include "basic/strv.h" #include "unit.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, service_type, ServiceType); diff --git a/src/libcore/dbus-socket.c b/src/libcore/dbus-socket.c index 961340608d..53c9911991 100644 --- a/src/libcore/dbus-socket.c +++ b/src/libcore/dbus-socket.c @@ -17,13 +17,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" -#include "bus-util.h" +#include "basic/alloc-util.h" +#include "shared/bus-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" #include "dbus-socket.h" #include "socket.h" -#include "string-util.h" +#include "basic/string-util.h" #include "unit.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, socket_result, SocketResult); diff --git a/src/libcore/dbus-swap.c b/src/libcore/dbus-swap.c index 292f8738c6..2cfc8bd496 100644 --- a/src/libcore/dbus-swap.c +++ b/src/libcore/dbus-swap.c @@ -18,11 +18,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "bus-util.h" +#include "shared/bus-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" #include "dbus-swap.h" -#include "string-util.h" +#include "basic/string-util.h" #include "swap.h" #include "unit.h" diff --git a/src/libcore/dbus-timer.c b/src/libcore/dbus-timer.c index a0e61b023e..be84522036 100644 --- a/src/libcore/dbus-timer.c +++ b/src/libcore/dbus-timer.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" -#include "bus-util.h" +#include "basic/alloc-util.h" +#include "shared/bus-util.h" #include "dbus-timer.h" -#include "strv.h" +#include "basic/strv.h" #include "timer.h" #include "unit.h" diff --git a/src/libcore/dbus-unit.c b/src/libcore/dbus-unit.c index dcd8db0898..dd5d6e4c5e 100644 --- a/src/libcore/dbus-unit.c +++ b/src/libcore/dbus-unit.c @@ -19,21 +19,21 @@ #include <systemd/sd-bus.h> -#include "alloc-util.h" -#include "bus-common-errors.h" -#include "cgroup-util.h" +#include "basic/alloc-util.h" +#include "sd-bus/bus-common-errors.h" +#include "basic/cgroup-util.h" #include "dbus-unit.h" #include "dbus.h" -#include "fd-util.h" -#include "locale-util.h" -#include "log.h" -#include "process-util.h" +#include "basic/fd-util.h" +#include "basic/locale-util.h" +#include "basic/log.h" +#include "basic/process-util.h" #include "selinux-access.h" -#include "signal-util.h" -#include "special.h" -#include "string-util.h" -#include "strv.h" -#include "user-util.h" +#include "basic/signal-util.h" +#include "basic/special.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/user-util.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_load_state, unit_load_state, UnitLoadState); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_job_mode, job_mode, JobMode); diff --git a/src/libcore/dbus.c b/src/libcore/dbus.c index 1b217da303..d1d6248041 100644 --- a/src/libcore/dbus.c +++ b/src/libcore/dbus.c @@ -23,11 +23,11 @@ #include <systemd/sd-bus.h> -#include "alloc-util.h" -#include "bus-common-errors.h" -#include "bus-error.h" -#include "bus-internal.h" -#include "bus-util.h" +#include "basic/alloc-util.h" +#include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-error.h" +#include "sd-bus/bus-internal.h" +#include "shared/bus-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" #include "dbus-job.h" @@ -35,16 +35,16 @@ #include "dbus-manager.h" #include "dbus-unit.h" #include "dbus.h" -#include "fd-util.h" -#include "log.h" -#include "missing.h" -#include "mkdir.h" +#include "basic/fd-util.h" +#include "basic/log.h" +#include "basic/missing.h" +#include "basic/mkdir.h" #include "selinux-access.h" -#include "special.h" -#include "string-util.h" -#include "strv.h" -#include "strxcpyx.h" -#include "user-util.h" +#include "basic/special.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/strxcpyx.h" +#include "basic/user-util.h" #define CONNECTIONS_MAX 4096 diff --git a/src/libcore/device.c b/src/libcore/device.c index 16e56efcc3..10e9e9ae76 100644 --- a/src/libcore/device.c +++ b/src/libcore/device.c @@ -22,17 +22,17 @@ #include "libudev.h" -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dbus-device.h" #include "device.h" -#include "log.h" -#include "parse-util.h" -#include "path-util.h" -#include "stat-util.h" -#include "string-util.h" +#include "basic/log.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" #include "swap.h" -#include "udev-util.h" -#include "unit-name.h" +#include "shared/udev-util.h" +#include "basic/unit-name.h" #include "unit.h" static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = { diff --git a/src/libcore/execute.c b/src/libcore/execute.c index b58fb80be2..e7628bceb3 100644 --- a/src/libcore/execute.c +++ b/src/libcore/execute.c @@ -51,53 +51,53 @@ #include <systemd/sd-messages.h> -#include "af-list.h" -#include "alloc-util.h" +#include "basic/af-list.h" +#include "basic/alloc-util.h" #ifdef HAVE_APPARMOR -#include "apparmor-util.h" +#include "shared/apparmor-util.h" #endif -#include "async.h" -#include "barrier.h" -#include "cap-list.h" -#include "capability-util.h" -#include "def.h" -#include "env-util.h" -#include "errno-list.h" +#include "basic/async.h" +#include "basic/barrier.h" +#include "basic/cap-list.h" +#include "basic/capability-util.h" +#include "basic/def.h" +#include "basic/env-util.h" +#include "basic/errno-list.h" #include "execute.h" -#include "exit-status.h" -#include "fd-util.h" -#include "fileio.h" -#include "formats-util.h" -#include "fs-util.h" -#include "glob-util.h" -#include "io-util.h" -#include "ioprio.h" -#include "log.h" -#include "macro.h" -#include "missing.h" -#include "mkdir.h" +#include "basic/exit-status.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/formats-util.h" +#include "basic/fs-util.h" +#include "basic/glob-util.h" +#include "basic/io-util.h" +#include "basic/ioprio.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/mkdir.h" #include "namespace.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "rlimit-util.h" -#include "rm-rf.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/rlimit-util.h" +#include "basic/rm-rf.h" #ifdef HAVE_SECCOMP -#include "seccomp-util.h" +#include "shared/seccomp-util.h" #endif -#include "securebits.h" -#include "selinux-util.h" -#include "signal-util.h" -#include "smack-util.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "syslog-util.h" -#include "terminal-util.h" +#include "basic/securebits.h" +#include "basic/selinux-util.h" +#include "basic/signal-util.h" +#include "basic/smack-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/syslog-util.h" +#include "basic/terminal-util.h" #include "unit.h" -#include "user-util.h" -#include "util.h" -#include "utmp-wtmp.h" +#include "basic/user-util.h" +#include "basic/util.h" +#include "shared/utmp-wtmp.h" #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) diff --git a/src/libcore/execute.h b/src/libcore/execute.h index 41148bcea2..190a56f443 100644 --- a/src/libcore/execute.h +++ b/src/libcore/execute.h @@ -30,9 +30,9 @@ typedef struct ExecParameters ExecParameters; #include <stdio.h> #include <sys/capability.h> -#include "fdset.h" -#include "list.h" -#include "missing.h" +#include "basic/fdset.h" +#include "basic/list.h" +#include "basic/missing.h" #include "namespace.h" typedef enum ExecUtmpMode { @@ -199,7 +199,7 @@ struct ExecContext { bool no_new_privileges_set:1; }; -#include "cgroup-util.h" +#include "basic/cgroup-util.h" #include "cgroup.h" struct ExecParameters { diff --git a/src/libcore/failure-action.c b/src/libcore/failure-action.c index ddae46190f..be76c15a37 100644 --- a/src/libcore/failure-action.c +++ b/src/libcore/failure-action.c @@ -21,12 +21,12 @@ #include <sys/reboot.h> #include <linux/reboot.h> -#include "bus-error.h" -#include "bus-util.h" +#include "sd-bus/bus-error.h" +#include "shared/bus-util.h" #include "failure-action.h" -#include "special.h" -#include "string-table.h" -#include "terminal-util.h" +#include "basic/special.h" +#include "basic/string-table.h" +#include "basic/terminal-util.h" static void log_and_status(Manager *m, const char *message) { log_warning("%s", message); diff --git a/src/libcore/failure-action.h b/src/libcore/failure-action.h index 1adac4ad5c..96c6b51cb2 100644 --- a/src/libcore/failure-action.h +++ b/src/libcore/failure-action.h @@ -32,7 +32,7 @@ typedef enum FailureAction { _FAILURE_ACTION_INVALID = -1 } FailureAction; -#include "macro.h" +#include "basic/macro.h" #include "manager.h" int failure_action(Manager *m, FailureAction action, const char *reboot_arg); diff --git a/src/libcore/hostname-setup.c b/src/libcore/hostname-setup.c index 68be52856b..0085c0d405 100644 --- a/src/libcore/hostname-setup.c +++ b/src/libcore/hostname-setup.c @@ -21,14 +21,14 @@ #include <stdio.h> #include <stdlib.h> -#include "alloc-util.h" -#include "fileio.h" +#include "basic/alloc-util.h" +#include "basic/fileio.h" #include "hostname-setup.h" -#include "hostname-util.h" -#include "log.h" -#include "macro.h" -#include "string-util.h" -#include "util.h" +#include "basic/hostname-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/string-util.h" +#include "basic/util.h" int hostname_setup(void) { int r; diff --git a/src/libcore/ima-setup.c b/src/libcore/ima-setup.c index d1b0ce76ef..c6eb358c9d 100644 --- a/src/libcore/ima-setup.c +++ b/src/libcore/ima-setup.c @@ -22,11 +22,11 @@ #include <errno.h> #include <unistd.h> -#include "fd-util.h" -#include "fileio.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" #include "ima-setup.h" -#include "log.h" -#include "util.h" +#include "basic/log.h" +#include "basic/util.h" #define IMA_SECFS_DIR "/sys/kernel/security/ima" #define IMA_SECFS_POLICY IMA_SECFS_DIR "/policy" diff --git a/src/libcore/job.c b/src/libcore/job.c index 42fdcb988a..1a24a7f152 100644 --- a/src/libcore/job.c +++ b/src/libcore/job.c @@ -22,24 +22,24 @@ #include <systemd/sd-id128.h> #include <systemd/sd-messages.h> -#include "alloc-util.h" -#include "async.h" +#include "basic/alloc-util.h" +#include "basic/async.h" #include "dbus-job.h" #include "dbus.h" -#include "escape.h" +#include "basic/escape.h" #include "job.h" -#include "log.h" -#include "macro.h" -#include "parse-util.h" -#include "set.h" -#include "special.h" -#include "stdio-util.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "terminal-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/set.h" +#include "basic/special.h" +#include "basic/stdio-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/terminal-util.h" #include "unit.h" -#include "virt.h" +#include "basic/virt.h" Job* job_new_raw(Unit *unit) { Job *j; diff --git a/src/libcore/job.h b/src/libcore/job.h index 68c2089b91..f88e5a0782 100644 --- a/src/libcore/job.h +++ b/src/libcore/job.h @@ -23,8 +23,8 @@ #include <systemd/sd-event.h> -#include "list.h" -#include "unit-name.h" +#include "basic/list.h" +#include "basic/unit-name.h" typedef struct Job Job; typedef struct JobDependency JobDependency; diff --git a/src/libcore/kill.c b/src/libcore/kill.c index 6854587d54..22e5bdb4fe 100644 --- a/src/libcore/kill.c +++ b/src/libcore/kill.c @@ -18,9 +18,9 @@ ***/ #include "kill.h" -#include "signal-util.h" -#include "string-table.h" -#include "util.h" +#include "basic/signal-util.h" +#include "basic/string-table.h" +#include "basic/util.h" void kill_context_init(KillContext *c) { assert(c); diff --git a/src/libcore/kill.h b/src/libcore/kill.h index b3d2056cb0..529e4c5377 100644 --- a/src/libcore/kill.h +++ b/src/libcore/kill.h @@ -24,7 +24,7 @@ typedef struct KillContext KillContext; #include <stdbool.h> #include <stdio.h> -#include "macro.h" +#include "basic/macro.h" typedef enum KillMode { /* The kill mode is a property of a unit. */ diff --git a/src/libcore/killall.c b/src/libcore/killall.c index 09378f7085..03bed30704 100644 --- a/src/libcore/killall.c +++ b/src/libcore/killall.c @@ -22,16 +22,16 @@ #include <sys/wait.h> #include <unistd.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "formats-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/formats-util.h" #include "killall.h" -#include "parse-util.h" -#include "process-util.h" -#include "set.h" -#include "string-util.h" -#include "terminal-util.h" -#include "util.h" +#include "basic/parse-util.h" +#include "basic/process-util.h" +#include "basic/set.h" +#include "basic/string-util.h" +#include "basic/terminal-util.h" +#include "basic/util.h" #define TIMEOUT_USEC (10 * USEC_PER_SEC) diff --git a/src/libcore/kmod-setup.c b/src/libcore/kmod-setup.c index 3503db52ed..6ddf1137ec 100644 --- a/src/libcore/kmod-setup.c +++ b/src/libcore/kmod-setup.c @@ -24,10 +24,10 @@ #include <libkmod.h> #endif -#include "bus-util.h" -#include "capability-util.h" +#include "shared/bus-util.h" +#include "basic/capability-util.h" #include "kmod-setup.h" -#include "macro.h" +#include "basic/macro.h" #ifdef HAVE_KMOD static void systemd_kmod_log( diff --git a/src/libcore/load-dropin.c b/src/libcore/load-dropin.c index f83fa09301..bb6cf0f989 100644 --- a/src/libcore/load-dropin.c +++ b/src/libcore/load-dropin.c @@ -18,12 +18,12 @@ ***/ -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "load-dropin.h" #include "load-fragment.h" -#include "log.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/log.h" +#include "basic/strv.h" +#include "basic/unit-name.h" #include "unit.h" static int add_dependency_consumer( diff --git a/src/libcore/load-dropin.h b/src/libcore/load-dropin.h index 942d26724e..067661b1ff 100644 --- a/src/libcore/load-dropin.h +++ b/src/libcore/load-dropin.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "dropin.h" +#include "shared/dropin.h" #include "unit.h" /* Read service data supplementary drop-in directories */ diff --git a/src/libcore/load-fragment-gperf.gperf.m4 b/src/libcore/load-fragment-gperf.gperf.m4 index 8193418980..c9f6e6acf7 100644 --- a/src/libcore/load-fragment-gperf.gperf.m4 +++ b/src/libcore/load-fragment-gperf.gperf.m4 @@ -1,8 +1,8 @@ %{ #include <stddef.h> -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "load-fragment.h" -#include "missing.h" +#include "basic/missing.h" %} struct ConfigPerfItem; %null_strings diff --git a/src/libcore/load-fragment.c b/src/libcore/load-fragment.c index 86b4fb071b..6d9100b189 100644 --- a/src/libcore/load-fragment.c +++ b/src/libcore/load-fragment.c @@ -30,42 +30,42 @@ #include <sys/resource.h> #include <sys/stat.h> -#include "af-list.h" -#include "alloc-util.h" -#include "bus-error.h" -#include "bus-internal.h" -#include "bus-util.h" -#include "cap-list.h" -#include "capability-util.h" +#include "basic/af-list.h" +#include "basic/alloc-util.h" +#include "sd-bus/bus-error.h" +#include "sd-bus/bus-internal.h" +#include "shared/bus-util.h" +#include "basic/cap-list.h" +#include "basic/capability-util.h" #include "cgroup.h" -#include "conf-parser.h" -#include "cpu-set-util.h" -#include "env-util.h" -#include "errno-list.h" -#include "escape.h" -#include "fd-util.h" -#include "fs-util.h" -#include "ioprio.h" +#include "shared/conf-parser.h" +#include "basic/cpu-set-util.h" +#include "basic/env-util.h" +#include "basic/errno-list.h" +#include "basic/escape.h" +#include "basic/fd-util.h" +#include "basic/fs-util.h" +#include "basic/ioprio.h" #include "load-fragment.h" -#include "log.h" -#include "missing.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "rlimit-util.h" +#include "basic/log.h" +#include "basic/missing.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/rlimit-util.h" #ifdef HAVE_SECCOMP -#include "seccomp-util.h" +#include "shared/seccomp-util.h" #endif -#include "securebits.h" -#include "signal-util.h" -#include "stat-util.h" -#include "string-util.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/securebits.h" +#include "basic/signal-util.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/unit-name.h" #include "unit-printf.h" #include "unit.h" -#include "utf8.h" -#include "web-util.h" +#include "basic/utf8.h" +#include "basic/web-util.h" int config_parse_warn_compat( const char *unit, diff --git a/src/libcore/locale-setup.c b/src/libcore/locale-setup.c index ccf61d29fb..1c9660cdf4 100644 --- a/src/libcore/locale-setup.c +++ b/src/libcore/locale-setup.c @@ -20,14 +20,14 @@ #include <errno.h> #include <stdlib.h> -#include "env-util.h" -#include "fileio.h" +#include "basic/env-util.h" +#include "basic/fileio.h" #include "locale-setup.h" -#include "locale-util.h" -#include "string-util.h" -#include "strv.h" -#include "util.h" -#include "virt.h" +#include "basic/locale-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/util.h" +#include "basic/virt.h" int locale_setup(char ***environment) { char **add; diff --git a/src/libcore/loopback-setup.c b/src/libcore/loopback-setup.c index d56bbfa6fc..8affda895c 100644 --- a/src/libcore/loopback-setup.c +++ b/src/libcore/loopback-setup.c @@ -23,8 +23,7 @@ #include <systemd/sd-netlink.h> #include "loopback-setup.h" -#include "missing.h" -#include "netlink-util.h" +#include "basic/missing.h" static int start_loopback(sd_netlink *rtnl) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL; diff --git a/src/libcore/machine-id-setup.c b/src/libcore/machine-id-setup.c index 812e4b038c..702cc90e89 100644 --- a/src/libcore/machine-id-setup.c +++ b/src/libcore/machine-id-setup.c @@ -27,24 +27,24 @@ #include <systemd/sd-id128.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "hexdecoct.h" -#include "io-util.h" -#include "log.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/fs-util.h" +#include "basic/hexdecoct.h" +#include "basic/io-util.h" +#include "basic/log.h" #include "machine-id-setup.h" -#include "macro.h" -#include "mkdir.h" -#include "mount-util.h" -#include "path-util.h" -#include "process-util.h" -#include "stat-util.h" -#include "string-util.h" -#include "umask-util.h" -#include "util.h" -#include "virt.h" +#include "basic/macro.h" +#include "basic/mkdir.h" +#include "basic/mount-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" +#include "basic/umask-util.h" +#include "basic/util.h" +#include "basic/virt.h" static int shorten_uuid(char destination[34], const char source[36]) { unsigned i, j; diff --git a/src/libcore/manager.c b/src/libcore/manager.c index 831fdbaabf..9019967300 100644 --- a/src/libcore/manager.c +++ b/src/libcore/manager.c @@ -38,53 +38,53 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-messages.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "audit-fd.h" -#include "boot-timestamps.h" -#include "bus-common-errors.h" -#include "bus-error.h" -#include "bus-kernel.h" -#include "bus-util.h" +#include "shared/boot-timestamps.h" +#include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-error.h" +#include "sd-bus/bus-kernel.h" +#include "shared/bus-util.h" #include "dbus-job.h" #include "dbus-manager.h" #include "dbus-unit.h" #include "dbus.h" -#include "dirent-util.h" -#include "env-util.h" -#include "escape.h" -#include "exit-status.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "hashmap.h" -#include "io-util.h" +#include "basic/dirent-util.h" +#include "basic/env-util.h" +#include "basic/escape.h" +#include "basic/exit-status.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/fs-util.h" +#include "basic/hashmap.h" +#include "basic/io-util.h" #include "locale-setup.h" -#include "log.h" -#include "macro.h" +#include "basic/log.h" +#include "basic/macro.h" #include "manager.h" -#include "missing.h" -#include "mkdir.h" -#include "mkdir.h" -#include "parse-util.h" -#include "path-lookup.h" -#include "path-util.h" -#include "process-util.h" -#include "ratelimit.h" -#include "rm-rf.h" -#include "signal-util.h" -#include "special.h" -#include "stat-util.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "terminal-util.h" -#include "time-util.h" +#include "basic/missing.h" +#include "basic/mkdir.h" +#include "basic/mkdir.h" +#include "basic/parse-util.h" +#include "shared/path-lookup.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/ratelimit.h" +#include "basic/rm-rf.h" +#include "basic/signal-util.h" +#include "basic/special.h" +#include "basic/stat-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/terminal-util.h" +#include "basic/time-util.h" #include "transaction.h" -#include "umask-util.h" -#include "unit-name.h" -#include "util.h" -#include "virt.h" -#include "watchdog.h" +#include "basic/umask-util.h" +#include "basic/unit-name.h" +#include "basic/util.h" +#include "basic/virt.h" +#include "shared/watchdog.h" #define NOTIFY_RCVBUF_SIZE (8*1024*1024) #define CGROUPS_AGENT_RCVBUF_SIZE (8*1024*1024) diff --git a/src/libcore/manager.h b/src/libcore/manager.h index 70d79ce549..87186b6e40 100644 --- a/src/libcore/manager.h +++ b/src/libcore/manager.h @@ -26,11 +26,11 @@ #include <systemd/sd-bus.h> #include <systemd/sd-event.h> -#include "cgroup-util.h" -#include "fdset.h" -#include "hashmap.h" -#include "list.h" -#include "ratelimit.h" +#include "basic/cgroup-util.h" +#include "basic/fdset.h" +#include "basic/hashmap.h" +#include "basic/list.h" +#include "basic/ratelimit.h" /* Enforce upper limit how many names we allow */ #define MANAGER_MAX_NAMES 131072 /* 128K */ @@ -70,9 +70,9 @@ typedef enum StatusType { #include "execute.h" #include "job.h" -#include "path-lookup.h" +#include "shared/path-lookup.h" #include "show-status.h" -#include "unit-name.h" +#include "basic/unit-name.h" struct Manager { /* Note that the set of units we know of is allowed to be diff --git a/src/libcore/mount-setup.c b/src/libcore/mount-setup.c index 40fc548b42..09df45c567 100644 --- a/src/libcore/mount-setup.c +++ b/src/libcore/mount-setup.c @@ -23,25 +23,25 @@ #include <sys/mount.h> #include <unistd.h> -#include "alloc-util.h" -#include "bus-util.h" -#include "cgroup-util.h" -#include "dev-setup.h" -#include "efivars.h" -#include "label.h" -#include "log.h" -#include "macro.h" -#include "missing.h" -#include "mkdir.h" +#include "basic/alloc-util.h" +#include "shared/bus-util.h" +#include "basic/cgroup-util.h" +#include "shared/dev-setup.h" +#include "shared/efivars.h" +#include "basic/label.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/mkdir.h" #include "mount-setup.h" -#include "mount-util.h" -#include "path-util.h" -#include "set.h" -#include "smack-util.h" -#include "strv.h" -#include "user-util.h" -#include "util.h" -#include "virt.h" +#include "basic/mount-util.h" +#include "basic/path-util.h" +#include "basic/set.h" +#include "basic/smack-util.h" +#include "basic/strv.h" +#include "basic/user-util.h" +#include "basic/util.h" +#include "basic/virt.h" typedef enum MountMode { MNT_NONE = 0, diff --git a/src/libcore/mount.c b/src/libcore/mount.c index 7db9d1325b..ab6efd4a9c 100644 --- a/src/libcore/mount.c +++ b/src/libcore/mount.c @@ -24,26 +24,26 @@ #include <systemd/sd-messages.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dbus-mount.h" -#include "escape.h" -#include "exit-status.h" -#include "formats-util.h" -#include "fstab-util.h" -#include "log.h" +#include "basic/escape.h" +#include "basic/exit-status.h" +#include "basic/formats-util.h" +#include "shared/fstab-util.h" +#include "basic/log.h" #include "manager.h" -#include "mkdir.h" +#include "basic/mkdir.h" #include "mount-setup.h" -#include "mount-util.h" +#include "basic/mount-util.h" #include "mount.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "special.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/special.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/unit-name.h" #include "unit.h" #define RETRY_UMOUNT_MAX 32 diff --git a/src/libcore/namespace.c b/src/libcore/namespace.c index 203d122810..f7c5364437 100644 --- a/src/libcore/namespace.c +++ b/src/libcore/namespace.c @@ -26,23 +26,23 @@ #include <unistd.h> #include <linux/fs.h> -#include "alloc-util.h" -#include "dev-setup.h" -#include "fd-util.h" +#include "basic/alloc-util.h" +#include "shared/dev-setup.h" +#include "basic/fd-util.h" #include "loopback-setup.h" -#include "missing.h" -#include "mkdir.h" -#include "mount-util.h" +#include "basic/missing.h" +#include "basic/mkdir.h" +#include "basic/mount-util.h" #include "namespace.h" -#include "path-util.h" -#include "selinux-util.h" -#include "socket-util.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "umask-util.h" -#include "user-util.h" -#include "util.h" +#include "basic/path-util.h" +#include "basic/selinux-util.h" +#include "basic/socket-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/umask-util.h" +#include "basic/user-util.h" +#include "basic/util.h" #define DEV_MOUNT_OPTIONS (MS_NOSUID|MS_STRICTATIME|MS_NOEXEC) diff --git a/src/libcore/namespace.h b/src/libcore/namespace.h index b54b7b47d6..03097327dd 100644 --- a/src/libcore/namespace.h +++ b/src/libcore/namespace.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "macro.h" +#include "basic/macro.h" typedef enum ProtectHome { PROTECT_HOME_NO, diff --git a/src/libcore/path.c b/src/libcore/path.c index 0dd0d375d8..782e085174 100644 --- a/src/libcore/path.c +++ b/src/libcore/path.c @@ -22,20 +22,20 @@ #include <sys/inotify.h> #include <unistd.h> -#include "bus-error.h" -#include "bus-util.h" +#include "sd-bus/bus-error.h" +#include "shared/bus-util.h" #include "dbus-path.h" -#include "fd-util.h" -#include "fs-util.h" -#include "glob-util.h" -#include "macro.h" -#include "mkdir.h" +#include "basic/fd-util.h" +#include "basic/fs-util.h" +#include "basic/glob-util.h" +#include "basic/macro.h" +#include "basic/mkdir.h" #include "path.h" -#include "special.h" -#include "stat-util.h" -#include "string-table.h" -#include "string-util.h" -#include "unit-name.h" +#include "basic/special.h" +#include "basic/stat-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/unit-name.h" #include "unit.h" static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = { diff --git a/src/libcore/scope.c b/src/libcore/scope.c index 238f63a729..baf1051375 100644 --- a/src/libcore/scope.c +++ b/src/libcore/scope.c @@ -20,16 +20,16 @@ #include <errno.h> #include <unistd.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dbus-scope.h" #include "load-dropin.h" -#include "log.h" +#include "basic/log.h" #include "scope.h" -#include "special.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/special.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/unit-name.h" #include "unit.h" static const UnitActiveState state_translation_table[_SCOPE_STATE_MAX] = { diff --git a/src/libcore/selinux-access.c b/src/libcore/selinux-access.c index 2c04fb0a8f..a259e128c1 100644 --- a/src/libcore/selinux-access.c +++ b/src/libcore/selinux-access.c @@ -31,15 +31,15 @@ #include <systemd/sd-bus.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "audit-fd.h" -#include "bus-util.h" -#include "log.h" -#include "path-util.h" -#include "selinux-util.h" -#include "stdio-util.h" -#include "strv.h" -#include "util.h" +#include "shared/bus-util.h" +#include "basic/log.h" +#include "basic/path-util.h" +#include "basic/selinux-util.h" +#include "basic/stdio-util.h" +#include "basic/strv.h" +#include "basic/util.h" static bool initialized = false; diff --git a/src/libcore/selinux-access.h b/src/libcore/selinux-access.h index cbf33ef6c4..1b1a8418ec 100644 --- a/src/libcore/selinux-access.h +++ b/src/libcore/selinux-access.h @@ -21,7 +21,7 @@ #include <systemd/sd-bus.h> -#include "bus-util.h" +#include "shared/bus-util.h" #include "manager.h" int mac_selinux_generic_access_check(sd_bus_message *message, const char *path, const char *permission, sd_bus_error *error); diff --git a/src/libcore/selinux-setup.c b/src/libcore/selinux-setup.c index 4072df58e6..37a143bce4 100644 --- a/src/libcore/selinux-setup.c +++ b/src/libcore/selinux-setup.c @@ -25,12 +25,12 @@ #include <selinux/selinux.h> #endif -#include "log.h" -#include "macro.h" +#include "basic/log.h" +#include "basic/macro.h" #include "selinux-setup.h" -#include "selinux-util.h" -#include "string-util.h" -#include "util.h" +#include "basic/selinux-util.h" +#include "basic/string-util.h" +#include "basic/util.h" #ifdef HAVE_SELINUX _printf_(2,3) diff --git a/src/libcore/service.c b/src/libcore/service.c index 7ebabca5d6..2845a841c3 100644 --- a/src/libcore/service.c +++ b/src/libcore/service.c @@ -21,38 +21,38 @@ #include <signal.h> #include <unistd.h> -#include "alloc-util.h" -#include "async.h" -#include "bus-error.h" -#include "bus-kernel.h" -#include "bus-util.h" +#include "basic/alloc-util.h" +#include "basic/async.h" +#include "sd-bus/bus-error.h" +#include "sd-bus/bus-kernel.h" +#include "shared/bus-util.h" #include "dbus-service.h" -#include "def.h" -#include "env-util.h" -#include "escape.h" -#include "exit-status.h" -#include "fd-util.h" -#include "fileio.h" -#include "formats-util.h" -#include "fs-util.h" +#include "basic/def.h" +#include "basic/env-util.h" +#include "basic/escape.h" +#include "basic/exit-status.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/formats-util.h" +#include "basic/fs-util.h" #include "load-dropin.h" #include "load-fragment.h" -#include "log.h" +#include "basic/log.h" #include "manager.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" #include "service.h" -#include "signal-util.h" -#include "special.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/signal-util.h" +#include "basic/special.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/unit-name.h" #include "unit-printf.h" #include "unit.h" -#include "utf8.h" -#include "util.h" +#include "basic/utf8.h" +#include "basic/util.h" static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, diff --git a/src/libcore/service.h b/src/libcore/service.h index 4af3d40439..66e2c387fe 100644 --- a/src/libcore/service.h +++ b/src/libcore/service.h @@ -22,10 +22,10 @@ typedef struct Service Service; typedef struct ServiceFDStore ServiceFDStore; -#include "exit-status.h" +#include "basic/exit-status.h" #include "kill.h" #include "path.h" -#include "ratelimit.h" +#include "basic/ratelimit.h" typedef enum ServiceRestart { SERVICE_RESTART_NO, diff --git a/src/libcore/show-status.c b/src/libcore/show-status.c index 59ebdc7219..03a3117f53 100644 --- a/src/libcore/show-status.c +++ b/src/libcore/show-status.c @@ -17,14 +17,14 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" -#include "fd-util.h" -#include "io-util.h" -#include "parse-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/io-util.h" +#include "basic/parse-util.h" #include "show-status.h" -#include "string-util.h" -#include "terminal-util.h" -#include "util.h" +#include "basic/string-util.h" +#include "basic/terminal-util.h" +#include "basic/util.h" int parse_show_status(const char *v, ShowStatus *ret) { int r; diff --git a/src/libcore/show-status.h b/src/libcore/show-status.h index 9a29e72645..56c56eb358 100644 --- a/src/libcore/show-status.h +++ b/src/libcore/show-status.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "macro.h" +#include "basic/macro.h" /* Manager status */ diff --git a/src/libcore/slice.c b/src/libcore/slice.c index c7700b8857..d9b3fa9525 100644 --- a/src/libcore/slice.c +++ b/src/libcore/slice.c @@ -19,14 +19,14 @@ #include <errno.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dbus-slice.h" -#include "log.h" +#include "basic/log.h" #include "slice.h" -#include "special.h" -#include "string-util.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/special.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/unit-name.h" #include "unit.h" static const UnitActiveState state_translation_table[_SLICE_STATE_MAX] = { diff --git a/src/libcore/smack-setup.c b/src/libcore/smack-setup.c index 5a6d11cfa1..16eb234202 100644 --- a/src/libcore/smack-setup.c +++ b/src/libcore/smack-setup.c @@ -26,15 +26,15 @@ #include <stdlib.h> #include <string.h> -#include "alloc-util.h" -#include "dirent-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "log.h" -#include "macro.h" +#include "basic/alloc-util.h" +#include "basic/dirent-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/log.h" +#include "basic/macro.h" #include "smack-setup.h" -#include "string-util.h" -#include "util.h" +#include "basic/string-util.h" +#include "basic/util.h" #ifdef HAVE_SMACK diff --git a/src/libcore/socket.c b/src/libcore/socket.c index f6204d04bf..7ee5edfef8 100644 --- a/src/libcore/socket.c +++ b/src/libcore/socket.c @@ -28,35 +28,35 @@ #include <unistd.h> #include <linux/sctp.h> -#include "alloc-util.h" -#include "bus-error.h" -#include "bus-util.h" -#include "copy.h" +#include "basic/alloc-util.h" +#include "sd-bus/bus-error.h" +#include "shared/bus-util.h" +#include "basic/copy.h" #include "dbus-socket.h" -#include "def.h" -#include "exit-status.h" -#include "fd-util.h" -#include "formats-util.h" -#include "io-util.h" -#include "label.h" -#include "log.h" -#include "missing.h" -#include "mkdir.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "selinux-util.h" -#include "signal-util.h" -#include "smack-util.h" +#include "basic/def.h" +#include "basic/exit-status.h" +#include "basic/fd-util.h" +#include "basic/formats-util.h" +#include "basic/io-util.h" +#include "basic/label.h" +#include "basic/log.h" +#include "basic/missing.h" +#include "basic/mkdir.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/selinux-util.h" +#include "basic/signal-util.h" +#include "basic/smack-util.h" #include "socket.h" -#include "special.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/special.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/unit-name.h" #include "unit-printf.h" #include "unit.h" -#include "user-util.h" +#include "basic/user-util.h" static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = { [SOCKET_DEAD] = UNIT_INACTIVE, diff --git a/src/libcore/socket.h b/src/libcore/socket.h index 0f1ac69c6f..4f25eabd5d 100644 --- a/src/libcore/socket.h +++ b/src/libcore/socket.h @@ -23,7 +23,7 @@ typedef struct Socket Socket; #include "mount.h" #include "service.h" -#include "socket-util.h" +#include "basic/socket-util.h" typedef enum SocketExecCommand { SOCKET_EXEC_START_PRE, diff --git a/src/libcore/swap.c b/src/libcore/swap.c index a532b15be8..c08057a9fe 100644 --- a/src/libcore/swap.c +++ b/src/libcore/swap.c @@ -24,24 +24,24 @@ #include "libudev.h" -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dbus-swap.h" -#include "escape.h" -#include "exit-status.h" -#include "fd-util.h" -#include "formats-util.h" -#include "fstab-util.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "special.h" -#include "string-table.h" -#include "string-util.h" +#include "basic/escape.h" +#include "basic/exit-status.h" +#include "basic/fd-util.h" +#include "basic/formats-util.h" +#include "shared/fstab-util.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/special.h" +#include "basic/string-table.h" +#include "basic/string-util.h" #include "swap.h" -#include "udev-util.h" -#include "unit-name.h" +#include "shared/udev-util.h" +#include "basic/unit-name.h" #include "unit.h" -#include "virt.h" +#include "basic/virt.h" static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = { [SWAP_DEAD] = UNIT_INACTIVE, diff --git a/src/libcore/target.c b/src/libcore/target.c index 61a91aad07..25630b80e5 100644 --- a/src/libcore/target.c +++ b/src/libcore/target.c @@ -18,10 +18,10 @@ ***/ #include "dbus-target.h" -#include "log.h" -#include "special.h" -#include "string-util.h" -#include "unit-name.h" +#include "basic/log.h" +#include "basic/special.h" +#include "basic/string-util.h" +#include "basic/unit-name.h" #include "unit.h" #include "target.h" diff --git a/src/libcore/timer.c b/src/libcore/timer.c index 3206296f09..45eec02dee 100644 --- a/src/libcore/timer.c +++ b/src/libcore/timer.c @@ -19,21 +19,21 @@ #include <errno.h> -#include "alloc-util.h" -#include "bus-error.h" -#include "bus-util.h" +#include "basic/alloc-util.h" +#include "sd-bus/bus-error.h" +#include "shared/bus-util.h" #include "dbus-timer.h" -#include "fs-util.h" -#include "parse-util.h" -#include "random-util.h" -#include "special.h" -#include "string-table.h" -#include "string-util.h" +#include "basic/fs-util.h" +#include "basic/parse-util.h" +#include "basic/random-util.h" +#include "basic/special.h" +#include "basic/string-table.h" +#include "basic/string-util.h" #include "timer.h" -#include "unit-name.h" +#include "basic/unit-name.h" #include "unit.h" -#include "user-util.h" -#include "virt.h" +#include "basic/user-util.h" +#include "basic/virt.h" static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = { [TIMER_DEAD] = UNIT_INACTIVE, diff --git a/src/libcore/timer.h b/src/libcore/timer.h index 9c4b64f898..3773ec47e1 100644 --- a/src/libcore/timer.h +++ b/src/libcore/timer.h @@ -21,7 +21,7 @@ typedef struct Timer Timer; -#include "calendarspec.h" +#include "basic/calendarspec.h" typedef enum TimerBase { TIMER_ACTIVE, diff --git a/src/libcore/transaction.c b/src/libcore/transaction.c index e06a48a2f1..a0ff69e2dc 100644 --- a/src/libcore/transaction.c +++ b/src/libcore/transaction.c @@ -20,10 +20,10 @@ #include <fcntl.h> #include <unistd.h> -#include "alloc-util.h" -#include "bus-common-errors.h" -#include "bus-error.h" -#include "terminal-util.h" +#include "basic/alloc-util.h" +#include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-error.h" +#include "basic/terminal-util.h" #include "transaction.h" #include "dbus-unit.h" diff --git a/src/libcore/transaction.h b/src/libcore/transaction.h index 6a3f927b0f..73489af0e6 100644 --- a/src/libcore/transaction.h +++ b/src/libcore/transaction.h @@ -21,7 +21,7 @@ typedef struct Transaction Transaction; -#include "hashmap.h" +#include "basic/hashmap.h" #include "job.h" #include "manager.h" #include "unit.h" diff --git a/src/libcore/unit-printf.c b/src/libcore/unit-printf.c index f11df42af3..c64d45e251 100644 --- a/src/libcore/unit-printf.c +++ b/src/libcore/unit-printf.c @@ -17,17 +17,17 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" -#include "cgroup-util.h" -#include "formats-util.h" -#include "macro.h" -#include "specifier.h" -#include "string-util.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/alloc-util.h" +#include "basic/cgroup-util.h" +#include "basic/formats-util.h" +#include "basic/macro.h" +#include "shared/specifier.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/unit-name.h" #include "unit-printf.h" #include "unit.h" -#include "user-util.h" +#include "basic/user-util.h" static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) { Unit *u = userdata; diff --git a/src/libcore/unit.c b/src/libcore/unit.c index 8bd39f87f9..3caa8baa26 100644 --- a/src/libcore/unit.c +++ b/src/libcore/unit.c @@ -26,38 +26,38 @@ #include <systemd/sd-id128.h> #include <systemd/sd-messages.h> -#include "alloc-util.h" -#include "bus-common-errors.h" -#include "bus-util.h" -#include "cgroup-util.h" +#include "basic/alloc-util.h" +#include "sd-bus/bus-common-errors.h" +#include "shared/bus-util.h" +#include "basic/cgroup-util.h" #include "dbus-unit.h" #include "dbus.h" -#include "dropin.h" -#include "escape.h" +#include "shared/dropin.h" +#include "basic/escape.h" #include "execute.h" -#include "fileio-label.h" -#include "formats-util.h" +#include "basic/fileio-label.h" +#include "basic/formats-util.h" #include "load-dropin.h" #include "load-fragment.h" -#include "log.h" -#include "macro.h" -#include "missing.h" -#include "mkdir.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "set.h" -#include "signal-util.h" -#include "special.h" -#include "stat-util.h" -#include "stdio-util.h" -#include "string-util.h" -#include "strv.h" -#include "umask-util.h" -#include "unit-name.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/mkdir.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/set.h" +#include "basic/signal-util.h" +#include "basic/special.h" +#include "basic/stat-util.h" +#include "basic/stdio-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/umask-util.h" +#include "basic/unit-name.h" #include "unit.h" -#include "user-util.h" -#include "virt.h" +#include "basic/user-util.h" +#include "basic/virt.h" const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = { [UNIT_SERVICE] = &service_vtable, diff --git a/src/libcore/unit.h b/src/libcore/unit.h index 08a927962d..df1174b837 100644 --- a/src/libcore/unit.h +++ b/src/libcore/unit.h @@ -28,11 +28,11 @@ typedef struct UnitVTable UnitVTable; typedef struct UnitRef UnitRef; typedef struct UnitStatusMessageFormats UnitStatusMessageFormats; -#include "condition.h" +#include "shared/condition.h" #include "failure-action.h" -#include "install.h" -#include "list.h" -#include "unit-name.h" +#include "shared/install.h" +#include "basic/list.h" +#include "basic/unit-name.h" typedef enum KillOperation { KILL_TERMINATE, |