diff options
Diffstat (limited to 'src/libbasic')
152 files changed, 700 insertions, 697 deletions
diff --git a/src/libbasic/include/basic/Makefile b/src/libbasic/include/basic/Makefile index 886236375e..f371394691 100644 --- a/src/libbasic/include/basic/Makefile +++ b/src/libbasic/include/basic/Makefile @@ -23,7 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -$(outdir)/errno-list.txt: +$(outdir)/errno-list.txt: | $(outdir)/.deps $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@ $(outdir)/errno-to-name.h: $(outdir)/errno-list.txt @@ -59,4 +59,6 @@ $(outdir)/cap-from-name.gperf: $(outdir)/cap-list.txt $(outdir)/cap-from-name.h: $(outdir)/cap-from-name.gperf $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@ +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libbasic/include/basic/af-list.h b/src/libbasic/include/basic/af-list.h index 6a4cc03839..da9d373872 100644 --- a/src/libbasic/include/basic/af-list.h +++ b/src/libbasic/include/basic/af-list.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "string-util.h" +#include "basic/string-util.h" const char *af_to_name(int id); int af_from_name(const char *name); diff --git a/src/libbasic/include/basic/alloc-util.h b/src/libbasic/include/basic/alloc-util.h index ceeee519b7..e17c027634 100644 --- a/src/libbasic/include/basic/alloc-util.h +++ b/src/libbasic/include/basic/alloc-util.h @@ -24,7 +24,7 @@ #include <stdlib.h> #include <string.h> -#include "macro.h" +#include "basic/macro.h" #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n))) diff --git a/src/libbasic/include/basic/architecture.h b/src/libbasic/include/basic/architecture.h index b3e4d85906..2d4f710f71 100644 --- a/src/libbasic/include/basic/architecture.h +++ b/src/libbasic/include/basic/architecture.h @@ -21,8 +21,8 @@ #include <endian.h> -#include "macro.h" -#include "util.h" +#include "basic/macro.h" +#include "basic/util.h" /* A cleaned up architecture definition. We don't want to get lost in * processor features, models, generations or even ABIs. Hence we diff --git a/src/libbasic/include/basic/barrier.h b/src/libbasic/include/basic/barrier.h index 6347fddc4d..a27a8fc7d6 100644 --- a/src/libbasic/include/basic/barrier.h +++ b/src/libbasic/include/basic/barrier.h @@ -23,7 +23,7 @@ #include <stdint.h> #include <sys/types.h> -#include "macro.h" +#include "basic/macro.h" /* See source file for an API description. */ diff --git a/src/libbasic/include/basic/bitmap.h b/src/libbasic/include/basic/bitmap.h index f5f8f2f018..ee0e13de9e 100644 --- a/src/libbasic/include/basic/bitmap.h +++ b/src/libbasic/include/basic/bitmap.h @@ -21,8 +21,8 @@ #include <stdbool.h> -#include "hashmap.h" -#include "macro.h" +#include "basic/hashmap.h" +#include "basic/macro.h" typedef struct Bitmap Bitmap; diff --git a/src/libbasic/include/basic/blkid-util.h b/src/libbasic/include/basic/blkid-util.h index 7aa75eb091..69a941ede2 100644 --- a/src/libbasic/include/basic/blkid-util.h +++ b/src/libbasic/include/basic/blkid-util.h @@ -23,7 +23,7 @@ #include <blkid/blkid.h> #endif -#include "util.h" +#include "basic/util.h" #ifdef HAVE_BLKID DEFINE_TRIVIAL_CLEANUP_FUNC(blkid_probe, blkid_free_probe); diff --git a/src/libbasic/include/basic/btrfs-ctree.h b/src/libbasic/include/basic/btrfs-ctree.h index 66bdf9736e..f35bfbc7f4 100644 --- a/src/libbasic/include/basic/btrfs-ctree.h +++ b/src/libbasic/include/basic/btrfs-ctree.h @@ -1,7 +1,7 @@ #pragma once -#include "macro.h" -#include "sparse-endian.h" +#include "basic/macro.h" +#include "basic/sparse-endian.h" /* Stolen from btrfs' ctree.h */ diff --git a/src/libbasic/include/basic/btrfs-util.h b/src/libbasic/include/basic/btrfs-util.h index db431f5b74..6221089f3a 100644 --- a/src/libbasic/include/basic/btrfs-util.h +++ b/src/libbasic/include/basic/btrfs-util.h @@ -25,7 +25,7 @@ #include <systemd/sd-id128.h> -#include "time-util.h" +#include "basic/time-util.h" typedef struct BtrfsSubvolInfo { uint64_t subvol_id; diff --git a/src/libbasic/include/basic/calendarspec.h b/src/libbasic/include/basic/calendarspec.h index f6472c1244..8456afe499 100644 --- a/src/libbasic/include/basic/calendarspec.h +++ b/src/libbasic/include/basic/calendarspec.h @@ -24,8 +24,8 @@ #include <stdbool.h> -#include "time-util.h" -#include "util.h" +#include "basic/time-util.h" +#include "basic/util.h" typedef struct CalendarComponent { int value; diff --git a/src/libbasic/include/basic/capability-util.h b/src/libbasic/include/basic/capability-util.h index 35a896e229..2486cd8eb4 100644 --- a/src/libbasic/include/basic/capability-util.h +++ b/src/libbasic/include/basic/capability-util.h @@ -24,8 +24,8 @@ #include <sys/capability.h> #include <sys/types.h> -#include "macro.h" -#include "util.h" +#include "basic/macro.h" +#include "basic/util.h" #define CAP_ALL (uint64_t) -1 diff --git a/src/libbasic/include/basic/cgroup-util.h b/src/libbasic/include/basic/cgroup-util.h index 4bb5291296..f957b181a5 100644 --- a/src/libbasic/include/basic/cgroup-util.h +++ b/src/libbasic/include/basic/cgroup-util.h @@ -25,10 +25,10 @@ #include <stdio.h> #include <sys/types.h> -#include "def.h" -#include "hashmap.h" -#include "macro.h" -#include "set.h" +#include "basic/def.h" +#include "basic/hashmap.h" +#include "basic/macro.h" +#include "basic/set.h" /* An enum of well known cgroup controllers */ typedef enum CGroupController { diff --git a/src/libbasic/include/basic/cpu-set-util.h b/src/libbasic/include/basic/cpu-set-util.h index 6f49d9afb0..17cafff2ae 100644 --- a/src/libbasic/include/basic/cpu-set-util.h +++ b/src/libbasic/include/basic/cpu-set-util.h @@ -22,7 +22,7 @@ #include <sched.h> -#include "macro.h" +#include "basic/macro.h" DEFINE_TRIVIAL_CLEANUP_FUNC(cpu_set_t*, CPU_FREE); #define _cleanup_cpu_free_ _cleanup_(CPU_FREEp) diff --git a/src/libbasic/include/basic/def.h b/src/libbasic/include/basic/def.h index 1a7a0f4928..c9151e6023 100644 --- a/src/libbasic/include/basic/def.h +++ b/src/libbasic/include/basic/def.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "util.h" +#include "basic/util.h" #define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC) #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC) diff --git a/src/libbasic/include/basic/dirent-util.h b/src/libbasic/include/basic/dirent-util.h index b91d04908f..4352db66c5 100644 --- a/src/libbasic/include/basic/dirent-util.h +++ b/src/libbasic/include/basic/dirent-util.h @@ -23,8 +23,8 @@ #include <errno.h> #include <stdbool.h> -#include "macro.h" -#include "path-util.h" +#include "basic/macro.h" +#include "basic/path-util.h" int dirent_ensure_type(DIR *d, struct dirent *de); diff --git a/src/libbasic/include/basic/env-util.h b/src/libbasic/include/basic/env-util.h index b1fef704c2..f22958257d 100644 --- a/src/libbasic/include/basic/env-util.h +++ b/src/libbasic/include/basic/env-util.h @@ -22,7 +22,7 @@ #include <stdbool.h> #include <stddef.h> -#include "macro.h" +#include "basic/macro.h" bool env_name_is_valid(const char *e); bool env_value_is_valid(const char *e); diff --git a/src/libbasic/include/basic/escape.h b/src/libbasic/include/basic/escape.h index deaa4def28..dffe417cc6 100644 --- a/src/libbasic/include/basic/escape.h +++ b/src/libbasic/include/basic/escape.h @@ -25,8 +25,8 @@ #include <sys/types.h> #include <uchar.h> -#include "string-util.h" -#include "missing.h" +#include "basic/string-util.h" +#include "basic/missing.h" /* What characters are special in the shell? */ /* must be escaped outside and inside double-quotes */ diff --git a/src/libbasic/include/basic/exit-status.h b/src/libbasic/include/basic/exit-status.h index 1208c8feed..3e9dcb1e53 100644 --- a/src/libbasic/include/basic/exit-status.h +++ b/src/libbasic/include/basic/exit-status.h @@ -21,9 +21,9 @@ #include <stdbool.h> -#include "hashmap.h" -#include "macro.h" -#include "set.h" +#include "basic/hashmap.h" +#include "basic/macro.h" +#include "basic/set.h" typedef enum ExitStatus { /* EXIT_SUCCESS defined by libc */ diff --git a/src/libbasic/include/basic/extract-word.h b/src/libbasic/include/basic/extract-word.h index 21db5ef33f..6211a7d15b 100644 --- a/src/libbasic/include/basic/extract-word.h +++ b/src/libbasic/include/basic/extract-word.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 ExtractFlags { EXTRACT_RELAX = 1, diff --git a/src/libbasic/include/basic/fd-util.h b/src/libbasic/include/basic/fd-util.h index b86e41698a..706c49324c 100644 --- a/src/libbasic/include/basic/fd-util.h +++ b/src/libbasic/include/basic/fd-util.h @@ -24,7 +24,7 @@ #include <stdio.h> #include <sys/socket.h> -#include "macro.h" +#include "basic/macro.h" /* Make sure we can distinguish fd 0 and NULL */ #define FD_TO_PTR(fd) INT_TO_PTR((fd)+1) diff --git a/src/libbasic/include/basic/fdset.h b/src/libbasic/include/basic/fdset.h index 16efe5bdf2..3ff5d519af 100644 --- a/src/libbasic/include/basic/fdset.h +++ b/src/libbasic/include/basic/fdset.h @@ -21,9 +21,9 @@ #include <stdbool.h> -#include "hashmap.h" -#include "macro.h" -#include "set.h" +#include "basic/hashmap.h" +#include "basic/macro.h" +#include "basic/set.h" typedef struct FDSet FDSet; diff --git a/src/libbasic/include/basic/fileio-label.h b/src/libbasic/include/basic/fileio-label.h index fe7543013d..e8e8375de6 100644 --- a/src/libbasic/include/basic/fileio-label.h +++ b/src/libbasic/include/basic/fileio-label.h @@ -22,7 +22,7 @@ #include <stdio.h> -#include "fileio.h" +#include "basic/fileio.h" int write_string_file_atomic_label(const char *fn, const char *line); int write_env_file_label(const char *fname, char **l); diff --git a/src/libbasic/include/basic/fileio.h b/src/libbasic/include/basic/fileio.h index 58dbc80c24..31f75d0f97 100644 --- a/src/libbasic/include/basic/fileio.h +++ b/src/libbasic/include/basic/fileio.h @@ -25,8 +25,8 @@ #include <stdio.h> #include <sys/types.h> -#include "macro.h" -#include "time-util.h" +#include "basic/macro.h" +#include "basic/time-util.h" typedef enum { WRITE_STRING_FILE_CREATE = 1, diff --git a/src/libbasic/include/basic/fs-util.h b/src/libbasic/include/basic/fs-util.h index 517b599d6f..69292a3b22 100644 --- a/src/libbasic/include/basic/fs-util.h +++ b/src/libbasic/include/basic/fs-util.h @@ -27,7 +27,7 @@ #include <sys/types.h> #include <unistd.h> -#include "time-util.h" +#include "basic/time-util.h" int unlink_noerrno(const char *path); diff --git a/src/libbasic/include/basic/glob-util.h b/src/libbasic/include/basic/glob-util.h index 5d8fb47a26..63daf4d67f 100644 --- a/src/libbasic/include/basic/glob-util.h +++ b/src/libbasic/include/basic/glob-util.h @@ -22,8 +22,8 @@ #include <stdbool.h> #include <string.h> -#include "macro.h" -#include "string-util.h" +#include "basic/macro.h" +#include "basic/string-util.h" int glob_exists(const char *path); int glob_extend(char ***strv, const char *path); diff --git a/src/libbasic/include/basic/hash-funcs.h b/src/libbasic/include/basic/hash-funcs.h index 299189d143..95c565a3ce 100644 --- a/src/libbasic/include/basic/hash-funcs.h +++ b/src/libbasic/include/basic/hash-funcs.h @@ -20,8 +20,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "macro.h" -#include "siphash24.h" +#include "basic/macro.h" +#include "basic/siphash24.h" typedef void (*hash_func_t)(const void *p, struct siphash *state); typedef int (*compare_func_t)(const void *a, const void *b); diff --git a/src/libbasic/include/basic/hashmap.h b/src/libbasic/include/basic/hashmap.h index 6d1ae48b21..2be0e99d42 100644 --- a/src/libbasic/include/basic/hashmap.h +++ b/src/libbasic/include/basic/hashmap.h @@ -24,9 +24,9 @@ #include <stdbool.h> #include <stddef.h> -#include "hash-funcs.h" -#include "macro.h" -#include "util.h" +#include "basic/hash-funcs.h" +#include "basic/macro.h" +#include "basic/util.h" /* * A hash table implementation. As a minor optimization a NULL hashmap object diff --git a/src/libbasic/include/basic/hexdecoct.h b/src/libbasic/include/basic/hexdecoct.h index 1ba2f69ebd..3c1225cf8b 100644 --- a/src/libbasic/include/basic/hexdecoct.h +++ b/src/libbasic/include/basic/hexdecoct.h @@ -24,7 +24,7 @@ #include <stdio.h> #include <sys/types.h> -#include "macro.h" +#include "basic/macro.h" char octchar(int x) _const_; int unoctchar(char c) _const_; diff --git a/src/libbasic/include/basic/hostname-util.h b/src/libbasic/include/basic/hostname-util.h index 7af4e6c7ec..e23412e116 100644 --- a/src/libbasic/include/basic/hostname-util.h +++ b/src/libbasic/include/basic/hostname-util.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "macro.h" +#include "basic/macro.h" bool hostname_is_set(void); diff --git a/src/libbasic/include/basic/in-addr-util.h b/src/libbasic/include/basic/in-addr-util.h index 17798ce816..c28a84a0d9 100644 --- a/src/libbasic/include/basic/in-addr-util.h +++ b/src/libbasic/include/basic/in-addr-util.h @@ -23,8 +23,8 @@ #include <stddef.h> #include <sys/socket.h> -#include "macro.h" -#include "util.h" +#include "basic/macro.h" +#include "basic/util.h" union in_addr_union { struct in_addr in; diff --git a/src/libbasic/include/basic/io-util.h b/src/libbasic/include/basic/io-util.h index 4684ed3bfc..100f15c283 100644 --- a/src/libbasic/include/basic/io-util.h +++ b/src/libbasic/include/basic/io-util.h @@ -25,8 +25,8 @@ #include <sys/types.h> #include <sys/uio.h> -#include "macro.h" -#include "time-util.h" +#include "basic/macro.h" +#include "basic/time-util.h" int flush_fd(int fd); diff --git a/src/libbasic/include/basic/locale-util.h b/src/libbasic/include/basic/locale-util.h index 0630a034ab..e5db878b12 100644 --- a/src/libbasic/include/basic/locale-util.h +++ b/src/libbasic/include/basic/locale-util.h @@ -22,7 +22,7 @@ #include <libintl.h> #include <stdbool.h> -#include "macro.h" +#include "basic/macro.h" typedef enum LocaleVariable { /* We don't list LC_ALL here on purpose. People should be diff --git a/src/libbasic/include/basic/lockfile-util.h b/src/libbasic/include/basic/lockfile-util.h index 22491ee8e1..e344e1f8f1 100644 --- a/src/libbasic/include/basic/lockfile-util.h +++ b/src/libbasic/include/basic/lockfile-util.h @@ -21,8 +21,8 @@ #include <stddef.h> -#include "macro.h" -#include "missing.h" +#include "basic/macro.h" +#include "basic/missing.h" typedef struct LockFile { char *path; diff --git a/src/libbasic/include/basic/log.h b/src/libbasic/include/basic/log.h index d2a22b5829..6ddbac1436 100644 --- a/src/libbasic/include/basic/log.h +++ b/src/libbasic/include/basic/log.h @@ -29,7 +29,7 @@ #include <systemd/sd-id128.h> -#include "macro.h" +#include "basic/macro.h" typedef enum LogTarget{ LOG_TARGET_CONSOLE, diff --git a/src/libbasic/include/basic/macro.h b/src/libbasic/include/basic/macro.h index e41aa4260f..e83d2f77d2 100644 --- a/src/libbasic/include/basic/macro.h +++ b/src/libbasic/include/basic/macro.h @@ -403,4 +403,4 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { } \ struct __useless_struct_to_allow_trailing_semicolon__ -#include "log.h" +#include "basic/log.h" diff --git a/src/libbasic/include/basic/missing.h b/src/libbasic/include/basic/missing.h index 651e414395..13c9b89080 100644 --- a/src/libbasic/include/basic/missing.h +++ b/src/libbasic/include/basic/missing.h @@ -50,7 +50,7 @@ #include <linux/btrfs.h> #endif -#include "macro.h" +#include "basic/macro.h" #ifndef RLIMIT_RTTIME #define RLIMIT_RTTIME 15 @@ -1013,4 +1013,4 @@ typedef int32_t key_serial_t; #endif -#include "missing_syscall.h" +#include "basic/missing_syscall.h" diff --git a/src/libbasic/include/basic/mount-util.h b/src/libbasic/include/basic/mount-util.h index bdb525d6b0..bb5b37d9a1 100644 --- a/src/libbasic/include/basic/mount-util.h +++ b/src/libbasic/include/basic/mount-util.h @@ -26,8 +26,8 @@ #include <sys/stat.h> #include <sys/types.h> -#include "macro.h" -#include "missing.h" +#include "basic/macro.h" +#include "basic/missing.h" int fd_is_mount_point(int fd, const char *filename, int flags); int path_is_mount_point(const char *path, int flags); diff --git a/src/libbasic/include/basic/ordered-set.h b/src/libbasic/include/basic/ordered-set.h index e1dfc86380..2823c17dda 100644 --- a/src/libbasic/include/basic/ordered-set.h +++ b/src/libbasic/include/basic/ordered-set.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "hashmap.h" +#include "basic/hashmap.h" typedef struct OrderedSet OrderedSet; diff --git a/src/libbasic/include/basic/parse-util.h b/src/libbasic/include/basic/parse-util.h index 7dc579a159..7132c958ef 100644 --- a/src/libbasic/include/basic/parse-util.h +++ b/src/libbasic/include/basic/parse-util.h @@ -25,7 +25,7 @@ #include <stdint.h> #include <sys/types.h> -#include "macro.h" +#include "basic/macro.h" #define MODE_INVALID ((mode_t) -1) diff --git a/src/libbasic/include/basic/path-util.h b/src/libbasic/include/basic/path-util.h index a27c13fcc3..cd787fae59 100644 --- a/src/libbasic/include/basic/path-util.h +++ b/src/libbasic/include/basic/path-util.h @@ -23,8 +23,8 @@ #include <stdbool.h> #include <stddef.h> -#include "macro.h" -#include "time-util.h" +#include "basic/macro.h" +#include "basic/time-util.h" #define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin" #define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":/sbin:/bin" diff --git a/src/libbasic/include/basic/prioq.h b/src/libbasic/include/basic/prioq.h index 113c73d040..25dc1a253d 100644 --- a/src/libbasic/include/basic/prioq.h +++ b/src/libbasic/include/basic/prioq.h @@ -21,8 +21,8 @@ #include <stdbool.h> -#include "hashmap.h" -#include "macro.h" +#include "basic/hashmap.h" +#include "basic/macro.h" typedef struct Prioq Prioq; diff --git a/src/libbasic/include/basic/process-util.h b/src/libbasic/include/basic/process-util.h index 9f75088796..4fa45a97e3 100644 --- a/src/libbasic/include/basic/process-util.h +++ b/src/libbasic/include/basic/process-util.h @@ -27,8 +27,8 @@ #include <string.h> #include <sys/types.h> -#include "formats-util.h" -#include "macro.h" +#include "basic/formats-util.h" +#include "basic/macro.h" #define procfs_file_alloca(pid, field) \ ({ \ diff --git a/src/libbasic/include/basic/ratelimit.h b/src/libbasic/include/basic/ratelimit.h index 9c8dddf5ad..f54209c534 100644 --- a/src/libbasic/include/basic/ratelimit.h +++ b/src/libbasic/include/basic/ratelimit.h @@ -21,8 +21,8 @@ #include <stdbool.h> -#include "time-util.h" -#include "util.h" +#include "basic/time-util.h" +#include "basic/util.h" typedef struct RateLimit { usec_t interval; diff --git a/src/libbasic/include/basic/rlimit-util.h b/src/libbasic/include/basic/rlimit-util.h index d4594eccd6..d9a6a4e902 100644 --- a/src/libbasic/include/basic/rlimit-util.h +++ b/src/libbasic/include/basic/rlimit-util.h @@ -21,7 +21,7 @@ #include <sys/resource.h> -#include "macro.h" +#include "basic/macro.h" const char *rlimit_to_string(int i) _const_; int rlimit_from_string(const char *s) _pure_; diff --git a/src/libbasic/include/basic/selinux-util.h b/src/libbasic/include/basic/selinux-util.h index ce6bc8e44c..a619d0322a 100644 --- a/src/libbasic/include/basic/selinux-util.h +++ b/src/libbasic/include/basic/selinux-util.h @@ -23,7 +23,7 @@ #include <sys/socket.h> #include <sys/types.h> -#include "macro.h" +#include "basic/macro.h" bool mac_selinux_use(void); bool mac_selinux_have(void); diff --git a/src/libbasic/include/basic/set.h b/src/libbasic/include/basic/set.h index e0d9dd001c..4e74e9108b 100644 --- a/src/libbasic/include/basic/set.h +++ b/src/libbasic/include/basic/set.h @@ -19,8 +19,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "hashmap.h" -#include "macro.h" +#include "basic/hashmap.h" +#include "basic/macro.h" Set *internal_set_new(const struct hash_ops *hash_ops HASHMAP_DEBUG_PARAMS); #define set_new(ops) internal_set_new(ops HASHMAP_DEBUG_SRC_ARGS) diff --git a/src/libbasic/include/basic/signal-util.h b/src/libbasic/include/basic/signal-util.h index dfd6eb564d..bfc1be809a 100644 --- a/src/libbasic/include/basic/signal-util.h +++ b/src/libbasic/include/basic/signal-util.h @@ -21,7 +21,7 @@ #include <signal.h> -#include "macro.h" +#include "basic/macro.h" int reset_all_signal_handlers(void); int reset_signal_mask(void); diff --git a/src/libbasic/include/basic/smack-util.h b/src/libbasic/include/basic/smack-util.h index f90ba0a027..9ff19b30b3 100644 --- a/src/libbasic/include/basic/smack-util.h +++ b/src/libbasic/include/basic/smack-util.h @@ -24,7 +24,7 @@ #include <stdbool.h> #include <sys/types.h> -#include "macro.h" +#include "basic/macro.h" #define SMACK_FLOOR_LABEL "_" #define SMACK_STAR_LABEL "*" diff --git a/src/libbasic/include/basic/socket-util.h b/src/libbasic/include/basic/socket-util.h index e9230e4a9f..a711d368d5 100644 --- a/src/libbasic/include/basic/socket-util.h +++ b/src/libbasic/include/basic/socket-util.h @@ -29,8 +29,8 @@ #include <linux/netlink.h> #include <linux/if_packet.h> -#include "macro.h" -#include "util.h" +#include "basic/macro.h" +#include "basic/util.h" union sockaddr_union { struct sockaddr sa; diff --git a/src/libbasic/include/basic/stat-util.h b/src/libbasic/include/basic/stat-util.h index 56d28f791e..8c0cd0c97c 100644 --- a/src/libbasic/include/basic/stat-util.h +++ b/src/libbasic/include/basic/stat-util.h @@ -26,7 +26,7 @@ #include <sys/types.h> #include <sys/vfs.h> -#include "macro.h" +#include "basic/macro.h" int is_symlink(const char *path); int is_dir(const char *path, bool follow); diff --git a/src/libbasic/include/basic/stdio-util.h b/src/libbasic/include/basic/stdio-util.h index bd1144b4c9..414a278d0f 100644 --- a/src/libbasic/include/basic/stdio-util.h +++ b/src/libbasic/include/basic/stdio-util.h @@ -24,7 +24,7 @@ #include <stdio.h> #include <sys/types.h> -#include "macro.h" +#include "basic/macro.h" #define xsprintf(buf, fmt, ...) \ assert_message_se((size_t) snprintf(buf, ELEMENTSOF(buf), fmt, __VA_ARGS__) < ELEMENTSOF(buf), "xsprintf: " #buf "[] must be big enough") diff --git a/src/libbasic/include/basic/string-table.h b/src/libbasic/include/basic/string-table.h index d88625fca7..cf9345c80a 100644 --- a/src/libbasic/include/basic/string-table.h +++ b/src/libbasic/include/basic/string-table.h @@ -26,9 +26,9 @@ #include <string.h> #include <sys/types.h> -#include "macro.h" -#include "parse-util.h" -#include "string-util.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/string-util.h" ssize_t string_table_lookup(const char * const *table, size_t len, const char *key); diff --git a/src/libbasic/include/basic/string-util.h b/src/libbasic/include/basic/string-util.h index 139cc8c91b..e0ff88b7fb 100644 --- a/src/libbasic/include/basic/string-util.h +++ b/src/libbasic/include/basic/string-util.h @@ -24,7 +24,7 @@ #include <stddef.h> #include <string.h> -#include "macro.h" +#include "basic/macro.h" /* What is interpreted as whitespace? */ #define WHITESPACE " \t\n\r" diff --git a/src/libbasic/include/basic/strv.h b/src/libbasic/include/basic/strv.h index f61bbb5386..20773223ad 100644 --- a/src/libbasic/include/basic/strv.h +++ b/src/libbasic/include/basic/strv.h @@ -24,10 +24,10 @@ #include <stdbool.h> #include <stddef.h> -#include "alloc-util.h" -#include "extract-word.h" -#include "macro.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/extract-word.h" +#include "basic/macro.h" +#include "basic/util.h" char *strv_find(char **l, const char *name) _pure_; char *strv_find_prefix(char **l, const char *name) _pure_; diff --git a/src/libbasic/include/basic/strxcpyx.h b/src/libbasic/include/basic/strxcpyx.h index 80ff58726b..7e9a5399d4 100644 --- a/src/libbasic/include/basic/strxcpyx.h +++ b/src/libbasic/include/basic/strxcpyx.h @@ -22,7 +22,7 @@ #include <stddef.h> -#include "macro.h" +#include "basic/macro.h" size_t strpcpy(char **dest, size_t size, const char *src); size_t strpcpyf(char **dest, size_t size, const char *src, ...) _printf_(3, 4); diff --git a/src/libbasic/include/basic/terminal-util.h b/src/libbasic/include/basic/terminal-util.h index a7c96a77cb..51f6fd16bc 100644 --- a/src/libbasic/include/basic/terminal-util.h +++ b/src/libbasic/include/basic/terminal-util.h @@ -24,8 +24,8 @@ #include <stdio.h> #include <sys/types.h> -#include "macro.h" -#include "time-util.h" +#include "basic/macro.h" +#include "basic/time-util.h" #define ANSI_RED "\x1B[0;31m" #define ANSI_GREEN "\x1B[0;32m" diff --git a/src/libbasic/include/basic/time-util.h b/src/libbasic/include/basic/time-util.h index a5e3f567ec..325266ec7e 100644 --- a/src/libbasic/include/basic/time-util.h +++ b/src/libbasic/include/basic/time-util.h @@ -32,7 +32,7 @@ typedef uint64_t nsec_t; #define NSEC_FMT "%" PRIu64 #define USEC_FMT "%" PRIu64 -#include "macro.h" +#include "basic/macro.h" typedef struct dual_timestamp { usec_t realtime; diff --git a/src/libbasic/include/basic/umask-util.h b/src/libbasic/include/basic/umask-util.h index 359d87d27c..d6a9835021 100644 --- a/src/libbasic/include/basic/umask-util.h +++ b/src/libbasic/include/basic/umask-util.h @@ -23,7 +23,7 @@ #include <sys/stat.h> #include <sys/types.h> -#include "macro.h" +#include "basic/macro.h" static inline void umaskp(mode_t *u) { umask(*u); diff --git a/src/libbasic/include/basic/unit-name.h b/src/libbasic/include/basic/unit-name.h index f209a84634..c31e474cb7 100644 --- a/src/libbasic/include/basic/unit-name.h +++ b/src/libbasic/include/basic/unit-name.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "macro.h" +#include "basic/macro.h" #define UNIT_NAME_MAX 256 diff --git a/src/libbasic/include/basic/utf8.h b/src/libbasic/include/basic/utf8.h index f9b9c9468b..f6fdb6eff7 100644 --- a/src/libbasic/include/basic/utf8.h +++ b/src/libbasic/include/basic/utf8.h @@ -24,8 +24,8 @@ #include <stdint.h> #include <uchar.h> -#include "macro.h" -#include "missing.h" +#include "basic/macro.h" +#include "basic/missing.h" #define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd" #define UTF8_BYTE_ORDER_MARK "\xef\xbb\xbf" diff --git a/src/libbasic/include/basic/util.h b/src/libbasic/include/basic/util.h index 1c032c15c9..18d7eb2250 100644 --- a/src/libbasic/include/basic/util.h +++ b/src/libbasic/include/basic/util.h @@ -41,10 +41,10 @@ #include <time.h> #include <unistd.h> -#include "formats-util.h" -#include "macro.h" -#include "missing.h" -#include "time-util.h" +#include "basic/formats-util.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/time-util.h" size_t page_size(void) _pure_; #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) diff --git a/src/libbasic/include/basic/virt.h b/src/libbasic/include/basic/virt.h index a538f07f6b..b0e30e26f8 100644 --- a/src/libbasic/include/basic/virt.h +++ b/src/libbasic/include/basic/virt.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "macro.h" +#include "basic/macro.h" enum { VIRTUALIZATION_NONE = 0, diff --git a/src/libbasic/include/basic/web-util.h b/src/libbasic/include/basic/web-util.h index e6bb6b53f5..941940e0bc 100644 --- a/src/libbasic/include/basic/web-util.h +++ b/src/libbasic/include/basic/web-util.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "macro.h" +#include "basic/macro.h" bool http_url_is_valid(const char *url) _pure_; diff --git a/src/libbasic/include/basic/xattr-util.h b/src/libbasic/include/basic/xattr-util.h index 6fa097bf7e..9990b05af8 100644 --- a/src/libbasic/include/basic/xattr-util.h +++ b/src/libbasic/include/basic/xattr-util.h @@ -23,7 +23,7 @@ #include <stddef.h> #include <sys/types.h> -#include "time-util.h" +#include "basic/time-util.h" int getxattr_malloc(const char *path, const char *name, char **value, bool allow_symlink); int fgetxattr_malloc(int fd, const char *name, char **value); diff --git a/src/libbasic/src/Makefile b/src/libbasic/src/Makefile index f3c3cc8508..f29590ae15 100644 --- a/src/libbasic/src/Makefile +++ b/src/libbasic/src/Makefile @@ -245,5 +245,6 @@ $(outdir)/af-list.lo: $(call _inc,af-from-name.h af-to-name.h) $(outdir)/arphrd-list.lo: $(call _inc,arphrd-from-name.h arphrd-to-name.h) $(outdir)/cap-list.lo: $(call _inc,cap-from-name.h cap-to-name.h) $(outdir)/errno-list.lo: $(call _inc,errno-from-name.h errno-to-name.h) +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libbasic/src/MurmurHash2.c b/src/libbasic/src/MurmurHash2.c index 9020793930..7d43f18f61 100644 --- a/src/libbasic/src/MurmurHash2.c +++ b/src/libbasic/src/MurmurHash2.c @@ -13,7 +13,7 @@ // 2. It will not produce the same results on little-endian and big-endian // machines. -#include "MurmurHash2.h" +#include "basic/MurmurHash2.h" //----------------------------------------------------------------------------- // Platform-specific functions and macros diff --git a/src/libbasic/src/af-list.c b/src/libbasic/src/af-list.c index 3fac9c508b..1c75c926bb 100644 --- a/src/libbasic/src/af-list.c +++ b/src/libbasic/src/af-list.c @@ -20,13 +20,13 @@ #include <string.h> #include <sys/socket.h> -#include "af-list.h" -#include "macro.h" +#include "basic/af-list.h" +#include "basic/macro.h" static const struct af_name* lookup_af(register const char *str, register unsigned int len); -#include "af-from-name.h" -#include "af-to-name.h" +#include "basic/af-from-name.h" +#include "basic/af-to-name.h" const char *af_to_name(int id) { diff --git a/src/libbasic/src/alloc-util.c b/src/libbasic/src/alloc-util.c index b540dcddf5..4e88a3a3bc 100644 --- a/src/libbasic/src/alloc-util.c +++ b/src/libbasic/src/alloc-util.c @@ -20,9 +20,9 @@ #include <stdint.h> #include <string.h> -#include "alloc-util.h" -#include "macro.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/macro.h" +#include "basic/util.h" void* memdup(const void *p, size_t l) { void *r; diff --git a/src/libbasic/src/architecture.c b/src/libbasic/src/architecture.c index b1c8e91f50..22815f5353 100644 --- a/src/libbasic/src/architecture.c +++ b/src/libbasic/src/architecture.c @@ -19,10 +19,10 @@ #include <sys/utsname.h> -#include "architecture.h" -#include "macro.h" -#include "string-table.h" -#include "string-util.h" +#include "basic/architecture.h" +#include "basic/macro.h" +#include "basic/string-table.h" +#include "basic/string-util.h" int uname_architecture(void) { diff --git a/src/libbasic/src/arphrd-list.c b/src/libbasic/src/arphrd-list.c index 6792d1ee3f..649bd37456 100644 --- a/src/libbasic/src/arphrd-list.c +++ b/src/libbasic/src/arphrd-list.c @@ -20,13 +20,13 @@ #include <net/if_arp.h> #include <string.h> -#include "arphrd-list.h" -#include "macro.h" +#include "basic/arphrd-list.h" +#include "basic/macro.h" static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len); -#include "arphrd-from-name.h" -#include "arphrd-to-name.h" +#include "basic/arphrd-from-name.h" +#include "basic/arphrd-to-name.h" const char *arphrd_to_name(int id) { diff --git a/src/libbasic/src/async.c b/src/libbasic/src/async.c index a1f163f27b..0e2fce6850 100644 --- a/src/libbasic/src/async.c +++ b/src/libbasic/src/async.c @@ -22,11 +22,11 @@ #include <stddef.h> #include <unistd.h> -#include "async.h" -#include "fd-util.h" -#include "log.h" -#include "macro.h" -#include "util.h" +#include "basic/async.h" +#include "basic/fd-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/util.h" int asynchronous_job(void* (*func)(void *p), void *arg) { pthread_attr_t a; diff --git a/src/libbasic/src/audit-util.c b/src/libbasic/src/audit-util.c index 5741fecdd6..b27eff74c0 100644 --- a/src/libbasic/src/audit-util.c +++ b/src/libbasic/src/audit-util.c @@ -22,14 +22,14 @@ #include <stdio.h> #include <sys/socket.h> -#include "alloc-util.h" -#include "audit-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "macro.h" -#include "parse-util.h" -#include "process-util.h" -#include "user-util.h" +#include "basic/alloc-util.h" +#include "basic/audit-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/process-util.h" +#include "basic/user-util.h" int audit_session_from_pid(pid_t pid, uint32_t *id) { _cleanup_free_ char *s = NULL; diff --git a/src/libbasic/src/barrier.c b/src/libbasic/src/barrier.c index 2da633b311..ad685bb3c1 100644 --- a/src/libbasic/src/barrier.c +++ b/src/libbasic/src/barrier.c @@ -27,9 +27,9 @@ #include <sys/types.h> #include <unistd.h> -#include "barrier.h" -#include "fd-util.h" -#include "macro.h" +#include "basic/barrier.h" +#include "basic/fd-util.h" +#include "basic/macro.h" /** * Barriers diff --git a/src/libbasic/src/bitmap.c b/src/libbasic/src/bitmap.c index ad1fda0198..8645134022 100644 --- a/src/libbasic/src/bitmap.c +++ b/src/libbasic/src/bitmap.c @@ -23,10 +23,10 @@ #include <stdlib.h> #include <string.h> -#include "alloc-util.h" -#include "bitmap.h" -#include "hashmap.h" -#include "macro.h" +#include "basic/alloc-util.h" +#include "basic/bitmap.h" +#include "basic/hashmap.h" +#include "basic/macro.h" struct Bitmap { uint64_t *bitmaps; diff --git a/src/libbasic/src/btrfs-util.c b/src/libbasic/src/btrfs-util.c index 359d85f2e8..1bcac6d314 100644 --- a/src/libbasic/src/btrfs-util.c +++ b/src/libbasic/src/btrfs-util.c @@ -35,23 +35,23 @@ #include <linux/btrfs.h> #endif -#include "alloc-util.h" -#include "btrfs-ctree.h" -#include "btrfs-util.h" -#include "copy.h" -#include "fd-util.h" -#include "fileio.h" -#include "io-util.h" -#include "macro.h" -#include "missing.h" -#include "path-util.h" -#include "selinux-util.h" -#include "smack-util.h" -#include "sparse-endian.h" -#include "stat-util.h" -#include "string-util.h" -#include "time-util.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/btrfs-ctree.h" +#include "basic/btrfs-util.h" +#include "basic/copy.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/io-util.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/path-util.h" +#include "basic/selinux-util.h" +#include "basic/smack-util.h" +#include "basic/sparse-endian.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" +#include "basic/time-util.h" +#include "basic/util.h" /* WARNING: Be careful with file system ioctls! When we get an fd, we * need to make sure it either refers to only a regular file or diff --git a/src/libbasic/src/bus-label.c b/src/libbasic/src/bus-label.c index d4531c7947..a7fd5a227e 100644 --- a/src/libbasic/src/bus-label.c +++ b/src/libbasic/src/bus-label.c @@ -19,10 +19,10 @@ #include <stdlib.h> -#include "alloc-util.h" -#include "bus-label.h" -#include "hexdecoct.h" -#include "macro.h" +#include "basic/alloc-util.h" +#include "basic/bus-label.h" +#include "basic/hexdecoct.h" +#include "basic/macro.h" char *bus_label_escape(const char *s) { char *r, *t; diff --git a/src/libbasic/src/calendarspec.c b/src/libbasic/src/calendarspec.c index 6e0bab9b94..a70eb078c6 100644 --- a/src/libbasic/src/calendarspec.c +++ b/src/libbasic/src/calendarspec.c @@ -25,12 +25,12 @@ #include <string.h> #include <time.h> -#include "alloc-util.h" -#include "calendarspec.h" -#include "fileio.h" -#include "macro.h" -#include "parse-util.h" -#include "string-util.h" +#include "basic/alloc-util.h" +#include "basic/calendarspec.h" +#include "basic/fileio.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/string-util.h" #define BITS_WEEKDAYS 127 diff --git a/src/libbasic/src/cap-list.c b/src/libbasic/src/cap-list.c index 3e773a06f5..22fc8b9b31 100644 --- a/src/libbasic/src/cap-list.c +++ b/src/libbasic/src/cap-list.c @@ -20,16 +20,16 @@ #include <errno.h> #include <string.h> -#include "cap-list.h" -#include "macro.h" -#include "missing.h" -#include "parse-util.h" -#include "util.h" +#include "basic/cap-list.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/parse-util.h" +#include "basic/util.h" static const struct capability_name* lookup_capability(register const char *str, register unsigned int len); -#include "cap-from-name.h" -#include "cap-to-name.h" +#include "basic/cap-from-name.h" +#include "basic/cap-to-name.h" const char *capability_to_name(int id) { diff --git a/src/libbasic/src/capability-util.c b/src/libbasic/src/capability-util.c index d4c5bd6937..6c35ad09e5 100644 --- a/src/libbasic/src/capability-util.c +++ b/src/libbasic/src/capability-util.c @@ -25,13 +25,13 @@ #include <sys/prctl.h> #include <unistd.h> -#include "alloc-util.h" -#include "capability-util.h" -#include "fileio.h" -#include "log.h" -#include "macro.h" -#include "parse-util.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/capability-util.h" +#include "basic/fileio.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/util.h" int have_effective_cap(int value) { _cleanup_cap_free_ cap_t cap; diff --git a/src/libbasic/src/cgroup-util.c b/src/libbasic/src/cgroup-util.c index 7cdc97ee3c..68c8aae540 100644 --- a/src/libbasic/src/cgroup-util.c +++ b/src/libbasic/src/cgroup-util.c @@ -30,32 +30,32 @@ #include <sys/types.h> #include <unistd.h> -#include "alloc-util.h" -#include "cgroup-util.h" -#include "def.h" -#include "dirent-util.h" -#include "extract-word.h" -#include "fd-util.h" -#include "fileio.h" -#include "formats-util.h" -#include "fs-util.h" -#include "log.h" -#include "login-util.h" -#include "macro.h" -#include "missing.h" -#include "mkdir.h" -#include "parse-util.h" -#include "path-util.h" -#include "proc-cmdline.h" -#include "process-util.h" -#include "set.h" -#include "special.h" -#include "stat-util.h" -#include "stdio-util.h" -#include "string-table.h" -#include "string-util.h" -#include "unit-name.h" -#include "user-util.h" +#include "basic/alloc-util.h" +#include "basic/cgroup-util.h" +#include "basic/def.h" +#include "basic/dirent-util.h" +#include "basic/extract-word.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/formats-util.h" +#include "basic/fs-util.h" +#include "basic/log.h" +#include "basic/login-util.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/proc-cmdline.h" +#include "basic/process-util.h" +#include "basic/set.h" +#include "basic/special.h" +#include "basic/stat-util.h" +#include "basic/stdio-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/unit-name.h" +#include "basic/user-util.h" int cg_enumerate_processes(const char *controller, const char *path, FILE **_f) { _cleanup_free_ char *fs = NULL; diff --git a/src/libbasic/src/chattr-util.c b/src/libbasic/src/chattr-util.c index 2896a729af..a227ce6b05 100644 --- a/src/libbasic/src/chattr-util.c +++ b/src/libbasic/src/chattr-util.c @@ -23,9 +23,9 @@ #include <sys/stat.h> #include <linux/fs.h> -#include "chattr-util.h" -#include "fd-util.h" -#include "macro.h" +#include "basic/chattr-util.h" +#include "basic/fd-util.h" +#include "basic/macro.h" int chattr_fd(int fd, unsigned value, unsigned mask) { unsigned old_attr, new_attr; diff --git a/src/libbasic/src/clock-util.c b/src/libbasic/src/clock-util.c index 7fe8d35ea5..a6d43803a1 100644 --- a/src/libbasic/src/clock-util.c +++ b/src/libbasic/src/clock-util.c @@ -27,11 +27,11 @@ #include <sys/ioctl.h> #include <sys/time.h> -#include "clock-util.h" -#include "fd-util.h" -#include "macro.h" -#include "string-util.h" -#include "util.h" +#include "basic/clock-util.h" +#include "basic/fd-util.h" +#include "basic/macro.h" +#include "basic/string-util.h" +#include "basic/util.h" int clock_get_hwclock(struct tm *tm) { _cleanup_close_ int fd = -1; diff --git a/src/libbasic/src/conf-files.c b/src/libbasic/src/conf-files.c index c781610e14..2bb794e256 100644 --- a/src/libbasic/src/conf-files.c +++ b/src/libbasic/src/conf-files.c @@ -24,17 +24,17 @@ #include <stdlib.h> #include <string.h> -#include "conf-files.h" -#include "dirent-util.h" -#include "fd-util.h" -#include "hashmap.h" -#include "log.h" -#include "macro.h" -#include "missing.h" -#include "path-util.h" -#include "string-util.h" -#include "strv.h" -#include "util.h" +#include "basic/conf-files.h" +#include "basic/dirent-util.h" +#include "basic/fd-util.h" +#include "basic/hashmap.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/path-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/util.h" static int files_add(Hashmap *h, const char *root, const char *path, const char *suffix) { _cleanup_closedir_ DIR *dir = NULL; diff --git a/src/libbasic/src/copy.c b/src/libbasic/src/copy.c index c3586728d0..4053ac9c16 100644 --- a/src/libbasic/src/copy.c +++ b/src/libbasic/src/copy.c @@ -30,22 +30,22 @@ #include <time.h> #include <unistd.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 "fileio.h" -#include "fs-util.h" -#include "io-util.h" -#include "macro.h" -#include "missing.h" -#include "string-util.h" -#include "strv.h" -#include "time-util.h" -#include "umask-util.h" -#include "xattr-util.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/fileio.h" +#include "basic/fs-util.h" +#include "basic/io-util.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/time-util.h" +#include "basic/umask-util.h" +#include "basic/xattr-util.h" #define COPY_BUFFER_SIZE (16*1024u) diff --git a/src/libbasic/src/cpu-set-util.c b/src/libbasic/src/cpu-set-util.c index 95ed6928ff..89e012d6e2 100644 --- a/src/libbasic/src/cpu-set-util.c +++ b/src/libbasic/src/cpu-set-util.c @@ -22,13 +22,13 @@ #include <stddef.h> #include <syslog.h> -#include "alloc-util.h" -#include "cpu-set-util.h" -#include "extract-word.h" -#include "log.h" -#include "macro.h" -#include "parse-util.h" -#include "string-util.h" +#include "basic/alloc-util.h" +#include "basic/cpu-set-util.h" +#include "basic/extract-word.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/string-util.h" cpu_set_t* cpu_set_malloc(unsigned *ncpus) { cpu_set_t *c; diff --git a/src/libbasic/src/device-nodes.c b/src/libbasic/src/device-nodes.c index 38c0628a90..e5b2eb637c 100644 --- a/src/libbasic/src/device-nodes.c +++ b/src/libbasic/src/device-nodes.c @@ -21,8 +21,8 @@ #include <stdio.h> #include <string.h> -#include "device-nodes.h" -#include "utf8.h" +#include "basic/device-nodes.h" +#include "basic/utf8.h" int whitelisted_char_for_devnode(char c, const char *white) { diff --git a/src/libbasic/src/dirent-util.c b/src/libbasic/src/dirent-util.c index 59067121b7..5bc740b189 100644 --- a/src/libbasic/src/dirent-util.c +++ b/src/libbasic/src/dirent-util.c @@ -20,9 +20,9 @@ #include <fcntl.h> #include <sys/stat.h> -#include "dirent-util.h" -#include "path-util.h" -#include "string-util.h" +#include "basic/dirent-util.h" +#include "basic/path-util.h" +#include "basic/string-util.h" int dirent_ensure_type(DIR *d, struct dirent *de) { struct stat st; diff --git a/src/libbasic/src/env-util.c b/src/libbasic/src/env-util.c index 7f5fddb700..67d8261c87 100644 --- a/src/libbasic/src/env-util.c +++ b/src/libbasic/src/env-util.c @@ -24,14 +24,14 @@ #include <string.h> #include <unistd.h> -#include "alloc-util.h" -#include "env-util.h" -#include "extract-word.h" -#include "macro.h" -#include "parse-util.h" -#include "string-util.h" -#include "strv.h" -#include "utf8.h" +#include "basic/alloc-util.h" +#include "basic/env-util.h" +#include "basic/extract-word.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/utf8.h" #define VALID_CHARS_ENV_NAME \ DIGITS LETTERS \ diff --git a/src/libbasic/src/errno-list.c b/src/libbasic/src/errno-list.c index 31b66bad5e..a40c4efc2e 100644 --- a/src/libbasic/src/errno-list.c +++ b/src/libbasic/src/errno-list.c @@ -19,14 +19,14 @@ #include <string.h> -#include "errno-list.h" -#include "macro.h" +#include "basic/errno-list.h" +#include "basic/macro.h" static const struct errno_name* lookup_errno(register const char *str, register unsigned int len); -#include "errno-from-name.h" -#include "errno-to-name.h" +#include "basic/errno-from-name.h" +#include "basic/errno-to-name.h" const char *errno_to_name(int id) { diff --git a/src/libbasic/src/escape.c b/src/libbasic/src/escape.c index 01daf11ce7..609b68ae53 100644 --- a/src/libbasic/src/escape.c +++ b/src/libbasic/src/escape.c @@ -21,11 +21,11 @@ #include <stdlib.h> #include <string.h> -#include "alloc-util.h" -#include "escape.h" -#include "hexdecoct.h" -#include "macro.h" -#include "utf8.h" +#include "basic/alloc-util.h" +#include "basic/escape.h" +#include "basic/hexdecoct.h" +#include "basic/macro.h" +#include "basic/utf8.h" size_t cescape_char(char c, char *buf) { char * buf_old = buf; diff --git a/src/libbasic/src/ether-addr-util.c b/src/libbasic/src/ether-addr-util.c index 5697e8d132..933b7c9dc7 100644 --- a/src/libbasic/src/ether-addr-util.c +++ b/src/libbasic/src/ether-addr-util.c @@ -21,9 +21,9 @@ #include <stdio.h> #include <sys/types.h> -#include "ether-addr-util.h" -#include "macro.h" -#include "string-util.h" +#include "basic/ether-addr-util.h" +#include "basic/macro.h" +#include "basic/string-util.h" char* ether_addr_to_string(const struct ether_addr *addr, char buffer[ETHER_ADDR_TO_STRING_MAX]) { assert(addr); diff --git a/src/libbasic/src/exit-status.c b/src/libbasic/src/exit-status.c index 92fa5ace61..c7af63e052 100644 --- a/src/libbasic/src/exit-status.c +++ b/src/libbasic/src/exit-status.c @@ -20,9 +20,9 @@ #include <signal.h> #include <stdlib.h> -#include "exit-status.h" -#include "macro.h" -#include "set.h" +#include "basic/exit-status.h" +#include "basic/macro.h" +#include "basic/set.h" const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) { diff --git a/src/libbasic/src/extract-word.c b/src/libbasic/src/extract-word.c index d6c1228463..c38a815592 100644 --- a/src/libbasic/src/extract-word.c +++ b/src/libbasic/src/extract-word.c @@ -26,13 +26,13 @@ #include <string.h> #include <syslog.h> -#include "alloc-util.h" -#include "escape.h" -#include "extract-word.h" -#include "log.h" -#include "macro.h" -#include "string-util.h" -#include "utf8.h" +#include "basic/alloc-util.h" +#include "basic/escape.h" +#include "basic/extract-word.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/string-util.h" +#include "basic/utf8.h" int extract_first_word(const char **p, char **ret, const char *separators, ExtractFlags flags) { _cleanup_free_ char *s = NULL; diff --git a/src/libbasic/src/fd-util.c b/src/libbasic/src/fd-util.c index 8b466cff15..277a4c1075 100644 --- a/src/libbasic/src/fd-util.c +++ b/src/libbasic/src/fd-util.c @@ -24,15 +24,15 @@ #include <sys/stat.h> #include <unistd.h> -#include "fd-util.h" -#include "fs-util.h" -#include "macro.h" -#include "missing.h" -#include "parse-util.h" -#include "path-util.h" -#include "socket-util.h" -#include "stdio-util.h" -#include "util.h" +#include "basic/fd-util.h" +#include "basic/fs-util.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/socket-util.h" +#include "basic/stdio-util.h" +#include "basic/util.h" int close_nointr(int fd) { assert(fd >= 0); diff --git a/src/libbasic/src/fdset.c b/src/libbasic/src/fdset.c index b52bf1ad05..71e920d08e 100644 --- a/src/libbasic/src/fdset.c +++ b/src/libbasic/src/fdset.c @@ -25,13 +25,13 @@ #include <systemd/sd-daemon.h> -#include "fd-util.h" -#include "fdset.h" -#include "log.h" -#include "macro.h" -#include "parse-util.h" -#include "path-util.h" -#include "set.h" +#include "basic/fd-util.h" +#include "basic/fdset.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/set.h" #define MAKE_SET(s) ((Set*) s) #define MAKE_FDSET(s) ((FDSet*) s) diff --git a/src/libbasic/src/fileio-label.c b/src/libbasic/src/fileio-label.c index 66dbc0fe1e..3e0cab1b38 100644 --- a/src/libbasic/src/fileio-label.c +++ b/src/libbasic/src/fileio-label.c @@ -20,9 +20,9 @@ #include <sys/stat.h> -#include "fileio-label.h" -#include "fileio.h" -#include "selinux-util.h" +#include "basic/fileio-label.h" +#include "basic/fileio.h" +#include "basic/selinux-util.h" int write_string_file_atomic_label(const char *fn, const char *line) { int r; diff --git a/src/libbasic/src/fileio.c b/src/libbasic/src/fileio.c index 29f5374222..358477cebe 100644 --- a/src/libbasic/src/fileio.c +++ b/src/libbasic/src/fileio.c @@ -28,24 +28,24 @@ #include <sys/types.h> #include <unistd.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "ctype.h" -#include "escape.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "hexdecoct.h" -#include "log.h" -#include "macro.h" -#include "parse-util.h" -#include "path-util.h" -#include "random-util.h" -#include "stdio-util.h" -#include "string-util.h" -#include "strv.h" -#include "time-util.h" -#include "umask-util.h" -#include "utf8.h" +#include "basic/escape.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/fs-util.h" +#include "basic/hexdecoct.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/random-util.h" +#include "basic/stdio-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/time-util.h" +#include "basic/umask-util.h" +#include "basic/utf8.h" int write_string_stream(FILE *f, const char *line, bool enforce_newline) { diff --git a/src/libbasic/src/fs-util.c b/src/libbasic/src/fs-util.c index e24e7036f7..03b06fd2d8 100644 --- a/src/libbasic/src/fs-util.c +++ b/src/libbasic/src/fs-util.c @@ -27,23 +27,23 @@ #include <time.h> #include <unistd.h> -#include "alloc-util.h" -#include "dirent-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "log.h" -#include "macro.h" -#include "missing.h" -#include "mkdir.h" -#include "parse-util.h" -#include "path-util.h" -#include "stdio-util.h" -#include "string-util.h" -#include "strv.h" -#include "time-util.h" -#include "user-util.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/dirent-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/fs-util.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/stdio-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/time-util.h" +#include "basic/user-util.h" +#include "basic/util.h" int unlink_noerrno(const char *path) { PROTECT_ERRNO; diff --git a/src/libbasic/src/glob-util.c b/src/libbasic/src/glob-util.c index 007198c269..8762a59bd9 100644 --- a/src/libbasic/src/glob-util.c +++ b/src/libbasic/src/glob-util.c @@ -20,9 +20,9 @@ #include <errno.h> #include <glob.h> -#include "glob-util.h" -#include "macro.h" -#include "strv.h" +#include "basic/glob-util.h" +#include "basic/macro.h" +#include "basic/strv.h" int glob_exists(const char *path) { _cleanup_globfree_ glob_t g = {}; diff --git a/src/libbasic/src/gunicode.c b/src/libbasic/src/gunicode.c index 542110503f..4862021fbb 100644 --- a/src/libbasic/src/gunicode.c +++ b/src/libbasic/src/gunicode.c @@ -6,7 +6,7 @@ #include <stdlib.h> -#include "gunicode.h" +#include "basic/gunicode.h" #define unichar uint32_t diff --git a/src/libbasic/src/hash-funcs.c b/src/libbasic/src/hash-funcs.c index c3a4a011b5..e82a342063 100644 --- a/src/libbasic/src/hash-funcs.c +++ b/src/libbasic/src/hash-funcs.c @@ -18,7 +18,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "hash-funcs.h" +#include "basic/hash-funcs.h" void string_hash_func(const void *p, struct siphash *state) { siphash24_compress(p, strlen(p) + 1, state); diff --git a/src/libbasic/src/hashmap.c b/src/libbasic/src/hashmap.c index 49a0479592..0b744c525a 100644 --- a/src/libbasic/src/hashmap.c +++ b/src/libbasic/src/hashmap.c @@ -23,20 +23,20 @@ #include <stdlib.h> #include <string.h> -#include "alloc-util.h" -#include "hashmap.h" -#include "macro.h" -#include "mempool.h" -#include "process-util.h" -#include "random-util.h" -#include "set.h" -#include "siphash24.h" -#include "strv.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/hashmap.h" +#include "basic/macro.h" +#include "basic/mempool.h" +#include "basic/process-util.h" +#include "basic/random-util.h" +#include "basic/set.h" +#include "basic/siphash24.h" +#include "basic/strv.h" +#include "basic/util.h" #ifdef ENABLE_DEBUG_HASHMAP #include <pthread.h> -#include "list.h" +#include "basic/list.h" #endif /* diff --git a/src/libbasic/src/hexdecoct.c b/src/libbasic/src/hexdecoct.c index c5bda6c4d6..060a95b616 100644 --- a/src/libbasic/src/hexdecoct.c +++ b/src/libbasic/src/hexdecoct.c @@ -22,10 +22,10 @@ #include <stdint.h> #include <stdlib.h> -#include "alloc-util.h" -#include "hexdecoct.h" -#include "macro.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/hexdecoct.h" +#include "basic/macro.h" +#include "basic/util.h" char octchar(int x) { return '0' + (x & 7); diff --git a/src/libbasic/src/hostname-util.c b/src/libbasic/src/hostname-util.c index 13c3bb6446..e66f9a2250 100644 --- a/src/libbasic/src/hostname-util.c +++ b/src/libbasic/src/hostname-util.c @@ -24,11 +24,11 @@ #include <sys/utsname.h> #include <unistd.h> -#include "fd-util.h" -#include "fileio.h" -#include "hostname-util.h" -#include "macro.h" -#include "string-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/hostname-util.h" +#include "basic/macro.h" +#include "basic/string-util.h" bool hostname_is_set(void) { struct utsname u; diff --git a/src/libbasic/src/in-addr-util.c b/src/libbasic/src/in-addr-util.c index 245107ebb8..7d648ce354 100644 --- a/src/libbasic/src/in-addr-util.c +++ b/src/libbasic/src/in-addr-util.c @@ -23,10 +23,10 @@ #include <stdint.h> #include <stdlib.h> -#include "alloc-util.h" -#include "in-addr-util.h" -#include "macro.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/in-addr-util.h" +#include "basic/macro.h" +#include "basic/util.h" int in_addr_is_null(int family, const union in_addr_union *u) { assert(u); diff --git a/src/libbasic/src/io-util.c b/src/libbasic/src/io-util.c index cc6dfa8c1b..800a7044f6 100644 --- a/src/libbasic/src/io-util.c +++ b/src/libbasic/src/io-util.c @@ -24,8 +24,8 @@ #include <time.h> #include <unistd.h> -#include "io-util.h" -#include "time-util.h" +#include "basic/io-util.h" +#include "basic/time-util.h" int flush_fd(int fd) { struct pollfd pollfd = { diff --git a/src/libbasic/src/label.c b/src/libbasic/src/label.c index f5ab855d32..cea374198a 100644 --- a/src/libbasic/src/label.c +++ b/src/libbasic/src/label.c @@ -21,10 +21,10 @@ #include <sys/stat.h> #include <unistd.h> -#include "label.h" -#include "macro.h" -#include "selinux-util.h" -#include "smack-util.h" +#include "basic/label.h" +#include "basic/macro.h" +#include "basic/selinux-util.h" +#include "basic/smack-util.h" int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) { int r, q; diff --git a/src/libbasic/src/locale-util.c b/src/libbasic/src/locale-util.c index ada0a28cd8..7cedaae319 100644 --- a/src/libbasic/src/locale-util.c +++ b/src/libbasic/src/locale-util.c @@ -30,16 +30,16 @@ #include <sys/mman.h> #include <sys/stat.h> -#include "dirent-util.h" -#include "fd-util.h" -#include "hashmap.h" -#include "locale-util.h" -#include "path-util.h" -#include "set.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "utf8.h" +#include "basic/dirent-util.h" +#include "basic/fd-util.h" +#include "basic/hashmap.h" +#include "basic/locale-util.h" +#include "basic/path-util.h" +#include "basic/set.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/utf8.h" static int add_locales_from_archive(Set *locales) { /* Stolen from glibc... */ diff --git a/src/libbasic/src/lockfile-util.c b/src/libbasic/src/lockfile-util.c index 3ee4191e4d..233627c1a4 100644 --- a/src/libbasic/src/lockfile-util.c +++ b/src/libbasic/src/lockfile-util.c @@ -24,12 +24,12 @@ #include <sys/file.h> #include <sys/stat.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "fs-util.h" -#include "lockfile-util.h" -#include "macro.h" -#include "path-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/fs-util.h" +#include "basic/lockfile-util.h" +#include "basic/macro.h" +#include "basic/path-util.h" int make_lock_file(const char *p, int operation, LockFile *ret) { _cleanup_close_ int fd = -1; diff --git a/src/libbasic/src/log.c b/src/libbasic/src/log.c index 05c4896f55..6028cc7a27 100644 --- a/src/libbasic/src/log.c +++ b/src/libbasic/src/log.c @@ -35,25 +35,25 @@ #include <systemd/sd-messages.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "formats-util.h" -#include "io-util.h" -#include "log.h" -#include "macro.h" -#include "missing.h" -#include "parse-util.h" -#include "proc-cmdline.h" -#include "process-util.h" -#include "signal-util.h" -#include "socket-util.h" -#include "stdio-util.h" -#include "string-table.h" -#include "string-util.h" -#include "syslog-util.h" -#include "terminal-util.h" -#include "time-util.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.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/parse-util.h" +#include "basic/proc-cmdline.h" +#include "basic/process-util.h" +#include "basic/signal-util.h" +#include "basic/socket-util.h" +#include "basic/stdio-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/syslog-util.h" +#include "basic/terminal-util.h" +#include "basic/time-util.h" +#include "basic/util.h" #define SNDBUF_SIZE (8*1024*1024) diff --git a/src/libbasic/src/login-util.c b/src/libbasic/src/login-util.c index 339e94f12d..fe97f66392 100644 --- a/src/libbasic/src/login-util.c +++ b/src/libbasic/src/login-util.c @@ -19,8 +19,8 @@ #include <string.h> -#include "login-util.h" -#include "string-util.h" +#include "basic/login-util.h" +#include "basic/string-util.h" bool session_id_valid(const char *id) { diff --git a/src/libbasic/src/memfd-util.c b/src/libbasic/src/memfd-util.c index 8c8cc78ebf..810dd37ee7 100644 --- a/src/libbasic/src/memfd-util.c +++ b/src/libbasic/src/memfd-util.c @@ -28,13 +28,13 @@ #include <sys/mman.h> #include <sys/prctl.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "macro.h" -#include "memfd-util.h" -#include "missing.h" -#include "string-util.h" -#include "utf8.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/macro.h" +#include "basic/memfd-util.h" +#include "basic/missing.h" +#include "basic/string-util.h" +#include "basic/utf8.h" int memfd_new(const char *name) { _cleanup_free_ char *g = NULL; diff --git a/src/libbasic/src/mempool.c b/src/libbasic/src/mempool.c index f95e2beb0f..0a64c1b29c 100644 --- a/src/libbasic/src/mempool.c +++ b/src/libbasic/src/mempool.c @@ -21,9 +21,9 @@ #include <stdint.h> #include <stdlib.h> -#include "macro.h" -#include "mempool.h" -#include "util.h" +#include "basic/macro.h" +#include "basic/mempool.h" +#include "basic/util.h" struct pool { struct pool *next; diff --git a/src/libbasic/src/mkdir-label.c b/src/libbasic/src/mkdir-label.c index aa6878cdf0..83a1e925c6 100644 --- a/src/libbasic/src/mkdir-label.c +++ b/src/libbasic/src/mkdir-label.c @@ -22,8 +22,8 @@ #include <sys/types.h> #include <unistd.h> -#include "label.h" -#include "mkdir.h" +#include "basic/label.h" +#include "basic/mkdir.h" int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid) { return mkdir_safe_internal(path, mode, uid, gid, mkdir_label); diff --git a/src/libbasic/src/mkdir.c b/src/libbasic/src/mkdir.c index 6b1a98402c..0a7f432f3e 100644 --- a/src/libbasic/src/mkdir.c +++ b/src/libbasic/src/mkdir.c @@ -22,12 +22,12 @@ #include <string.h> #include <sys/stat.h> -#include "fs-util.h" -#include "macro.h" -#include "mkdir.h" -#include "path-util.h" -#include "stat-util.h" -#include "user-util.h" +#include "basic/fs-util.h" +#include "basic/macro.h" +#include "basic/mkdir.h" +#include "basic/path-util.h" +#include "basic/stat-util.h" +#include "basic/user-util.h" int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, mkdir_func_t _mkdir) { struct stat st; diff --git a/src/libbasic/src/mount-util.c b/src/libbasic/src/mount-util.c index ba698959b7..274ec9d29c 100644 --- a/src/libbasic/src/mount-util.c +++ b/src/libbasic/src/mount-util.c @@ -25,17 +25,17 @@ #include <sys/statvfs.h> #include <unistd.h> -#include "alloc-util.h" -#include "escape.h" -#include "fd-util.h" -#include "fileio.h" -#include "hashmap.h" -#include "mount-util.h" -#include "parse-util.h" -#include "path-util.h" -#include "set.h" -#include "stdio-util.h" -#include "string-util.h" +#include "basic/alloc-util.h" +#include "basic/escape.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/hashmap.h" +#include "basic/mount-util.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/set.h" +#include "basic/stdio-util.h" +#include "basic/string-util.h" static int fd_fdinfo_mnt_id(int fd, const char *filename, int flags, int *mnt_id) { char path[strlen("/proc/self/fdinfo/") + DECIMAL_STR_MAX(int)]; diff --git a/src/libbasic/src/ordered-set.c b/src/libbasic/src/ordered-set.c index 2e0bdf6488..fc6c3c018c 100644 --- a/src/libbasic/src/ordered-set.c +++ b/src/libbasic/src/ordered-set.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "ordered-set.h" -#include "strv.h" +#include "basic/ordered-set.h" +#include "basic/strv.h" int ordered_set_consume(OrderedSet *s, void *p) { int r; diff --git a/src/libbasic/src/parse-util.c b/src/libbasic/src/parse-util.c index 6c11b605a9..b6a99c7cdb 100644 --- a/src/libbasic/src/parse-util.c +++ b/src/libbasic/src/parse-util.c @@ -25,11 +25,11 @@ #include <string.h> #include <xlocale.h> -#include "alloc-util.h" -#include "extract-word.h" -#include "macro.h" -#include "parse-util.h" -#include "string-util.h" +#include "basic/alloc-util.h" +#include "basic/extract-word.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/string-util.h" int parse_boolean(const char *v) { assert(v); diff --git a/src/libbasic/src/path-util.c b/src/libbasic/src/path-util.c index b2fa81a294..143380dec2 100644 --- a/src/libbasic/src/path-util.c +++ b/src/libbasic/src/path-util.c @@ -31,17 +31,17 @@ #include <libgen.h> #undef basename -#include "alloc-util.h" -#include "extract-word.h" -#include "fs-util.h" -#include "log.h" -#include "macro.h" -#include "missing.h" -#include "path-util.h" -#include "stat-util.h" -#include "string-util.h" -#include "strv.h" -#include "time-util.h" +#include "basic/alloc-util.h" +#include "basic/extract-word.h" +#include "basic/fs-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/path-util.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/time-util.h" bool path_is_absolute(const char *p) { return p[0] == '/'; diff --git a/src/libbasic/src/prioq.c b/src/libbasic/src/prioq.c index d2ec516d29..f29c80b5fc 100644 --- a/src/libbasic/src/prioq.c +++ b/src/libbasic/src/prioq.c @@ -30,9 +30,9 @@ #include <errno.h> #include <stdlib.h> -#include "alloc-util.h" -#include "hashmap.h" -#include "prioq.h" +#include "basic/alloc-util.h" +#include "basic/hashmap.h" +#include "basic/prioq.h" struct prioq_item { void *data; diff --git a/src/libbasic/src/proc-cmdline.c b/src/libbasic/src/proc-cmdline.c index 3505fa9c9a..e35a21ac0d 100644 --- a/src/libbasic/src/proc-cmdline.c +++ b/src/libbasic/src/proc-cmdline.c @@ -21,17 +21,17 @@ #include <stddef.h> #include <string.h> -#include "alloc-util.h" -#include "extract-word.h" -#include "fileio.h" -#include "macro.h" -#include "parse-util.h" -#include "proc-cmdline.h" -#include "process-util.h" -#include "special.h" -#include "string-util.h" -#include "util.h" -#include "virt.h" +#include "basic/alloc-util.h" +#include "basic/extract-word.h" +#include "basic/fileio.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/proc-cmdline.h" +#include "basic/process-util.h" +#include "basic/special.h" +#include "basic/string-util.h" +#include "basic/util.h" +#include "basic/virt.h" int proc_cmdline(char **ret) { assert(ret); diff --git a/src/libbasic/src/process-util.c b/src/libbasic/src/process-util.c index 1ad8816206..44ac8794dc 100644 --- a/src/libbasic/src/process-util.c +++ b/src/libbasic/src/process-util.c @@ -37,23 +37,23 @@ #include <valgrind/valgrind.h> #endif -#include "alloc-util.h" -#include "architecture.h" -#include "escape.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "ioprio.h" -#include "log.h" -#include "macro.h" -#include "missing.h" -#include "process-util.h" -#include "signal-util.h" -#include "stat-util.h" -#include "string-table.h" -#include "string-util.h" -#include "user-util.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/architecture.h" +#include "basic/escape.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/fs-util.h" +#include "basic/ioprio.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/process-util.h" +#include "basic/signal-util.h" +#include "basic/stat-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/user-util.h" +#include "basic/util.h" int get_process_state(pid_t pid) { const char *p; diff --git a/src/libbasic/src/random-util.c b/src/libbasic/src/random-util.c index 2f468db770..6c903cbb9a 100644 --- a/src/libbasic/src/random-util.c +++ b/src/libbasic/src/random-util.c @@ -30,11 +30,11 @@ #include <sys/auxv.h> #endif -#include "fd-util.h" -#include "io-util.h" -#include "missing.h" -#include "random-util.h" -#include "time-util.h" +#include "basic/fd-util.h" +#include "basic/io-util.h" +#include "basic/missing.h" +#include "basic/random-util.h" +#include "basic/time-util.h" int dev_urandom(void *p, size_t n) { static int have_syscall = -1; diff --git a/src/libbasic/src/ratelimit.c b/src/libbasic/src/ratelimit.c index 3ca5625e4d..366aeb6d9a 100644 --- a/src/libbasic/src/ratelimit.c +++ b/src/libbasic/src/ratelimit.c @@ -20,8 +20,8 @@ #include <sys/time.h> -#include "macro.h" -#include "ratelimit.h" +#include "basic/macro.h" +#include "basic/ratelimit.h" /* Modelled after Linux' lib/ratelimit.c by Dave Young * <hidave.darkstar@gmail.com>, which is licensed GPLv2. */ diff --git a/src/libbasic/src/replace-var.c b/src/libbasic/src/replace-var.c index 6a204b9ec3..50e60221ad 100644 --- a/src/libbasic/src/replace-var.c +++ b/src/libbasic/src/replace-var.c @@ -22,10 +22,10 @@ #include <stdlib.h> #include <string.h> -#include "alloc-util.h" -#include "macro.h" -#include "replace-var.h" -#include "string-util.h" +#include "basic/alloc-util.h" +#include "basic/macro.h" +#include "basic/replace-var.h" +#include "basic/string-util.h" /* * Generic infrastructure for replacing @FOO@ style variables in diff --git a/src/libbasic/src/rlimit-util.c b/src/libbasic/src/rlimit-util.c index ee063720ed..3a8196d9c1 100644 --- a/src/libbasic/src/rlimit-util.c +++ b/src/libbasic/src/rlimit-util.c @@ -20,14 +20,14 @@ #include <errno.h> #include <sys/resource.h> -#include "alloc-util.h" -#include "extract-word.h" -#include "formats-util.h" -#include "macro.h" -#include "missing.h" -#include "rlimit-util.h" -#include "string-table.h" -#include "time-util.h" +#include "basic/alloc-util.h" +#include "basic/extract-word.h" +#include "basic/formats-util.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/rlimit-util.h" +#include "basic/string-table.h" +#include "basic/time-util.h" int setrlimit_closest(int resource, const struct rlimit *rlim) { struct rlimit highest, fixed; diff --git a/src/libbasic/src/rm-rf.c b/src/libbasic/src/rm-rf.c index 43816fd1bb..b05b512aee 100644 --- a/src/libbasic/src/rm-rf.c +++ b/src/libbasic/src/rm-rf.c @@ -26,15 +26,15 @@ #include <sys/statfs.h> #include <unistd.h> -#include "btrfs-util.h" -#include "fd-util.h" -#include "log.h" -#include "macro.h" -#include "mount-util.h" -#include "path-util.h" -#include "rm-rf.h" -#include "stat-util.h" -#include "string-util.h" +#include "basic/btrfs-util.h" +#include "basic/fd-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/mount-util.h" +#include "basic/path-util.h" +#include "basic/rm-rf.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev) { _cleanup_closedir_ DIR *d = NULL; diff --git a/src/libbasic/src/selinux-util.c b/src/libbasic/src/selinux-util.c index 10c2f39369..34d2dcdccf 100644 --- a/src/libbasic/src/selinux-util.c +++ b/src/libbasic/src/selinux-util.c @@ -32,13 +32,13 @@ #include <selinux/selinux.h> #endif -#include "alloc-util.h" -#include "log.h" -#include "macro.h" -#include "path-util.h" -#include "selinux-util.h" -#include "time-util.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/path-util.h" +#include "basic/selinux-util.h" +#include "basic/time-util.h" +#include "basic/util.h" #ifdef HAVE_SELINUX DEFINE_TRIVIAL_CLEANUP_FUNC(security_context_t, freecon); diff --git a/src/libbasic/src/sigbus.c b/src/libbasic/src/sigbus.c index 0ce4f75684..7249f812d7 100644 --- a/src/libbasic/src/sigbus.c +++ b/src/libbasic/src/sigbus.c @@ -22,9 +22,9 @@ #include <stddef.h> #include <sys/mman.h> -#include "macro.h" -#include "sigbus.h" -#include "util.h" +#include "basic/macro.h" +#include "basic/sigbus.h" +#include "basic/util.h" #define SIGBUS_QUEUE_MAX 64 diff --git a/src/libbasic/src/signal-util.c b/src/libbasic/src/signal-util.c index 280b5c3251..ade7bff364 100644 --- a/src/libbasic/src/signal-util.c +++ b/src/libbasic/src/signal-util.c @@ -21,12 +21,12 @@ #include <stdarg.h> #include <stdio.h> -#include "macro.h" -#include "parse-util.h" -#include "signal-util.h" -#include "stdio-util.h" -#include "string-table.h" -#include "string-util.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/signal-util.h" +#include "basic/stdio-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" int reset_all_signal_handlers(void) { static const struct sigaction sa = { diff --git a/src/libbasic/src/siphash24.c b/src/libbasic/src/siphash24.c index 060e8ba387..8fbc05b435 100644 --- a/src/libbasic/src/siphash24.c +++ b/src/libbasic/src/siphash24.c @@ -17,9 +17,9 @@ coding style) */ -#include "macro.h" -#include "siphash24.h" -#include "unaligned.h" +#include "basic/macro.h" +#include "basic/siphash24.h" +#include "basic/unaligned.h" static inline uint64_t rotate_left(uint64_t x, uint8_t b) { assert(b < 64); diff --git a/src/libbasic/src/smack-util.c b/src/libbasic/src/smack-util.c index 3a3df987df..c3ce6bd4ac 100644 --- a/src/libbasic/src/smack-util.c +++ b/src/libbasic/src/smack-util.c @@ -25,15 +25,15 @@ #include <sys/xattr.h> #include <unistd.h> -#include "alloc-util.h" -#include "fileio.h" -#include "log.h" -#include "macro.h" -#include "path-util.h" -#include "process-util.h" -#include "smack-util.h" -#include "string-table.h" -#include "xattr-util.h" +#include "basic/alloc-util.h" +#include "basic/fileio.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/smack-util.h" +#include "basic/string-table.h" +#include "basic/xattr-util.h" #ifdef HAVE_SMACK bool mac_smack_use(void) { diff --git a/src/libbasic/src/socket-label.c b/src/libbasic/src/socket-label.c index 6d1dc83874..75036f451f 100644 --- a/src/libbasic/src/socket-label.c +++ b/src/libbasic/src/socket-label.c @@ -26,15 +26,15 @@ #include <sys/un.h> #include <unistd.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "log.h" -#include "macro.h" -#include "missing.h" -#include "mkdir.h" -#include "selinux-util.h" -#include "socket-util.h" -#include "umask-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/mkdir.h" +#include "basic/selinux-util.h" +#include "basic/socket-util.h" +#include "basic/umask-util.h" int socket_address_listen( const SocketAddress *a, diff --git a/src/libbasic/src/socket-util.c b/src/libbasic/src/socket-util.c index c8769a54f4..9e1bf1d91d 100644 --- a/src/libbasic/src/socket-util.c +++ b/src/libbasic/src/socket-util.c @@ -31,22 +31,22 @@ #include <string.h> #include <unistd.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "formats-util.h" -#include "log.h" -#include "macro.h" -#include "missing.h" -#include "parse-util.h" -#include "path-util.h" -#include "socket-util.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "user-util.h" -#include "utf8.h" -#include "util.h" +#include "basic/alloc-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/missing.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/socket-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/user-util.h" +#include "basic/utf8.h" +#include "basic/util.h" int socket_address_parse(SocketAddress *a, const char *s) { char *e, *n; diff --git a/src/libbasic/src/stat-util.c b/src/libbasic/src/stat-util.c index 309e84b93d..64f01e5b4d 100644 --- a/src/libbasic/src/stat-util.c +++ b/src/libbasic/src/stat-util.c @@ -26,12 +26,12 @@ #include <sys/statvfs.h> #include <unistd.h> -#include "dirent-util.h" -#include "fd-util.h" -#include "macro.h" -#include "missing.h" -#include "stat-util.h" -#include "string-util.h" +#include "basic/dirent-util.h" +#include "basic/fd-util.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" int is_symlink(const char *path) { struct stat info; diff --git a/src/libbasic/src/strbuf.c b/src/libbasic/src/strbuf.c index 4bef87d3c2..3b6fafeb30 100644 --- a/src/libbasic/src/strbuf.c +++ b/src/libbasic/src/strbuf.c @@ -21,8 +21,8 @@ #include <stdlib.h> #include <string.h> -#include "alloc-util.h" -#include "strbuf.h" +#include "basic/alloc-util.h" +#include "basic/strbuf.h" /* * Strbuf stores given strings in a single continuous allocated memory diff --git a/src/libbasic/src/string-table.c b/src/libbasic/src/string-table.c index a1499ab126..fae5e944b5 100644 --- a/src/libbasic/src/string-table.c +++ b/src/libbasic/src/string-table.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "string-table.h" -#include "string-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" ssize_t string_table_lookup(const char * const *table, size_t len, const char *key) { size_t i; diff --git a/src/libbasic/src/string-util.c b/src/libbasic/src/string-util.c index 293a15f9c0..003a20a41d 100644 --- a/src/libbasic/src/string-util.c +++ b/src/libbasic/src/string-util.c @@ -23,12 +23,12 @@ #include <stdio.h> #include <stdlib.h> -#include "alloc-util.h" -#include "gunicode.h" -#include "macro.h" -#include "string-util.h" -#include "utf8.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/gunicode.h" +#include "basic/macro.h" +#include "basic/string-util.h" +#include "basic/utf8.h" +#include "basic/util.h" int strcmp_ptr(const char *a, const char *b) { diff --git a/src/libbasic/src/strv.c b/src/libbasic/src/strv.c index 97a96e5762..aadbef953c 100644 --- a/src/libbasic/src/strv.c +++ b/src/libbasic/src/strv.c @@ -24,13 +24,13 @@ #include <stdlib.h> #include <string.h> -#include "alloc-util.h" -#include "escape.h" -#include "extract-word.h" -#include "fileio.h" -#include "string-util.h" -#include "strv.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/escape.h" +#include "basic/extract-word.h" +#include "basic/fileio.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/util.h" char *strv_find(char **l, const char *name) { char **i; diff --git a/src/libbasic/src/strxcpyx.c b/src/libbasic/src/strxcpyx.c index aaf11d21f6..b6225f0e12 100644 --- a/src/libbasic/src/strxcpyx.c +++ b/src/libbasic/src/strxcpyx.c @@ -27,7 +27,7 @@ #include <stdio.h> #include <string.h> -#include "strxcpyx.h" +#include "basic/strxcpyx.h" size_t strpcpy(char **dest, size_t size, const char *src) { size_t len; diff --git a/src/libbasic/src/syslog-util.c b/src/libbasic/src/syslog-util.c index db3405154e..8647f2a2d6 100644 --- a/src/libbasic/src/syslog-util.c +++ b/src/libbasic/src/syslog-util.c @@ -20,10 +20,10 @@ #include <string.h> #include <syslog.h> -#include "hexdecoct.h" -#include "macro.h" -#include "string-table.h" -#include "syslog-util.h" +#include "basic/hexdecoct.h" +#include "basic/macro.h" +#include "basic/string-table.h" +#include "basic/syslog-util.h" int syslog_parse_priority(const char **p, int *priority, bool with_facility) { int a = 0, b = 0, c = 0; diff --git a/src/libbasic/src/terminal-util.c b/src/libbasic/src/terminal-util.c index 9521b79daa..6755a3f787 100644 --- a/src/libbasic/src/terminal-util.c +++ b/src/libbasic/src/terminal-util.c @@ -38,21 +38,21 @@ #include <termios.h> #include <unistd.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "io-util.h" -#include "log.h" -#include "macro.h" -#include "parse-util.h" -#include "process-util.h" -#include "socket-util.h" -#include "stat-util.h" -#include "string-util.h" -#include "terminal-util.h" -#include "time-util.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/fs-util.h" +#include "basic/io-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/process-util.h" +#include "basic/socket-util.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" +#include "basic/terminal-util.h" +#include "basic/time-util.h" +#include "basic/util.h" static volatile unsigned cached_columns = 0; static volatile unsigned cached_lines = 0; diff --git a/src/libbasic/src/time-util.c b/src/libbasic/src/time-util.c index edd9179cb8..05f5ad7dc7 100644 --- a/src/libbasic/src/time-util.c +++ b/src/libbasic/src/time-util.c @@ -28,17 +28,17 @@ #include <sys/types.h> #include <unistd.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "log.h" -#include "macro.h" -#include "parse-util.h" -#include "path-util.h" -#include "string-util.h" -#include "strv.h" -#include "time-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.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/string-util.h" +#include "basic/strv.h" +#include "basic/time-util.h" static nsec_t timespec_load_nsec(const struct timespec *ts); diff --git a/src/libbasic/src/unit-name.c b/src/libbasic/src/unit-name.c index fe883b95c7..42c79da536 100644 --- a/src/libbasic/src/unit-name.c +++ b/src/libbasic/src/unit-name.c @@ -23,16 +23,16 @@ #include <stdlib.h> #include <string.h> -#include "alloc-util.h" -#include "bus-label.h" -#include "glob-util.h" -#include "hexdecoct.h" -#include "macro.h" -#include "path-util.h" -#include "string-table.h" -#include "string-util.h" -#include "strv.h" -#include "unit-name.h" +#include "basic/alloc-util.h" +#include "basic/bus-label.h" +#include "basic/glob-util.h" +#include "basic/hexdecoct.h" +#include "basic/macro.h" +#include "basic/path-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/unit-name.h" /* Characters valid in a unit name. */ #define VALID_CHARS \ diff --git a/src/libbasic/src/user-util.c b/src/libbasic/src/user-util.c index f65ca3edaa..aeada699ac 100644 --- a/src/libbasic/src/user-util.c +++ b/src/libbasic/src/user-util.c @@ -30,15 +30,15 @@ #include <sys/stat.h> #include <unistd.h> -#include "missing.h" -#include "alloc-util.h" -#include "fd-util.h" -#include "formats-util.h" -#include "macro.h" -#include "parse-util.h" -#include "path-util.h" -#include "string-util.h" -#include "user-util.h" +#include "basic/missing.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/formats-util.h" +#include "basic/macro.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/string-util.h" +#include "basic/user-util.h" bool uid_is_valid(uid_t uid) { diff --git a/src/libbasic/src/utf8.c b/src/libbasic/src/utf8.c index 6eae2b983d..b5144b7312 100644 --- a/src/libbasic/src/utf8.c +++ b/src/libbasic/src/utf8.c @@ -46,10 +46,10 @@ #include <stdlib.h> #include <string.h> -#include "alloc-util.h" -#include "hexdecoct.h" -#include "macro.h" -#include "utf8.h" +#include "basic/alloc-util.h" +#include "basic/hexdecoct.h" +#include "basic/macro.h" +#include "basic/utf8.h" bool unichar_is_valid(char32_t ch) { diff --git a/src/libbasic/src/util.c b/src/libbasic/src/util.c index 756c663be4..d0db8a28fb 100644 --- a/src/libbasic/src/util.c +++ b/src/libbasic/src/util.c @@ -34,30 +34,30 @@ #include <sys/types.h> #include <unistd.h> -#include "alloc-util.h" -#include "build.h" -#include "def.h" -#include "dirent-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "formats-util.h" -#include "hashmap.h" -#include "hostname-util.h" -#include "log.h" -#include "macro.h" -#include "missing.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "set.h" -#include "signal-util.h" -#include "stat-util.h" -#include "string-util.h" -#include "strv.h" -#include "time-util.h" -#include "umask-util.h" -#include "user-util.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/build.h" +#include "basic/def.h" +#include "basic/dirent-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/formats-util.h" +#include "basic/hashmap.h" +#include "basic/hostname-util.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/missing.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/stat-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/time-util.h" +#include "basic/umask-util.h" +#include "basic/user-util.h" +#include "basic/util.h" /* Put this test here for a lack of better place */ assert_cc(EAGAIN == EWOULDBLOCK); diff --git a/src/libbasic/src/verbs.c b/src/libbasic/src/verbs.c index d9cdb38d65..526e0fc338 100644 --- a/src/libbasic/src/verbs.c +++ b/src/libbasic/src/verbs.c @@ -22,11 +22,11 @@ #include <stdbool.h> #include <stddef.h> -#include "log.h" -#include "macro.h" -#include "string-util.h" -#include "verbs.h" -#include "virt.h" +#include "basic/log.h" +#include "basic/macro.h" +#include "basic/string-util.h" +#include "basic/verbs.h" +#include "basic/virt.h" int dispatch_verb(int argc, char *argv[], const Verb verbs[], void *userdata) { const Verb *verb; diff --git a/src/libbasic/src/virt.c b/src/libbasic/src/virt.c index dace1f4328..33a74f16cf 100644 --- a/src/libbasic/src/virt.c +++ b/src/libbasic/src/virt.c @@ -23,16 +23,16 @@ #include <string.h> #include <unistd.h> -#include "alloc-util.h" -#include "dirent-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "macro.h" -#include "process-util.h" -#include "stat-util.h" -#include "string-table.h" -#include "string-util.h" -#include "virt.h" +#include "basic/alloc-util.h" +#include "basic/dirent-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/macro.h" +#include "basic/process-util.h" +#include "basic/stat-util.h" +#include "basic/string-table.h" +#include "basic/string-util.h" +#include "basic/virt.h" static int detect_vm_cpuid(void) { diff --git a/src/libbasic/src/web-util.c b/src/libbasic/src/web-util.c index 595688ed93..a68813ffb8 100644 --- a/src/libbasic/src/web-util.c +++ b/src/libbasic/src/web-util.c @@ -19,9 +19,9 @@ #include <stdbool.h> -#include "string-util.h" -#include "utf8.h" -#include "web-util.h" +#include "basic/string-util.h" +#include "basic/utf8.h" +#include "basic/web-util.h" bool http_etag_is_valid(const char *etag) { if (isempty(etag)) diff --git a/src/libbasic/src/xattr-util.c b/src/libbasic/src/xattr-util.c index 8256899eda..07f063e10b 100644 --- a/src/libbasic/src/xattr-util.c +++ b/src/libbasic/src/xattr-util.c @@ -25,13 +25,13 @@ #include <sys/time.h> #include <sys/xattr.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "macro.h" -#include "sparse-endian.h" -#include "stdio-util.h" -#include "time-util.h" -#include "xattr-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/macro.h" +#include "basic/sparse-endian.h" +#include "basic/stdio-util.h" +#include "basic/time-util.h" +#include "basic/xattr-util.h" int getxattr_malloc(const char *path, const char *name, char **value, bool allow_symlink) { char *v; diff --git a/src/libbasic/src/xml.c b/src/libbasic/src/xml.c index 1dbeac7324..273fe51fa9 100644 --- a/src/libbasic/src/xml.c +++ b/src/libbasic/src/xml.c @@ -21,9 +21,9 @@ #include <stddef.h> #include <string.h> -#include "macro.h" -#include "string-util.h" -#include "xml.h" +#include "basic/macro.h" +#include "basic/string-util.h" +#include "basic/xml.h" enum { STATE_NULL, |