Apply updates from upstream

18 files changed, 34 insertions, 13 deletions

diff --git a/src/basic/build.h b/src/basic/build.h
index 334383bdf..379459f3d 100644
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -19,37 +19,37 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#ifdef HAVE_PAM
+#if HAVE_PAM
 #define _PAM_FEATURE_ "+PAM"
 #else
 #define _PAM_FEATURE_ "-PAM"
 #endif
 
-#ifdef HAVE_AUDIT
+#if HAVE_AUDIT
 #define _AUDIT_FEATURE_ "+AUDIT"
 #else
 #define _AUDIT_FEATURE_ "-AUDIT"
 #endif
 
-#ifdef HAVE_SELINUX
+#if HAVE_SELINUX
 #define _SELINUX_FEATURE_ "+SELINUX"
 #else
 #define _SELINUX_FEATURE_ "-SELINUX"
 #endif
 
-#ifdef HAVE_SMACK
+#if HAVE_SMACK
 #define _SMACK_FEATURE_ "+SMACK"
 #else
 #define _SMACK_FEATURE_ "-SMACK"
 #endif
 
-#ifdef HAVE_UTMP
+#if HAVE_UTMP
 #define _UTMP_FEATURE_ "+UTMP"
 #else
 #define _UTMP_FEATURE_ "-UTMP"
 #endif
 
-#ifdef HAVE_ACL
+#if HAVE_ACL
 #define _ACL_FEATURE_ "+ACL"
 #else
 #define _ACL_FEATURE_ "-ACL"
diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index 294dcc8d4..66324021a 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -31,6 +31,7 @@
 #include "log.h"
 #include "macro.h"
 #include "parse-util.h"
+#include "user-util.h"
 #include "util.h"
 
 #if 0 /// UNNEEDED by elogind
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 630ae23a0..8136e62b4 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -153,7 +153,7 @@ bool cg_ns_supported(void) {
 
         return enabled;
 }
-#endif //0
+#endif // 0
 
 int cg_enumerate_subgroups(const char *controller, const char *path, DIR **_d) {
         _cleanup_free_ char *fs = NULL;
@@ -1037,7 +1037,7 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi
 int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
         _cleanup_fclose_ FILE *f = NULL;
         char line[LINE_MAX];
-        const char *fs, *controller_str = NULL;
+        const char *fs, *controller_str;
         size_t cs = 0;
         int unified;
 
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 2fa377414..1f1a33873 100644
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -23,6 +23,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <sys/statfs.h>
 #include <sys/types.h>
 
 #include "def.h"
diff --git a/src/basic/copy.c b/src/basic/copy.c
index 37212be22..6827290e2 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -40,10 +40,12 @@
 //#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 "user-util.h"
 //#include "xattr-util.h"
 
 #define COPY_BUFFER_SIZE (16*1024u)
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index d12b5036b..565902c7b 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -26,11 +26,14 @@
 
 #include "dirent-util.h"
 #include "fd-util.h"
+#include "fs-util.h"
 #include "macro.h"
 #include "missing.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "process-util.h"
 #include "socket-util.h"
+#include "stdio-util.h"
 #include "util.h"
 
 int close_nointr(int fd) {
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index a9ec7611d..f30b69550 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -58,8 +58,7 @@ int fd_warn_permissions(const char *path, int fd);
 #define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW)
 #else
 #define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), 0)
-#endif
-
+#endif // __GLIBC__
 
 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
 int touch(const char *path);
diff --git a/src/basic/generate-cap-list.sh b/src/basic/generate-cap-list.sh
index 0678bb5a3..4019d7092 100755
--- a/src/basic/generate-cap-list.sh
+++ b/src/basic/generate-cap-list.sh
@@ -1,5 +1,11 @@
 #!/bin/sh -eu
 
+#if 0 /// elogind needs musl_missing.sh, which is in shared.
+# $1 -dM -include linux/capability.h -include "$2" -include "$3" - </dev/null | \
+#         awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \
+#         grep -v CAP_LAST_CAP
+#else
 $1 -dM -include linux/capability.h -I../src/shared -include "$2" -include "$3" - </dev/null | \
         awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \
         grep -v CAP_LAST_CAP
+#endif // 0
diff --git a/src/basic/log.h b/src/basic/log.h
index 5633a2b42..c4d089b19 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -30,6 +30,7 @@
 #include "sd-id128.h"
 
 #include "macro.h"
+#include "process-util.h"
 
 typedef enum LogRealm {
         LOG_REALM_SYSTEMD,
diff --git a/src/basic/meson.build b/src/basic/meson.build
index c1712f2db..fd7bbd781 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -351,7 +351,7 @@ generate_gperfs = find_program('generate-gperfs.py')
 #         output : 'af-list.txt',
 #         command : [generate_af_list, cpp],
 #         capture : true)
-#
+
 # generate_arphrd_list = find_program('generate-arphrd-list.sh')
 # arphrd_list_txt = custom_target(
 #         'arphrd-list.txt',
diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index 98ef9f99f..e65cd67dc 100644
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -37,6 +37,7 @@
 #include "set.h"
 #include "stdio-util.h"
 #include "string-util.h"
+#include "strv.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/basic/path-util.c b/src/basic/path-util.c
index 280beae22..9ee0547fc 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -34,9 +34,11 @@
 #include "alloc-util.h"
 #include "extract-word.h"
 #include "fs-util.h"
+#include "glob-util.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "stat-util.h"
 #include "string-util.h"
diff --git a/src/basic/set.h b/src/basic/set.h
index e21e4220b..08b7c4a72 100644
--- a/src/basic/set.h
+++ b/src/basic/set.h
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "extract-word.h"
 #include "hashmap.h"
 #include "macro.h"
 
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 3d622bb1c..ef3c59172 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -23,6 +23,7 @@
 #include <net/if.h>
 #include <netdb.h>
 #include <netinet/ip.h>
+#include <poll.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index 064f0b477..0c8c301b6 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -28,6 +28,7 @@
 
 #include "dirent-util.h"
 #include "fd-util.h"
+#include "fs-util.h"
 #include "macro.h"
 #include "missing.h"
 #include "stat-util.h"
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index fc94c945e..07fc5a444 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -21,6 +21,7 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/timerfd.h>
diff --git a/src/basic/util.c b/src/basic/util.c
index 3dfe1ff65..8358d3c08 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -18,7 +18,6 @@
 ***/
 
 #include <alloca.h>
-//#include <dirent.h>
 //#include <errno.h>
 //#include <fcntl.h>
 #include <sched.h>
@@ -35,13 +34,14 @@
 //#include <unistd.h>
 
 #include "alloc-util.h"
+//#include "btrfs-util.h"
 #include "build.h"
 #include "cgroup-util.h"
 //#include "def.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-//#include "formats-util.h"
+//#include "format-util.h"
 #include "hashmap.h"
 #include "hostname-util.h"
 //#include "log.h"
diff --git a/src/basic/virt.c b/src/basic/virt.c
index 36bfd2429..8df839243 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -25,6 +25,7 @@
 
 #include "alloc-util.h"
 #include "dirent-util.h"
+#include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "macro.h"