Lassebq
--- a/libgcompat/string.c
+++ b/libgcompat/string.c

 	assert(dest != NULL);
 	assert(src != NULL);
-	total = strnlen(dest, destlen) + n + 1;
+	total = strnlen(dest, destlen) + strnlen(src, destlen) + 1;
--- a/libgcompat/wchar.c
+++ b/libgcompat/wchar.c
-size_t __mbrlen(const char *restrict s, size_t n, mbstate_t *restrict st) {
-    return mbrlen(s, n, st);
+	assert(destlen >= n);
+
+	return wcsncpy(dest, src, n);
+}
+
+wchar_t *__wcscat_chk(wchar_t *dest, const wchar_t *src, size_t n)
+{
+	wchar_t *a = dest;
+	size_t destlen = wcslen(dest);
+	assert(destlen + wcslen(src) + 1 <= n);
+
+	dest += destlen;
+	while (n && *src) {
+		n--;