Delivered-To: mlmmj-tyndur-devel
Received: from sv1.famkaufmann.info [176.9.73.67]
	by a9b8c5461646 with IMAP (fetchmail-6.3.26)
	for <mlmmj@localhost> (single-drop); Mon, 12 Apr 2021 21:18:14 +0000 (GMT)
Received: from localhost ([172.29.0.7])
	by sv1.famkaufmann.info with LMTP
	id oOerHAe5dGDOMgAALHnFKQ
	(envelope-from <hanna.reitz@mailbox.org>)
	for <mlmmj-tyndur-devel>; Mon, 12 Apr 2021 21:17:59 +0000
Delivered-To: tyndur-devel@tyndur.org
Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161])
	by sv1.famkaufmann.info (OpenSMTPD) with ESMTPS id 01c9afa2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO)
	for <tyndur-devel@tyndur.org>;
	Mon, 12 Apr 2021 21:17:59 +0000 (UTC)
Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4FK1mQ5MR2zQjwv
	for <tyndur-devel@tyndur.org>; Mon, 12 Apr 2021 23:17:58 +0200 (CEST)
Authentication-Results: spamfilter01.heinlein-hosting.de (amavisd-new);
	dkim=pass (2048-bit key) reason="pass (just generated, assumed good)"
	header.d=mailbox.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812;
	t=1618262278;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=OKhXT+PjeTH4wjFId565AgiQhEX5403pi95woGO00eQ=;
	b=JhP7lkzMublVpOvPYINid+Ui94kM1yuCwc/S/66FI2B35co7tVrSxpJA6ZV6eNIakTzRHg
	0LyatzEExNT77uIJ2diVIfKdvErimbGpgRzMCzu9TvxWPMFppNY1wjGdlvUFZb3F/K8FAB
	JcKn3V6o6r7R0FmhMbEKI+QERrAMX7BVF9t9tELu7Sb6KvH0CUanwBebuHqRb70YkolKjY
	vbZeDcL7tiMU+FHJyaIPif3zcGs+wkcrBdgndPfxk0/TWzOchvuX0Y+TVWhX+m06P7aYyl
	InbQcglK2+CNowhHzeWe25GO7V1eKDXpNJpVCUQ8oPOHbsCWyNEp23HIXbv9Rw==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mailbox.org; h=
	content-transfer-encoding:content-type:content-type:mime-version
	:references:in-reply-to:message-id:date:date:subject:subject
	:from:from:received; s=mail20150812; t=1618262277; bh=TC1KRkqtU9
	NPKrv44B5SGDqkuIiZypGhCEwZA0hBo5U=; b=YzQGLe6pm0RII6dATvz/O2T4g9
	hutSmcjjjzqil0rrgVLyF6tBAF6p1GB0Vhk+ZvsmJjwQLGYvV0lN0sllZ5hyOxKI
	1m5j6Pnl+4mU4a+RIrbr39KpLfD8owbWn4U7Jx0M2F0mWf0I9eOvoWxtXo8jUmfH
	zMn31UhwIIaOpCx/iCjcKJEKioCzuzWo11uBfu+iiGPBRPXHF4i3BhfiV4w4cIVx
	u/VEVE8kRbGaP8sRfSUfFcRNT9/vFJuZ+qNSXbjCM+37pH9wyMLfU+UsBArA8nvN
	vU/sPISM1tPqJdalVLZLCavsGrkAHwMMaAZEDlUWObiX5iXYDQyaeqTvi5cQ==
X-Virus-Scanned: amavisd-new at heinlein-support.de
Received: from smtp2.mailbox.org ([80.241.60.241])
	by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030)
	with ESMTP id XiyM0_BjCxur; Mon, 12 Apr 2021 23:17:57 +0200 (CEST)
From: Hanna Reitz <hanna.reitz@mailbox.org>
To: tyndur-devel@tyndur.org
Cc: Hanna Reitz <hanna.reitz@mailbox.org>
Subject: [PATCH 1/2] libc: Implementiere strerror_r()
Date: Mon, 12 Apr 2021 23:17:49 +0200
Message-Id: <20210412211750.716318-2-hanna.reitz@mailbox.org>
In-Reply-To: <20210412211750.716318-1-hanna.reitz@mailbox.org>
References: <20210412211750.716318-1-hanna.reitz@mailbox.org>
Errors-To: toni@tyndur.org
Precedence: list
Reply-To: tyndur-Patches <tyndur-devel@tyndur.org>
List-Id: tyndur-Patches <tyndur-devel.tyndur.org>
List-Unsubscribe: <mailto:tyndur-devel+unsubscribe@tyndur.org>
List-Post: <mailto:tyndur-devel@tyndur.org>
List-Help: <mailto:tyndur-devel+help@tyndur.org>
List-Subscribe: <mailto:tyndur-devel+subscribe@tyndur.org>
List-Owner: <mailto:toni@tyndur.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-MBO-SPAM-Probability: 
X-Rspamd-Score: -8.59 / 15.00 / 15.00
X-Rspamd-Queue-Id: 96DB217F3
X-Rspamd-UID: f2dde4

