diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2024-04-23 17:10:30 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2024-04-30 00:49:53 +0000 |
| commit | 27e54c9f162879fcbf6f1d9dc221b98c8180f012 (patch) | |
| tree | b86ae748c417e607314a2eda9663918dd712ac5d | |
| parent | a8ae94b9e2cbb5ddee2ba6c4fcdda508dc295b5d (diff) | |
| download | src-27e54c9f162879fcbf6f1d9dc221b98c8180f012.tar.gz src-27e54c9f162879fcbf6f1d9dc221b98c8180f012.zip | |
__vprintf(): switch from strerror() to strerror_rl()
PR: 278556
(cherry picked from commit f887667694632c829b0599b54ff86a072e93df87)
| -rw-r--r-- | lib/libc/stdio/vfprintf.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index ad655c5d78d4..e656a2707d3a 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -316,6 +316,8 @@ __vfprintf(FILE *fp, locale_t locale, const char *fmt0, va_list ap) int width; /* width from format (%8d), or 0 */ int prec; /* precision from format; <0 for N/A */ int saved_errno; + int error; + char errnomsg[NL_TEXTMAX]; char sign; /* sign prefix (' ', '+', '-', or \0) */ struct grouping_state gs; /* thousands' grouping info */ @@ -777,7 +779,9 @@ fp_common: break; #endif /* !NO_FLOATING_POINT */ case 'm': - cp = strerror(saved_errno); + error = __strerror_rl(saved_errno, errnomsg, + sizeof(errnomsg), locale); + cp = error == 0 ? errnomsg : "<strerror failure>"; size = (prec >= 0) ? strnlen(cp, prec) : strlen(cp); sign = '\0'; break; |