mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-31 14:01:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

mach: Make xpg_strerror_r set a message on error

Browse Source 
posix advises to have strerror_r fill a message even when we are returning
an error.

This makes mach's xpg_strerror_r do this, like the generic version does.

Spotted by the libunistring testsuite test-strerror_r
This commit is contained in:
Samuel Thibault 2022-08-27 14:46:23 +02:00
parent 03ad444e8e
commit cb033e6b0c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sysdeps/mach/xpg-strerror.c
View File

@ -51,7 +51,11 @@ __xpg_strerror_r (int errnum, char *buf, size_t buflen)
code = err_get_code (errnum);
if (system > err_max_system || ! __mach_error_systems[system].bad_sub)
return EINVAL;
{
__snprintf (buf, buflen, "%s%X", _("Error in unknown error system: "),
errnum);
return EINVAL;
}
es = &__mach_error_systems[system];
@ -62,11 +66,11 @@ __xpg_strerror_r (int errnum, char *buf, size_t buflen)
else
estr = (const char *) _(es->subsystem[sub].codes[code]);
size_t estrlen = strlen (estr) + 1;
size_t estrlen = strlen (estr);
if (buflen < estrlen)
return ERANGE;
/* Terminate the string in any case. */
if (buflen > 0)
*((char *) __mempcpy (buf, estr, MIN (buflen - 1, estrlen))) = '\0';
memcpy (buf, estr, estrlen);
return 0;
return buflen <= estrlen ? ERANGE : 0;
}