diff options
Diffstat (limited to 'src/libshared')
64 files changed, 404 insertions, 404 deletions
diff --git a/src/libshared/acl-util.c b/src/libshared/acl-util.c index 2aa951fce9..a29790a115 100644 --- a/src/libshared/acl-util.c +++ b/src/libshared/acl-util.c @@ -21,11 +21,11 @@ #include <stdbool.h> #include "acl-util.h" -#include "alloc-util.h" -#include "string-util.h" -#include "strv.h" -#include "user-util.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/user-util.h" +#include "basic/util.h" int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) { acl_entry_t i; diff --git a/src/libshared/acl-util.h b/src/libshared/acl-util.h index 396e9e067e..af5bcb5b4f 100644 --- a/src/libshared/acl-util.h +++ b/src/libshared/acl-util.h @@ -25,7 +25,7 @@ #include <stdbool.h> #include <sys/acl.h> -#include "macro.h" +#include "basic/macro.h" int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry); int calc_acl_mask_if_needed(acl_t *acl_p); diff --git a/src/libshared/acpi-fpdt.c b/src/libshared/acpi-fpdt.c index 6779691c28..844db82645 100644 --- a/src/libshared/acpi-fpdt.c +++ b/src/libshared/acpi-fpdt.c @@ -25,10 +25,10 @@ #include <unistd.h> #include "acpi-fpdt.h" -#include "alloc-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "time-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/time-util.h" struct acpi_table_header { char signature[4]; diff --git a/src/libshared/acpi-fpdt.h b/src/libshared/acpi-fpdt.h index fc28175d0a..3da32c08ad 100644 --- a/src/libshared/acpi-fpdt.h +++ b/src/libshared/acpi-fpdt.h @@ -19,6 +19,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <time-util.h> +#include "basic/time-util.h" int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit); diff --git a/src/libshared/apparmor-util.c b/src/libshared/apparmor-util.c index edd695fd23..6d1861d2ee 100644 --- a/src/libshared/apparmor-util.c +++ b/src/libshared/apparmor-util.c @@ -19,10 +19,10 @@ #include <stddef.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "apparmor-util.h" -#include "fileio.h" -#include "parse-util.h" +#include "basic/fileio.h" +#include "basic/parse-util.h" bool mac_apparmor_use(void) { static int cached_use = -1; diff --git a/src/libshared/ask-password-api.c b/src/libshared/ask-password-api.c index 4a4bd8d3b8..deff185c0b 100644 --- a/src/libshared/ask-password-api.c +++ b/src/libshared/ask-password-api.c @@ -39,26 +39,26 @@ #include <termios.h> #include <unistd.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "ask-password-api.h" -#include "fd-util.h" -#include "fileio.h" -#include "formats-util.h" -#include "io-util.h" -#include "log.h" -#include "macro.h" -#include "missing.h" -#include "mkdir.h" -#include "random-util.h" -#include "signal-util.h" -#include "socket-util.h" -#include "string-util.h" -#include "strv.h" -#include "terminal-util.h" -#include "time-util.h" -#include "umask-util.h" -#include "utf8.h" -#include "util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/formats-util.h" +#include "basic/io-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/mkdir.h" +#include "basic/random-util.h" +#include "basic/signal-util.h" +#include "basic/socket-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/terminal-util.h" +#include "basic/time-util.h" +#include "basic/umask-util.h" +#include "basic/utf8.h" +#include "basic/util.h" #define KEYRING_TIMEOUT_USEC ((5 * USEC_PER_MINUTE) / 2) diff --git a/src/libshared/ask-password-api.h b/src/libshared/ask-password-api.h index 9d7f65130c..770ab1f5c0 100644 --- a/src/libshared/ask-password-api.h +++ b/src/libshared/ask-password-api.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "time-util.h" +#include "basic/time-util.h" typedef enum AskPasswordFlags { ASK_PASSWORD_ACCEPT_CACHED = 1, diff --git a/src/libshared/base-filesystem.c b/src/libshared/base-filesystem.c index 59a34a9d11..85276bbc8c 100644 --- a/src/libshared/base-filesystem.c +++ b/src/libshared/base-filesystem.c @@ -25,15 +25,15 @@ #include <syslog.h> #include <unistd.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "base-filesystem.h" -#include "fd-util.h" -#include "log.h" -#include "macro.h" -#include "string-util.h" -#include "umask-util.h" -#include "user-util.h" -#include "util.h" +#include "basic/fd-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/string-util.h" +#include "basic/umask-util.h" +#include "basic/user-util.h" +#include "basic/util.h" typedef struct BaseFilesystem { const char *dir; diff --git a/src/libshared/boot-timestamps.c b/src/libshared/boot-timestamps.c index 7e0152761c..5d2d39aaed 100644 --- a/src/libshared/boot-timestamps.c +++ b/src/libshared/boot-timestamps.c @@ -21,8 +21,8 @@ #include "acpi-fpdt.h" #include "boot-timestamps.h" #include "efivars.h" -#include "macro.h" -#include "time-util.h" +#include "basic/macro.h" +#include "basic/time-util.h" int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader) { usec_t x = 0, y = 0, a; diff --git a/src/libshared/boot-timestamps.h b/src/libshared/boot-timestamps.h index 6f691026be..00ea7e3009 100644 --- a/src/libshared/boot-timestamps.h +++ b/src/libshared/boot-timestamps.h @@ -20,6 +20,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <time-util.h> +#include "basic/time-util.h" int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader); diff --git a/src/libshared/bus-unit-util.c b/src/libshared/bus-unit-util.c index dcd045eddd..c78f428875 100644 --- a/src/libshared/bus-unit-util.c +++ b/src/libshared/bus-unit-util.c @@ -17,26 +17,26 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "sd-bus/bus-internal.h" #include "bus-unit-util.h" #include "bus-util.h" -#include "cgroup-util.h" -#include "env-util.h" -#include "escape.h" -#include "hashmap.h" -#include "list.h" -#include "locale-util.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "rlimit-util.h" -#include "signal-util.h" -#include "string-util.h" -#include "syslog-util.h" -#include "terminal-util.h" -#include "utf8.h" -#include "util.h" +#include "basic/cgroup-util.h" +#include "basic/env-util.h" +#include "basic/escape.h" +#include "basic/hashmap.h" +#include "basic/list.h" +#include "basic/locale-util.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/rlimit-util.h" +#include "basic/signal-util.h" +#include "basic/string-util.h" +#include "basic/syslog-util.h" +#include "basic/terminal-util.h" +#include "basic/utf8.h" +#include "basic/util.h" int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { assert(message); diff --git a/src/libshared/bus-util.c b/src/libshared/bus-util.c index 62c77a565a..5a03339b79 100644 --- a/src/libshared/bus-util.c +++ b/src/libshared/bus-util.c @@ -34,21 +34,21 @@ #include <systemd/sd-event.h> #include <systemd/sd-id128.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "sd-bus/bus-internal.h" -#include "bus-label.h" +#include "basic/bus-label.h" #include "sd-bus/bus-message.h" #include "bus-util.h" -#include "def.h" -#include "escape.h" -#include "fd-util.h" -#include "missing.h" -#include "parse-util.h" -#include "proc-cmdline.h" -#include "rlimit-util.h" -#include "stdio-util.h" -#include "strv.h" -#include "user-util.h" +#include "basic/def.h" +#include "basic/escape.h" +#include "basic/fd-util.h" +#include "basic/missing.h" +#include "basic/parse-util.h" +#include "basic/proc-cmdline.h" +#include "basic/rlimit-util.h" +#include "basic/stdio-util.h" +#include "basic/strv.h" +#include "basic/user-util.h" static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { sd_event *e = userdata; diff --git a/src/libshared/bus-util.h b/src/libshared/bus-util.h index f2b46530ba..73f2ea0749 100644 --- a/src/libshared/bus-util.h +++ b/src/libshared/bus-util.h @@ -27,9 +27,9 @@ #include <systemd/sd-bus.h> #include <systemd/sd-event.h> -#include "hashmap.h" -#include "macro.h" -#include "string-util.h" +#include "basic/hashmap.h" +#include "basic/macro.h" +#include "basic/string-util.h" typedef enum BusTransport { BUS_TRANSPORT_LOCAL, diff --git a/src/libshared/cgroup-show.c b/src/libshared/cgroup-show.c index 3e451db715..84cd322997 100644 --- a/src/libshared/cgroup-show.c +++ b/src/libshared/cgroup-show.c @@ -24,18 +24,18 @@ #include <stdlib.h> #include <string.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "cgroup-show.h" -#include "cgroup-util.h" -#include "fd-util.h" -#include "formats-util.h" -#include "locale-util.h" -#include "macro.h" +#include "basic/cgroup-util.h" +#include "basic/fd-util.h" +#include "basic/formats-util.h" +#include "basic/locale-util.h" +#include "basic/macro.h" #include "output-mode.h" -#include "path-util.h" -#include "process-util.h" -#include "string-util.h" -#include "terminal-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/string-util.h" +#include "basic/terminal-util.h" static void show_pid_array( pid_t pids[], diff --git a/src/libshared/clean-ipc.c b/src/libshared/clean-ipc.c index a3ac7aeb82..b92cd28f67 100644 --- a/src/libshared/clean-ipc.c +++ b/src/libshared/clean-ipc.c @@ -33,14 +33,14 @@ #include <unistd.h> #include "clean-ipc.h" -#include "dirent-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "formats-util.h" -#include "log.h" -#include "macro.h" -#include "string-util.h" -#include "strv.h" +#include "basic/dirent-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/formats-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/string-util.h" +#include "basic/strv.h" static int clean_sysvipc_shm(uid_t delete_uid) { _cleanup_fclose_ FILE *f = NULL; diff --git a/src/libshared/condition.c b/src/libshared/condition.c index 33ca6e029e..e089a9cb66 100644 --- a/src/libshared/condition.c +++ b/src/libshared/condition.c @@ -29,30 +29,30 @@ #include <systemd/sd-id128.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "apparmor-util.h" -#include "architecture.h" -#include "audit-util.h" -#include "cap-list.h" +#include "basic/architecture.h" +#include "basic/audit-util.h" +#include "basic/cap-list.h" #include "condition.h" -#include "extract-word.h" -#include "fd-util.h" -#include "glob-util.h" -#include "hostname-util.h" +#include "basic/extract-word.h" +#include "basic/fd-util.h" +#include "basic/glob-util.h" +#include "basic/hostname-util.h" #include "ima-util.h" -#include "list.h" -#include "macro.h" -#include "mount-util.h" -#include "parse-util.h" -#include "path-util.h" -#include "proc-cmdline.h" -#include "selinux-util.h" -#include "smack-util.h" -#include "stat-util.h" -#include "string-table.h" -#include "string-util.h" -#include "util.h" -#include "virt.h" +#include "basic/list.h" +#include "basic/macro.h" +#include "basic/mount-util.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/proc-cmdline.h" +#include "basic/selinux-util.h" +#include "basic/smack-util.h" +#include "basic/stat-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/util.h" +#include "basic/virt.h" Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) { Condition *c; diff --git a/src/libshared/condition.h b/src/libshared/condition.h index bdda04b770..fd798460d1 100644 --- a/src/libshared/condition.h +++ b/src/libshared/condition.h @@ -22,8 +22,8 @@ #include <stdbool.h> #include <stdio.h> -#include "list.h" -#include "macro.h" +#include "basic/list.h" +#include "basic/macro.h" typedef enum ConditionType { CONDITION_ARCHITECTURE, diff --git a/src/libshared/conf-parser.c b/src/libshared/conf-parser.c index 83be79a4f5..5a8c698fba 100644 --- a/src/libshared/conf-parser.c +++ b/src/libshared/conf-parser.c @@ -25,24 +25,24 @@ #include <string.h> #include <sys/types.h> -#include "alloc-util.h" -#include "conf-files.h" +#include "basic/alloc-util.h" +#include "basic/conf-files.h" #include "conf-parser.h" -#include "extract-word.h" -#include "fd-util.h" -#include "fs-util.h" -#include "log.h" -#include "macro.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "signal-util.h" -#include "socket-util.h" -#include "string-util.h" -#include "strv.h" -#include "syslog-util.h" -#include "time-util.h" -#include "utf8.h" +#include "basic/extract-word.h" +#include "basic/fd-util.h" +#include "basic/fs-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/signal-util.h" +#include "basic/socket-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/syslog-util.h" +#include "basic/time-util.h" +#include "basic/utf8.h" int config_item_table_lookup( const void *table, diff --git a/src/libshared/conf-parser.h b/src/libshared/conf-parser.h index f6964e3fd4..f7423d45e7 100644 --- a/src/libshared/conf-parser.h +++ b/src/libshared/conf-parser.h @@ -25,9 +25,9 @@ #include <stdio.h> #include <syslog.h> -#include "alloc-util.h" -#include "log.h" -#include "macro.h" +#include "basic/alloc-util.h" +#include "basic/log.h" +#include "basic/macro.h" /* An abstract parser for simple, line based, shallow configuration * files consisting of variable assignments only. */ diff --git a/src/libshared/dev-setup.c b/src/libshared/dev-setup.c index b2d464c117..df80e3c63d 100644 --- a/src/libshared/dev-setup.c +++ b/src/libshared/dev-setup.c @@ -21,13 +21,13 @@ #include <stdlib.h> #include <unistd.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dev-setup.h" -#include "label.h" -#include "log.h" -#include "path-util.h" -#include "user-util.h" -#include "util.h" +#include "basic/label.h" +#include "basic/log.h" +#include "basic/path-util.h" +#include "basic/user-util.h" +#include "basic/util.h" int dev_setup(const char *prefix, uid_t uid, gid_t gid) { static const char symlinks[] = diff --git a/src/libshared/dns-domain.c b/src/libshared/dns-domain.c index 835557c6b2..9d01c074ef 100644 --- a/src/libshared/dns-domain.c +++ b/src/libshared/dns-domain.c @@ -28,16 +28,16 @@ #include <string.h> #include <sys/socket.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dns-domain.h" -#include "hashmap.h" -#include "hexdecoct.h" -#include "in-addr-util.h" -#include "macro.h" -#include "parse-util.h" -#include "string-util.h" -#include "strv.h" -#include "utf8.h" +#include "basic/hashmap.h" +#include "basic/hexdecoct.h" +#include "basic/in-addr-util.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/utf8.h" int dns_label_unescape(const char **name, char *dest, size_t sz) { const char *n; diff --git a/src/libshared/dns-domain.h b/src/libshared/dns-domain.h index af780f0b8b..72e4cb0104 100644 --- a/src/libshared/dns-domain.h +++ b/src/libshared/dns-domain.h @@ -24,8 +24,8 @@ #include <stddef.h> #include <stdint.h> -#include "hashmap.h" -#include "in-addr-util.h" +#include "basic/hashmap.h" +#include "basic/in-addr-util.h" /* Length of a single label, with all escaping removed, excluding any trailing dot or NUL byte */ #define DNS_LABEL_MAX 63 diff --git a/src/libshared/dropin.c b/src/libshared/dropin.c index b9cd952ac8..f045ebaf5a 100644 --- a/src/libshared/dropin.c +++ b/src/libshared/dropin.c @@ -23,21 +23,21 @@ #include <stdio.h> #include <stdlib.h> -#include "alloc-util.h" -#include "conf-files.h" +#include "basic/alloc-util.h" +#include "basic/conf-files.h" #include "dropin.h" -#include "escape.h" -#include "fd-util.h" -#include "fileio-label.h" -#include "hashmap.h" -#include "log.h" -#include "macro.h" -#include "mkdir.h" -#include "path-util.h" -#include "set.h" -#include "string-util.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/escape.h" +#include "basic/fd-util.h" +#include "basic/fileio-label.h" +#include "basic/hashmap.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/mkdir.h" +#include "basic/path-util.h" +#include "basic/set.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/unit-name.h" int drop_in_file(const char *dir, const char *unit, unsigned level, const char *name, char **_p, char **_q) { diff --git a/src/libshared/dropin.h b/src/libshared/dropin.h index c1936f397b..44235405f6 100644 --- a/src/libshared/dropin.h +++ b/src/libshared/dropin.h @@ -19,10 +19,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "hashmap.h" -#include "macro.h" -#include "set.h" -#include "unit-name.h" +#include "basic/hashmap.h" +#include "basic/macro.h" +#include "basic/set.h" +#include "basic/unit-name.h" int drop_in_file(const char *dir, const char *unit, unsigned level, const char *name, char **_p, char **_q); diff --git a/src/libshared/efivars.c b/src/libshared/efivars.c index 5073c61740..0a16f8473f 100644 --- a/src/libshared/efivars.c +++ b/src/libshared/efivars.c @@ -29,18 +29,18 @@ #include <systemd/sd-id128.h> -#include "alloc-util.h" -#include "dirent-util.h" +#include "basic/alloc-util.h" +#include "basic/dirent-util.h" #include "efivars.h" -#include "fd-util.h" -#include "io-util.h" -#include "macro.h" -#include "parse-util.h" -#include "stdio-util.h" -#include "time-util.h" -#include "utf8.h" -#include "util.h" -#include "virt.h" +#include "basic/fd-util.h" +#include "basic/io-util.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/stdio-util.h" +#include "basic/time-util.h" +#include "basic/utf8.h" +#include "basic/util.h" +#include "basic/virt.h" #ifdef ENABLE_EFI diff --git a/src/libshared/efivars.h b/src/libshared/efivars.h index 243151f922..547b161367 100644 --- a/src/libshared/efivars.h +++ b/src/libshared/efivars.h @@ -25,7 +25,7 @@ #include <systemd/sd-id128.h> -#include "time-util.h" +#include "basic/time-util.h" #define EFI_VENDOR_LOADER SD_ID128_MAKE(4a,67,b0,82,0a,4c,41,cf,b6,c7,44,0b,29,bb,8c,4f) #define EFI_VENDOR_GLOBAL SD_ID128_MAKE(8b,e4,df,61,93,ca,11,d2,aa,0d,00,e0,98,03,2b,8c) diff --git a/src/libshared/fstab-util.c b/src/libshared/fstab-util.c index a4e0cd3267..e13941d9cd 100644 --- a/src/libshared/fstab-util.c +++ b/src/libshared/fstab-util.c @@ -23,16 +23,16 @@ #include <stdlib.h> #include <string.h> -#include "alloc-util.h" -#include "device-nodes.h" +#include "basic/alloc-util.h" +#include "basic/device-nodes.h" #include "fstab-util.h" -#include "macro.h" -#include "mount-util.h" -#include "parse-util.h" -#include "path-util.h" -#include "string-util.h" -#include "strv.h" -#include "util.h" +#include "basic/macro.h" +#include "basic/mount-util.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/util.h" bool fstab_is_mount_point(const char *mount) { _cleanup_endmntent_ FILE *f = NULL; diff --git a/src/libshared/fstab-util.h b/src/libshared/fstab-util.h index 679f6902f7..3d9e7ab907 100644 --- a/src/libshared/fstab-util.h +++ b/src/libshared/fstab-util.h @@ -22,7 +22,7 @@ #include <stdbool.h> #include <stddef.h> -#include "macro.h" +#include "basic/macro.h" bool fstab_is_mount_point(const char *mount); diff --git a/src/libshared/gcrypt-util.c b/src/libshared/gcrypt-util.c index 39b544b6f0..f222de6b4f 100644 --- a/src/libshared/gcrypt-util.c +++ b/src/libshared/gcrypt-util.c @@ -23,7 +23,7 @@ #include <gcrypt.h> #include "gcrypt-util.h" -#include "hexdecoct.h" +#include "basic/hexdecoct.h" void initialize_libgcrypt(bool secmem) { const char *p; diff --git a/src/libshared/generator.c b/src/libshared/generator.c index 70afc6a285..b4ab498a21 100644 --- a/src/libshared/generator.c +++ b/src/libshared/generator.c @@ -20,22 +20,22 @@ #include <errno.h> #include <unistd.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dropin.h" -#include "escape.h" -#include "fd-util.h" -#include "fileio.h" +#include "basic/escape.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" #include "fstab-util.h" #include "generator.h" -#include "log.h" -#include "macro.h" -#include "mkdir.h" -#include "path-util.h" -#include "special.h" -#include "string-util.h" -#include "time-util.h" -#include "unit-name.h" -#include "util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/mkdir.h" +#include "basic/path-util.h" +#include "basic/special.h" +#include "basic/string-util.h" +#include "basic/time-util.h" +#include "basic/unit-name.h" +#include "basic/util.h" static int write_fsck_sysroot_service(const char *dir, const char *what) { _cleanup_free_ char *device = NULL, *escaped = NULL; diff --git a/src/libshared/import-util.c b/src/libshared/import-util.c index ab701ad8b2..10e47f3061 100644 --- a/src/libshared/import-util.c +++ b/src/libshared/import-util.c @@ -20,15 +20,15 @@ #include <errno.h> #include <string.h> -#include "alloc-util.h" -#include "btrfs-util.h" +#include "basic/alloc-util.h" +#include "basic/btrfs-util.h" #include "import-util.h" -#include "log.h" -#include "macro.h" -#include "path-util.h" -#include "string-table.h" -#include "string-util.h" -#include "util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/path-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/util.h" int import_url_last_component(const char *url, char **ret) { const char *e, *p; diff --git a/src/libshared/import-util.h b/src/libshared/import-util.h index 77b17d91f3..353fa9045c 100644 --- a/src/libshared/import-util.h +++ b/src/libshared/import-util.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "macro.h" +#include "basic/macro.h" typedef enum ImportVerify { IMPORT_VERIFY_NO, diff --git a/src/libshared/install-printf.c b/src/libshared/install-printf.c index 88143361da..e1635b462c 100644 --- a/src/libshared/install-printf.c +++ b/src/libshared/install-printf.c @@ -22,13 +22,13 @@ #include <string.h> #include <unistd.h> -#include "formats-util.h" +#include "basic/formats-util.h" #include "install-printf.h" #include "install.h" -#include "macro.h" +#include "basic/macro.h" #include "specifier.h" -#include "unit-name.h" -#include "user-util.h" +#include "basic/unit-name.h" +#include "basic/user-util.h" static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) { UnitFileInstallInfo *i = userdata; diff --git a/src/libshared/install.c b/src/libshared/install.c index 64d66a45d3..c453ba65b0 100644 --- a/src/libshared/install.c +++ b/src/libshared/install.c @@ -29,31 +29,31 @@ #include <sys/stat.h> #include <unistd.h> -#include "alloc-util.h" -#include "conf-files.h" +#include "basic/alloc-util.h" +#include "basic/conf-files.h" #include "conf-parser.h" -#include "dirent-util.h" -#include "extract-word.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "hashmap.h" +#include "basic/dirent-util.h" +#include "basic/extract-word.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/fs-util.h" +#include "basic/hashmap.h" #include "install-printf.h" #include "install.h" -#include "locale-util.h" -#include "log.h" -#include "macro.h" -#include "mkdir.h" +#include "basic/locale-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/mkdir.h" #include "path-lookup.h" -#include "path-util.h" -#include "rm-rf.h" -#include "set.h" -#include "special.h" -#include "stat-util.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/path-util.h" +#include "basic/rm-rf.h" +#include "basic/set.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/unit-name.h" #define UNIT_FILE_FOLLOW_SYMLINK_MAX 64 diff --git a/src/libshared/install.h b/src/libshared/install.h index c6aa4f6ef1..b16c752a9b 100644 --- a/src/libshared/install.h +++ b/src/libshared/install.h @@ -30,11 +30,11 @@ typedef struct UnitFileInstallInfo UnitFileInstallInfo; #include <stdbool.h> -#include "hashmap.h" -#include "macro.h" +#include "basic/hashmap.h" +#include "basic/macro.h" #include "path-lookup.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/strv.h" +#include "basic/unit-name.h" enum UnitFileScope { UNIT_FILE_SYSTEM, diff --git a/src/libshared/logs-show.c b/src/libshared/logs-show.c index 97d0d2ffe4..c1bcdf690b 100644 --- a/src/libshared/logs-show.c +++ b/src/libshared/logs-show.c @@ -31,26 +31,26 @@ #include <systemd/sd-id128.h> #include <systemd/sd-journal.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "formats-util.h" -#include "hashmap.h" -#include "hostname-util.h" -#include "io-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/formats-util.h" +#include "basic/hashmap.h" +#include "basic/hostname-util.h" +#include "basic/io-util.h" #include "sd-journal/journal-internal.h" -#include "log.h" +#include "basic/log.h" #include "logs-show.h" -#include "macro.h" +#include "basic/macro.h" #include "output-mode.h" -#include "parse-util.h" -#include "process-util.h" -#include "sparse-endian.h" -#include "string-table.h" -#include "string-util.h" -#include "terminal-util.h" -#include "time-util.h" -#include "utf8.h" -#include "util.h" +#include "basic/parse-util.h" +#include "basic/process-util.h" +#include "basic/sparse-endian.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/terminal-util.h" +#include "basic/time-util.h" +#include "basic/utf8.h" +#include "basic/util.h" /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ #define PRINT_LINE_THRESHOLD 3 diff --git a/src/libshared/logs-show.h b/src/libshared/logs-show.h index 15fe5b6e5c..11a64a092e 100644 --- a/src/libshared/logs-show.h +++ b/src/libshared/logs-show.h @@ -26,10 +26,10 @@ #include <systemd/sd-journal.h> -#include "macro.h" +#include "basic/macro.h" #include "output-mode.h" -#include "time-util.h" -#include "util.h" +#include "basic/time-util.h" +#include "basic/util.h" int output_journal( FILE *f, diff --git a/src/libshared/machine-image.c b/src/libshared/machine-image.c index 529d89ee2a..a4e4ba6856 100644 --- a/src/libshared/machine-image.c +++ b/src/libshared/machine-image.c @@ -27,28 +27,28 @@ #include <sys/stat.h> #include <unistd.h> #include <linux/fs.h> -#include "alloc-util.h" -#include "btrfs-util.h" -#include "chattr-util.h" -#include "copy.h" -#include "dirent-util.h" -#include "fd-util.h" -#include "fs-util.h" -#include "hashmap.h" -#include "lockfile-util.h" -#include "log.h" -#include "macro.h" +#include "basic/alloc-util.h" +#include "basic/btrfs-util.h" +#include "basic/chattr-util.h" +#include "basic/copy.h" +#include "basic/dirent-util.h" +#include "basic/fd-util.h" +#include "basic/fs-util.h" +#include "basic/hashmap.h" +#include "basic/lockfile-util.h" +#include "basic/log.h" +#include "basic/macro.h" #include "machine-image.h" -#include "mkdir.h" -#include "path-util.h" -#include "rm-rf.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "time-util.h" -#include "utf8.h" -#include "util.h" -#include "xattr-util.h" +#include "basic/mkdir.h" +#include "basic/path-util.h" +#include "basic/rm-rf.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/time-util.h" +#include "basic/utf8.h" +#include "basic/util.h" +#include "basic/xattr-util.h" static const char image_search_path[] = "/var/lib/machines\0" diff --git a/src/libshared/machine-image.h b/src/libshared/machine-image.h index 7410168c4f..30a005e114 100644 --- a/src/libshared/machine-image.h +++ b/src/libshared/machine-image.h @@ -22,12 +22,12 @@ #include <stdbool.h> #include <stdint.h> -#include "hashmap.h" -#include "lockfile-util.h" -#include "macro.h" -#include "path-util.h" -#include "string-util.h" -#include "time-util.h" +#include "basic/hashmap.h" +#include "basic/lockfile-util.h" +#include "basic/macro.h" +#include "basic/path-util.h" +#include "basic/string-util.h" +#include "basic/time-util.h" typedef enum ImageType { IMAGE_DIRECTORY, diff --git a/src/libshared/machine-pool.c b/src/libshared/machine-pool.c index c36efa0102..861c30ac1a 100644 --- a/src/libshared/machine-pool.c +++ b/src/libshared/machine-pool.c @@ -36,24 +36,24 @@ #include <systemd/sd-bus-protocol.h> #include <systemd/sd-bus.h> -#include "alloc-util.h" -#include "btrfs-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "lockfile-util.h" -#include "log.h" +#include "basic/alloc-util.h" +#include "basic/btrfs-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/fs-util.h" +#include "basic/lockfile-util.h" +#include "basic/log.h" #include "machine-pool.h" -#include "macro.h" -#include "missing.h" -#include "mkdir.h" -#include "mount-util.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "signal-util.h" -#include "stat-util.h" -#include "string-util.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/mkdir.h" +#include "basic/mount-util.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/signal-util.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" #define VAR_LIB_MACHINES_SIZE_START (1024UL*1024UL*500UL) #define VAR_LIB_MACHINES_FREE_MIN (1024UL*1024UL*750UL) diff --git a/src/libshared/output-mode.c b/src/libshared/output-mode.c index bec53ee0ae..1ed9b3845d 100644 --- a/src/libshared/output-mode.c +++ b/src/libshared/output-mode.c @@ -18,7 +18,7 @@ ***/ #include "output-mode.h" -#include "string-table.h" +#include "basic/string-table.h" static const char *const output_mode_table[_OUTPUT_MODE_MAX] = { [OUTPUT_SHORT] = "short", diff --git a/src/libshared/output-mode.h b/src/libshared/output-mode.h index f37189e57f..9a8d8127d3 100644 --- a/src/libshared/output-mode.h +++ b/src/libshared/output-mode.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "macro.h" +#include "basic/macro.h" typedef enum OutputMode { OUTPUT_SHORT, diff --git a/src/libshared/pager.c b/src/libshared/pager.c index c16bc027be..a25ad795a7 100644 --- a/src/libshared/pager.c +++ b/src/libshared/pager.c @@ -27,16 +27,16 @@ #include <sys/prctl.h> #include <unistd.h> -#include "copy.h" -#include "fd-util.h" -#include "locale-util.h" -#include "log.h" -#include "macro.h" +#include "basic/copy.h" +#include "basic/fd-util.h" +#include "basic/locale-util.h" +#include "basic/log.h" +#include "basic/macro.h" #include "pager.h" -#include "process-util.h" -#include "signal-util.h" -#include "string-util.h" -#include "terminal-util.h" +#include "basic/process-util.h" +#include "basic/signal-util.h" +#include "basic/string-util.h" +#include "basic/terminal-util.h" static pid_t pager_pid = 0; diff --git a/src/libshared/pager.h b/src/libshared/pager.h index 893e1d2bb6..2a3cbe1721 100644 --- a/src/libshared/pager.h +++ b/src/libshared/pager.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "macro.h" +#include "basic/macro.h" int pager_open(bool no_pager, bool jump_to_end); void pager_close(void); diff --git a/src/libshared/path-lookup.c b/src/libshared/path-lookup.c index ca593b6963..36e621232f 100644 --- a/src/libshared/path-lookup.c +++ b/src/libshared/path-lookup.c @@ -22,18 +22,18 @@ #include <stdlib.h> #include <string.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "install.h" -#include "log.h" -#include "macro.h" -#include "mkdir.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/mkdir.h" #include "path-lookup.h" -#include "path-util.h" -#include "rm-rf.h" -#include "stat-util.h" -#include "string-util.h" -#include "strv.h" -#include "util.h" +#include "basic/path-util.h" +#include "basic/rm-rf.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/util.h" static int user_runtime_dir(char **ret, const char *suffix) { const char *e; diff --git a/src/libshared/path-lookup.h b/src/libshared/path-lookup.h index f9bb2fe237..b5df3d9fef 100644 --- a/src/libshared/path-lookup.h +++ b/src/libshared/path-lookup.h @@ -24,7 +24,7 @@ typedef struct LookupPaths LookupPaths; #include "install.h" -#include "macro.h" +#include "basic/macro.h" typedef enum LookupPathsFlags { LOOKUP_PATHS_EXCLUDE_GENERATED = 1, diff --git a/src/libshared/ptyfwd.c b/src/libshared/ptyfwd.c index 9629b50ed9..ca3ed5e16e 100644 --- a/src/libshared/ptyfwd.c +++ b/src/libshared/ptyfwd.c @@ -32,12 +32,12 @@ #include <systemd/sd-event.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "log.h" -#include "macro.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/log.h" +#include "basic/macro.h" #include "ptyfwd.h" -#include "time-util.h" +#include "basic/time-util.h" struct PTYForward { sd_event *event; diff --git a/src/libshared/ptyfwd.h b/src/libshared/ptyfwd.h index 83c1f60970..8f32184433 100644 --- a/src/libshared/ptyfwd.h +++ b/src/libshared/ptyfwd.h @@ -23,7 +23,7 @@ #include <systemd/sd-event.h> -#include "macro.h" +#include "basic/macro.h" typedef struct PTYForward PTYForward; diff --git a/src/libshared/resolve-util.c b/src/libshared/resolve-util.c index e2da81bab7..d80a2fba7c 100644 --- a/src/libshared/resolve-util.c +++ b/src/libshared/resolve-util.c @@ -19,7 +19,7 @@ #include "conf-parser.h" #include "resolve-util.h" -#include "string-table.h" +#include "basic/string-table.h" DEFINE_CONFIG_PARSE_ENUM(config_parse_resolve_support, resolve_support, ResolveSupport, "Failed to parse resolve support setting"); DEFINE_CONFIG_PARSE_ENUM(config_parse_dnssec_mode, dnssec_mode, DnssecMode, "Failed to parse DNSSEC mode setting"); diff --git a/src/libshared/resolve-util.h b/src/libshared/resolve-util.h index 8636a6c134..8df46599ad 100644 --- a/src/libshared/resolve-util.h +++ b/src/libshared/resolve-util.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "macro.h" +#include "basic/macro.h" typedef enum ResolveSupport ResolveSupport; typedef enum DnssecMode DnssecMode; diff --git a/src/libshared/seccomp-util.c b/src/libshared/seccomp-util.c index cebe0fce2a..49884d99b7 100644 --- a/src/libshared/seccomp-util.c +++ b/src/libshared/seccomp-util.c @@ -21,9 +21,9 @@ #include <seccomp.h> #include <stddef.h> -#include "macro.h" +#include "basic/macro.h" #include "seccomp-util.h" -#include "string-util.h" +#include "basic/string-util.h" const char* seccomp_arch_to_string(uint32_t c) { diff --git a/src/libshared/sleep-config.c b/src/libshared/sleep-config.c index f00624d0f2..212a7f32c9 100644 --- a/src/libshared/sleep-config.c +++ b/src/libshared/sleep-config.c @@ -25,18 +25,18 @@ #include <syslog.h> #include <unistd.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "conf-parser.h" -#include "def.h" -#include "env-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "log.h" -#include "macro.h" -#include "parse-util.h" +#include "basic/def.h" +#include "basic/env-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/parse-util.h" #include "sleep-config.h" -#include "string-util.h" -#include "strv.h" +#include "basic/string-util.h" +#include "basic/strv.h" #define USE(x, y) do { (x) = (y); (y) = NULL; } while (0) diff --git a/src/libshared/spawn-ask-password-agent.c b/src/libshared/spawn-ask-password-agent.c index a46b7525f0..4a7411a1df 100644 --- a/src/libshared/spawn-ask-password-agent.c +++ b/src/libshared/spawn-ask-password-agent.c @@ -21,10 +21,10 @@ #include <stdlib.h> #include <unistd.h> -#include "log.h" -#include "process-util.h" +#include "basic/log.h" +#include "basic/process-util.h" #include "spawn-ask-password-agent.h" -#include "util.h" +#include "basic/util.h" static pid_t agent_pid = 0; diff --git a/src/libshared/spawn-polkit-agent.c b/src/libshared/spawn-polkit-agent.c index 7dae4d14fe..7b62e576ee 100644 --- a/src/libshared/spawn-polkit-agent.c +++ b/src/libshared/spawn-polkit-agent.c @@ -23,15 +23,15 @@ #include <stdlib.h> #include <unistd.h> -#include "fd-util.h" -#include "io-util.h" -#include "log.h" -#include "macro.h" -#include "process-util.h" +#include "basic/fd-util.h" +#include "basic/io-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/process-util.h" #include "spawn-polkit-agent.h" -#include "stdio-util.h" -#include "time-util.h" -#include "util.h" +#include "basic/stdio-util.h" +#include "basic/time-util.h" +#include "basic/util.h" #ifdef ENABLE_POLKIT static pid_t agent_pid = 0; diff --git a/src/libshared/specifier.c b/src/libshared/specifier.c index 303ddf0401..dded146aa4 100644 --- a/src/libshared/specifier.c +++ b/src/libshared/specifier.c @@ -26,11 +26,11 @@ #include <systemd/sd-id128.h> -#include "alloc-util.h" -#include "hostname-util.h" -#include "macro.h" +#include "basic/alloc-util.h" +#include "basic/hostname-util.h" +#include "basic/macro.h" #include "specifier.h" -#include "string-util.h" +#include "basic/string-util.h" /* * Generic infrastructure for replacing %x style specifiers in diff --git a/src/libshared/switch-root.c b/src/libshared/switch-root.c index 47d3a5a1fa..750e631a6f 100644 --- a/src/libshared/switch-root.c +++ b/src/libshared/switch-root.c @@ -27,17 +27,17 @@ #include <unistd.h> #include "base-filesystem.h" -#include "fd-util.h" -#include "log.h" -#include "missing.h" -#include "mkdir.h" -#include "path-util.h" -#include "rm-rf.h" -#include "stdio-util.h" -#include "string-util.h" +#include "basic/fd-util.h" +#include "basic/log.h" +#include "basic/missing.h" +#include "basic/mkdir.h" +#include "basic/path-util.h" +#include "basic/rm-rf.h" +#include "basic/stdio-util.h" +#include "basic/string-util.h" #include "switch-root.h" -#include "user-util.h" -#include "util.h" +#include "basic/user-util.h" +#include "basic/util.h" int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot, unsigned long mountflags) { diff --git a/src/libshared/sysctl-util.c b/src/libshared/sysctl-util.c index e1ccb3294c..b84502376d 100644 --- a/src/libshared/sysctl-util.c +++ b/src/libshared/sysctl-util.c @@ -20,10 +20,10 @@ #include <stdio.h> #include <string.h> -#include "fileio.h" -#include "log.h" -#include "macro.h" -#include "string-util.h" +#include "basic/fileio.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/string-util.h" #include "sysctl-util.h" char *sysctl_normalize(char *s) { diff --git a/src/libshared/tests.c b/src/libshared/tests.c index 409116290d..b53deeb66f 100644 --- a/src/libshared/tests.c +++ b/src/libshared/tests.c @@ -18,8 +18,8 @@ ***/ #include <stdlib.h> -#include <util.h> +#include "basic/util.h" #include "tests.h" char* setup_fake_runtime_dir(void) { diff --git a/src/libshared/udev-util.h b/src/libshared/udev-util.h index ca0889f8a6..7765918a12 100644 --- a/src/libshared/udev-util.h +++ b/src/libshared/udev-util.h @@ -20,7 +20,7 @@ ***/ #include "udev.h" -#include "util.h" +#include "basic/util.h" DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev*, udev_unref); DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_device*, udev_device_unref); diff --git a/src/libshared/uid-range.c b/src/libshared/uid-range.c index b6ec474390..4d97503c0a 100644 --- a/src/libshared/uid-range.c +++ b/src/libshared/uid-range.c @@ -21,9 +21,9 @@ #include <stdlib.h> #include <string.h> -#include "macro.h" +#include "basic/macro.h" #include "uid-range.h" -#include "user-util.h" +#include "basic/user-util.h" static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { assert(range); diff --git a/src/libshared/utmp-wtmp.c b/src/libshared/utmp-wtmp.c index 9750dcd817..1a19898c6b 100644 --- a/src/libshared/utmp-wtmp.c +++ b/src/libshared/utmp-wtmp.c @@ -29,16 +29,16 @@ #include <unistd.h> #include <utmpx.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "hostname-util.h" -#include "macro.h" -#include "path-util.h" -#include "string-util.h" -#include "terminal-util.h" -#include "time-util.h" -#include "user-util.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/hostname-util.h" +#include "basic/macro.h" +#include "basic/path-util.h" +#include "basic/string-util.h" +#include "basic/terminal-util.h" +#include "basic/time-util.h" +#include "basic/user-util.h" +#include "basic/util.h" #include "utmp-wtmp.h" int utmp_get_runlevel(int *runlevel, int *previous) { diff --git a/src/libshared/utmp-wtmp.h b/src/libshared/utmp-wtmp.h index 438e270a26..50dde37b16 100644 --- a/src/libshared/utmp-wtmp.h +++ b/src/libshared/utmp-wtmp.h @@ -22,8 +22,8 @@ #include <stdbool.h> #include <sys/types.h> -#include "time-util.h" -#include "util.h" +#include "basic/time-util.h" +#include "basic/util.h" #ifdef HAVE_UTMP int utmp_get_runlevel(int *runlevel, int *previous); diff --git a/src/libshared/watchdog.c b/src/libshared/watchdog.c index 4f3e0125f3..4eaf022e21 100644 --- a/src/libshared/watchdog.c +++ b/src/libshared/watchdog.c @@ -24,9 +24,9 @@ #include <unistd.h> #include <linux/watchdog.h> -#include "fd-util.h" -#include "log.h" -#include "time-util.h" +#include "basic/fd-util.h" +#include "basic/log.h" +#include "basic/time-util.h" #include "watchdog.h" static int watchdog_fd = -1; diff --git a/src/libshared/watchdog.h b/src/libshared/watchdog.h index f6ec178ea1..78e1406f5d 100644 --- a/src/libshared/watchdog.h +++ b/src/libshared/watchdog.h @@ -21,8 +21,8 @@ #include <stdbool.h> -#include "time-util.h" -#include "util.h" +#include "basic/time-util.h" +#include "basic/util.h" int watchdog_set_timeout(usec_t *usec); int watchdog_ping(void); |