Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Apr 2024 19:44:26 GMT
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: aa66995b4c80 - main - libc printf_render_errno(): do not use strerror()
Message-ID:  <202404231944.43NJiQfJ077644@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=aa66995b4c804cbb579f71645d97fe282a798bfc

commit aa66995b4c804cbb579f71645d97fe282a798bfc
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-04-23 17:15:22 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-04-23 19:44:07 +0000

    libc printf_render_errno(): do not use strerror()
    
    Reviewed by:    imp
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D44916
---
 lib/libc/stdio/xprintf_errno.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/libc/stdio/xprintf_errno.c b/lib/libc/stdio/xprintf_errno.c
index c63a7afd35e0..f1e5421f60c8 100644
--- a/lib/libc/stdio/xprintf_errno.c
+++ b/lib/libc/stdio/xprintf_errno.c
@@ -27,6 +27,7 @@
  */
 
 #include <namespace.h>
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -53,13 +54,13 @@ __printf_render_errno(struct __printf_io *io, const struct printf_info *pi
 {
 	int ret, error;
 	char buf[64];
-	const char *p;
+	char errnomsg[NL_TEXTMAX];
 
 	ret = 0;
 	error = *((const int *)arg[0]);
 	if (error >= 0 && error < __hidden_sys_nerr) {
-		p = strerror(error);
-		return (__printf_out(io, pi, p, strlen(p)));
+		strerror_r(error, errnomsg, sizeof(errnomsg));
+		return (__printf_out(io, pi, errnomsg, strlen(errnomsg)));
 	}
 	sprintf(buf, "errno=%d/0x%x", error, error);
 	ret += __printf_out(io, pi, buf, strlen(buf));



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404231944.43NJiQfJ077644>