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_l.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_l.c')
| -rw-r--r-- | string/strerror_l.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/string/strerror_l.c b/string/strerror_l.c index 309f42e66b..017bd14b99 100644 --- a/string/strerror_l.c +++ b/string/strerror_l.c @@ -20,8 +20,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/param.h> -#include <libc-symbols.h> +#include <errno.h> static __thread char *last_value; @@ -38,8 +37,9 @@ translate (const char *str, locale_t loc) /* Return a string describing the errno code in ERRNUM. */ char * -strerror_l (int errnum, locale_t loc) +__strerror_l (int errnum, locale_t loc) { + int saved_errno = errno; char *err = (char *) __get_errlist (errnum); if (__glibc_unlikely (err == NULL)) { @@ -48,11 +48,16 @@ strerror_l (int errnum, locale_t loc) translate ("Unknown error ", loc), errnum) == -1) last_value = NULL; - return last_value; + err = last_value; } + else + err = (char *) translate (err, loc); - return (char *) translate (err, loc); + __set_errno (saved_errno); + return err; } +weak_alias (__strerror_l, strerror_l) +libc_hidden_def (__strerror_l) void __strerror_thread_freeres (void) |