+ Eigentlich ist das relativ einfach, weil strerror() schon snprintf()
  benutzt.  Leider gibt es aber grundsätzlich zwei Versionen von
  strerror_r(), und die Manpage sagt im Prinzip, dass per default die
  XSI-Variante benutzt wird, aber bei _GNU_SOURCE dann die GNU-Variante.
  Das klingt, als sollten wir am besten beide anbieten, und das macht
  das ganze dann leider komplizierter, als es nötig sein sollte.

Signed-off-by: Hanna Reitz <hanna.reitz@mailbox.org>
---
 src/include/string.h             |  6 +++++
 src/modules/lib/posix/strerror.c | 40 ++++++++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/include/string.h b/src/include/string.h
index c7a69831..db244ac3 100644
--- a/src/include/string.h
+++ b/src/include/string.h
@@ -83,6 +83,12 @@ char* strndup(const char* str, size_t n);
 char *strpbrk(const char *s1, const char *s2);
 
 char* strerror(int error_code);
+#if (_POSIX_C_SOURCE >= 200112l) && !defined(_GNU_SOURCE)
+int _xsi_strerror_r(int error_code, char* buf, size_t buflen);
+#define strerror_r _xsi_strerror_r
+#else
+char* strerror_r(int error_code, char* buf, size_t buflen);
+#endif
 
 int strcasecmp(const char* s1, const char* s2);
 int strncasecmp(const char* s1, const char* s2, size_t n);
diff --git a/src/modules/lib/posix/strerror.c b/src/modules/lib/posix/strerror.c
index d73b3a7d..28a0a8a4 100644
--- a/src/modules/lib/posix/strerror.c
+++ b/src/modules/lib/posix/strerror.c
@@ -31,6 +31,12 @@
 #include <stdio.h>
 #include <errno.h>
 
+// string.h koennte dieses Macro definiert haben, aber hier koennen wir
+// das nicht brauchen.
+#ifdef strerror_r
+#undef strerror_r
+#endif
+
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 
 static char* error_messages[] = {
@@ -61,22 +67,46 @@ static char* error_messages[] = {
  * TODO: ATM nur stub
  *
  * @param error_code Fehlernummer
+ * @param buf Puffer, in dem die Fehlermeldung gespeichert wird
+ * @param buflen Laenge des Puffers
  * 
- * @return Pointer auf internen Buffer mit Fehlermeldung
+ * @return 0 bei Erfolg, sonst errno (errno wird ebenfalls gesetzt)
  */
-char* strerror(int error_code)
+int _xsi_strerror_r(int error_code, char* buf, size_t buflen)
 {
-    static char error_message[64];
+    int old_errno = errno;
+    int printf_len;
+    int ret = 0;
 
     if (error_code >= 0 && error_code < ARRAY_SIZE(error_messages) &&
         error_messages[error_code] != NULL)
     {
-        snprintf(error_message, sizeof(error_message),
+        printf_len = snprintf(buf, buflen,
             "%s (%d)", error_messages[error_code], error_code);
+        errno = old_errno; // errno nicht veraendern
     } else {
-        snprintf(error_message, sizeof(error_message),
+        printf_len = snprintf(buf, buflen,
             "Unbekannter Fehler %d", error_code);
+        ret = errno = EINVAL;
     }
+
+    if (printf_len >= buflen) {
+        ret = errno = ERANGE;
+    }
+
+    return ret;
+}
+
+char* strerror(int error_code)
+{
+    static char error_message[64];
+    _xsi_strerror_r(error_code, error_message, sizeof(error_message));
     return error_message;
 }
 
+char* strerror_r(int error_code, char* buf, size_t buflen)
+{
+    _xsi_strerror_r(error_code, buf, buflen);
+    return buf;
+}
+
-- 
2.31.0

