string: Add wrong strerror_r

2 files changed, 32 insertions, 0 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b05ef58..8b2596e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -8,6 +8,20 @@
   © 2016-2020 Adélie Software and contributors.  NCSA open source license.
 
 
+1.1 (202?-??-??)
+================
+
+locale
+------
+
+* Redesign newlocale, courtesy of rcombs.
+
+string
+------
+
+* Add historical, non-POSIX strerror_r definition.
+
+
 1.0.0 (2020-09-27)
 ==================
 
diff --git a/libgcompat/string.c b/libgcompat/string.c
index 9852bea..f2a2e87 100644
--- a/libgcompat/string.c
+++ b/libgcompat/string.c
@@ -1,9 +1,12 @@
 #define _GNU_SOURCE /* mempcpy */
 #include <assert.h> /* assert */
+#include <dlfcn.h>  /* dlsym, RTLD_NEXT */
 #include <stddef.h> /* NULL, size_t */
 #include <stdint.h> /* SIZE_MAX */
 #include <stdlib.h> /* rand_r */
+#define strerror_r no_strerror_r
 #include <string.h> /* memcpy, strcpy, strncat, strndup */
+#undef strerror_r
 #include <time.h>   /* time */
 #include <unistd.h> /* getpid */
 
@@ -211,6 +214,21 @@ char *__strdup(const char *string)
 }
 
 /**
+ * Non-POSIX strerror_r.
+ */
+static int (*real_strerror_r)(int, char *, size_t);
+
+char *strerror_r(int errnum, char *buf, size_t buflen)
+{
+	if (real_strerror_r == NULL) {
+		real_strerror_r = dlsym(RTLD_NEXT, "strerror_r");
+		assert(real_strerror_r);
+	}
+	real_strerror_r(errnum, buf, buflen);
+	return buf;
+}
+
+/**
  * Concatenate a string with part of another, with buffer overflow checking.
  *
  * LSB 5.0: LSB-Core-generic/baselib---strncat-chk-1.html