lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

string: Fix strerrorname_np return value [BZ #26555]

Browse Source 
It returns the string of the error constant, not its description (as
strerrordesc_np).  To handle the Hurd error mapping, the ERR_MAP was
removed from errlist.h to errlist.c.

Also, the testcase test-strerr (added on 325081b9eb) was not added
on the check build neither it builds correctly.  This patch also
changed it to decouple from errlist.h, the expected return values
are added explicitly for both both strerrorname_np and strerrordesc_np
directly.

Checked on x86_64-linux-gnu and i686-linux-gnu.  I also run a make
check for i686-gnu.
This commit is contained in:
Adhemerval Zanella
2020-08-31 11:53:51 -03:00
parent dfb8e514cf
commit cef95fdc2e
4 changed files with 818 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
stdio-common/errlist.c
View File

@@ -20,9 +20,13 @@
#include <libintl.h>
#include <array_length.h>
#ifndef ERR_MAP
# define ERR_MAP(n) n
#endif
const char *const _sys_errlist_internal[] =
{
#define _S(n, str) [n] = str,
#define _S(n, str) [ERR_MAP(n)] = str,
#include <errlist.h>
#undef _S
};
@@ -41,20 +45,21 @@ static const union sys_errname_t
{
#define MSGSTRFIELD1(line) str##line
#define MSGSTRFIELD(line) MSGSTRFIELD1(line)
#define _S(n, str) char MSGSTRFIELD(__LINE__)[sizeof(str)];
#define _S(n, str) char MSGSTRFIELD(__LINE__)[sizeof(#n)];
#include <errlist.h>
#undef _S
};
char str[0];
} _sys_errname = { {
#define _S(n, s) s,
#define _S(n, s) #n,
#include <errlist.h>
#undef _S
} };
static const unsigned short _sys_errnameidx[] =
{
#define _S(n, s) [n] = offsetof(union sys_errname_t, MSGSTRFIELD(__LINE__)),
#define _S(n, s) \
[ERR_MAP(n)] = offsetof(union sys_errname_t, MSGSTRFIELD(__LINE__)),
#include <errlist.h>
#undef _S
};