diff options
| author |   blueness <basile@opensource.dyc.edu> | 2015-09-11 14:44:10 -0400 |
|---|---|---|
| committer | blueness <basile@opensource.dyc.edu> | 2015-09-11 14:44:10 -0400 |
| commit | 0cc8789c71ec4c5d359fb84861a10de6e863ae13 (patch) | |
| tree | 17a89fbb4b78d69d6a2c680d983eabddf6aef470 | |
| parent | Merge pull request #124 from rcsheets/debug-output-spacing-fix (diff) | |
| parent | build-sys: check for strndupa (diff) | |
| download | eudev-0cc8789c71ec4c5d359fb84861a10de6e863ae13.tar.gz eudev-0cc8789c71ec4c5d359fb84861a10de6e863ae13.tar.bz2 eudev-0cc8789c71ec4c5d359fb84861a10de6e863ae13.zip | |
Merge pull request #122 from RomainNaour/musl-fixes
Musl fixes
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/shared/missing.h | 11 | ||||
| -rw-r--r-- | src/shared/selinux-util.c | 16 |
3 files changed, 32 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index dfa71e44d..ccb1012d5 100644 --- a/configure.ac +++ b/configure.ac @@ -66,8 +66,9 @@ AC_C_INLINE AC_TYPE_MODE_T AC_TYPE_PID_T AC_CHECK_MEMBERS([struct stat.st_rdev]) -AC_CHECK_DECLS([getrandom, gettid, name_to_handle_at, accept4, mkostemp], [], [], [[#include <sys/types.h> +AC_CHECK_DECLS([getrandom, gettid, name_to_handle_at, accept4, mkostemp, strndupa], [], [], [[#include <sys/types.h> #include <unistd.h> +#include <string.h> #include <sys/mount.h> #include <fcntl.h> #include <sys/socket.h> @@ -223,6 +224,9 @@ else fi AC_SUBST(sushell) +# selinux-util.c uses struct mallinfo which is not available for all C libraries (musl). +AC_CHECK_FUNCS([mallinfo]) + # ------------------------------------------------------------------------------ AC_CHECK_DECL([unshare], diff --git a/src/shared/missing.h b/src/shared/missing.h index 2dc9d842d..9031119a4 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h @@ -158,3 +158,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle #ifndef AT_EMPTY_PATH #define AT_EMPTY_PATH 0x1000 #endif + +#if !HAVE_DECL_STRNDUPA +#define strndupa(s, n) \ + ({ \ + const char *__old = (s); \ + size_t __len = strnlen(__old, (n)); \ + char *__new = (char *)alloca(__len + 1); \ + __new[__len] = '\0'; \ + (char *)memcpy(__new, __old, __len); \ + }) +#endif diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c index 756215e8e..a18a5a723 100644 --- a/src/shared/selinux-util.c +++ b/src/shared/selinux-util.c @@ -31,6 +31,7 @@ #include "strv.h" #include "path-util.h" #include "selinux-util.h" +#include "missing.h" #ifdef HAVE_SELINUX DEFINE_TRIVIAL_CLEANUP_FUNC(security_context_t, freecon); @@ -67,7 +68,10 @@ int mac_selinux_init(const char *prefix) { #ifdef HAVE_SELINUX usec_t before_timestamp, after_timestamp; + +#ifdef HAVE_MALLINFO struct mallinfo before_mallinfo, after_mallinfo; +#endif if (!mac_selinux_use()) return 0; @@ -75,7 +79,10 @@ int mac_selinux_init(const char *prefix) { if (label_hnd) return 0; +#ifdef HAVE_MALLINFO before_mallinfo = mallinfo(); +#endif + before_timestamp = now(CLOCK_MONOTONIC); if (prefix) { @@ -92,9 +99,14 @@ int mac_selinux_init(const char *prefix) { r = security_getenforce() == 1 ? -errno : 0; } else { char timespan[FORMAT_TIMESPAN_MAX]; + +#ifdef HAVE_MALLINFO int l; +#endif after_timestamp = now(CLOCK_MONOTONIC); + +#ifdef HAVE_MALLINFO after_mallinfo = mallinfo(); l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0; @@ -102,6 +114,10 @@ int mac_selinux_init(const char *prefix) { log_debug("Successfully loaded SELinux database in %s, size on heap is %iK.", format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0), (l+1023)/1024); +#else + log_debug("Successfully loaded SELinux database in %s", + format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0)); +#endif } #endif |