diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-05-14 17:44:15 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-07-07 14:10:58 -0300 |
commit | 28aff047818eb1726394296d27b9c7885340bead (patch) | |
tree | 5737f4a11497ea9dbe00982d12688ede57eff0a6 /string/strerror.c | |
parent | 9deec7c8bab24659e78172dd850f4ca37c57940c (diff) | |
download | glibc-28aff047818eb1726394296d27b9c7885340bead.tar.gz glibc-28aff047818eb1726394296d27b9c7885340bead.tar.xz glibc-28aff047818eb1726394296d27b9c7885340bead.zip |
string: Implement strerror in terms of strerror_l
If the thread is terminated then __libc_thread_freeres will free the storage via __glibc_tls_internal_free. It is only within the calling thread that this matters. It makes strerror MT-safe. Checked on x86-64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, and s390x-linux-gnu. Tested-by: Carlos O'Donell <carlos@redhat.com> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'string/strerror.c')
-rw-r--r-- | string/strerror.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/string/strerror.c b/string/strerror.c index 283ab70f91..35c749016e 100644 --- a/string/strerror.c +++ b/string/strerror.c @@ -15,29 +15,11 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#include <libintl.h> -#include <stdio.h> #include <string.h> -#include <errno.h> - -/* Return a string describing the errno code in ERRNUM. - The storage is good only until the next call to strerror. - Writing to the storage causes undefined behavior. */ -libc_freeres_ptr (static char *buf); +#include <locale/localeinfo.h> char * strerror (int errnum) { - char *ret = __strerror_r (errnum, NULL, 0); - int saved_errno; - - if (__glibc_likely (ret != NULL)) - return ret; - saved_errno = errno; - if (buf == NULL) - buf = malloc (1024); - __set_errno (saved_errno); - if (buf == NULL) - return _("Unknown error"); - return __strerror_r (errnum, buf, 1024); + return __strerror_l (errnum, __libc_tsd_get (locale_t, LOCALE)); } |