public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/maskray/lld] hurd: Fix errlist error mapping
@ 2021-08-25 4:23 Fangrui Song
0 siblings, 0 replies; only message in thread
From: Fangrui Song @ 2021-08-25 4:23 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5eb3e2c794c3fdd553833af5342740051221479c
commit 5eb3e2c794c3fdd553833af5342740051221479c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Aug 23 19:06:49 2021 +0200
hurd: Fix errlist error mapping
On the Hurd, the errno values don't start at 0, so _sys_errlist_internal
needs index remapping. The _sys_errlist_internal definition already properly
uses ERR_MAP, but __get_errlist and __get_errname were not.
Diff:
---
stdio-common/errlist.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/stdio-common/errlist.c b/stdio-common/errlist.c
index 928e966b58..d6f667e1ab 100644
--- a/stdio-common/errlist.c
+++ b/stdio-common/errlist.c
@@ -34,8 +34,9 @@ const char *const _sys_errlist_internal[] =
const char *
__get_errlist (int errnum)
{
- if (errnum >= 0 && errnum < array_length (_sys_errlist_internal))
- return _sys_errlist_internal[errnum];
+ int mapped = ERR_MAP (errnum);
+ if (mapped >= 0 && mapped < array_length (_sys_errlist_internal))
+ return _sys_errlist_internal[mapped];
return NULL;
}
@@ -67,10 +68,11 @@ static const unsigned short _sys_errnameidx[] =
const char *
__get_errname (int errnum)
{
- if (errnum < 0 || errnum >= array_length (_sys_errnameidx)
- || (errnum > 0 && _sys_errnameidx[errnum] == 0))
+ int mapped = ERR_MAP (errnum);
+ if (mapped < 0 || mapped >= array_length (_sys_errnameidx)
+ || (mapped > 0 && _sys_errnameidx[mapped] == 0))
return NULL;
- return _sys_errname.str + _sys_errnameidx[errnum];
+ return _sys_errname.str + _sys_errnameidx[mapped];
}
#include <errlist-compat.c>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-08-25 4:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-25 4:23 [glibc/maskray/lld] hurd: Fix errlist error mapping Fangrui Song
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).