From patchwork Tue May 19 18:05:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 39331 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6F139389201F; Tue, 19 May 2020 18:05:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6F139389201F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1589911548; bh=xyB901ZcyiAntLGwBckqT1APEyGQlY8lkG0QQ04Ps2o=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=JS4sKDh3dgsu1OLSJMNx5Omy15SLgn59gi/KDl6YKTPaFMnQaFOsRzizd64b4D4Hb 9HE5H1bNrDzovPR1XDdtSf+z9xPr60CN3q8ViMdsekrs/XxNvyGH1YYIp9ITTxh75U 7DszHAmkRsN0TZ8ObsoFLepl0YjMfd1mZm/UhTk4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by sourceware.org (Postfix) with ESMTPS id 3A286393BC2C for ; Tue, 19 May 2020 18:05:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3A286393BC2C Received: by mail-qt1-x842.google.com with SMTP id t25so396217qtc.0 for ; Tue, 19 May 2020 11:05:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xyB901ZcyiAntLGwBckqT1APEyGQlY8lkG0QQ04Ps2o=; b=KipVrsKSd1V8I3ws+jJ7lpvWVc738MsK5tbSVdVDWCVH3/sb6guHeBa2FNEWj6jVaJ RA5F7+rt8YEsfAUTtB2fSYc40Z/DzFInl9G+pA6T9qKQFry0a848uenyCkAPUN0MAw2q 8IrugqyJ/N56BGCbFXe2jKPRk34gRJzXt8wShkdiMSexIBxYTF1saI1vwfz1V49dUuhn Zymjx1lcNENfJgQ2INngJEOwR9iH87ms/N4PkNHNUOnT65M+eng87FVwKgmhwMFAHcnO dxDGyObyHngwpJY9CRF0o/PgmGzCwNSLC2c6wYZvniGN9ME3tEMxdH+PiFL+blP2Sbp+ niNw== X-Gm-Message-State: AOAM533rRwEsQSyBlmJFJ4iumG53tj9ZtQ2zfcusBZRUme+Rg7UUiyf1 201hOh5uge/b4tYQjirmEQneSmlhasg= X-Google-Smtp-Source: ABdhPJzDvmlsLUaVMfl34R1sq8D0eC7JocF3Qo5VJo7hszyJETTRi6+ix0ncOBFa95Yix0DpUCW3tg== X-Received: by 2002:ac8:3173:: with SMTP id h48mr1075163qtb.179.1589911544440; Tue, 19 May 2020 11:05:44 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id m6sm230091qkc.4.2020.05.19.11.05.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 11:05:44 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 06/13] string: Implement strerror in terms of strerror_l Date: Tue, 19 May 2020 15:05:11 -0300 Message-Id: <20200519180518.318733-7-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200519180518.318733-1-adhemerval.zanella@linaro.org> References: <20200519180518.318733-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-16.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Checked on x86-64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, and s390x-linux-gnu. --- include/string.h | 4 ++++ string/strerror.c | 22 ++-------------------- string/strerror_l.c | 17 ++++++++++++----- sysdeps/mach/strerror_l.c | 4 +++- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/include/string.h b/include/string.h index 1d7ec08a57..8efbefd43e 100644 --- a/include/string.h +++ b/include/string.h @@ -4,6 +4,7 @@ /* Some of these are defined as macros in the real string.h, so we must prototype them before including it. */ #include +#include extern void *__memccpy (void *__dest, const void *__src, int __c, size_t __n); @@ -50,6 +51,8 @@ extern int __ffs (int __i) __attribute__ ((const)); extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen); +extern char *__strerror_l (int __errnum, locale_t __loc); + /* Called as part of the thread shutdown sequence. */ void __strerror_thread_freeres (void) attribute_hidden; void __strsignal_thread_freeres (void) attribute_hidden; @@ -114,6 +117,7 @@ libc_hidden_proto (memmem) extern __typeof (memmem) __memmem; libc_hidden_proto (__memmem) libc_hidden_proto (__ffs) +libc_hidden_proto (__strerror_l) #if IS_IN (libc) /* Avoid hidden reference to IFUNC symbol __explicit_bzero_chk. */ 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 . */ -#include -#include #include -#include - -/* 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 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)); } diff --git a/string/strerror_l.c b/string/strerror_l.c index 40e7d0e896..cb656b5d54 100644 --- a/string/strerror_l.c +++ b/string/strerror_l.c @@ -20,8 +20,7 @@ #include #include #include -#include -#include +#include static __thread char *last_value; @@ -38,8 +37,11 @@ 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 *r; + if (__glibc_unlikely (errnum < 0 || errnum >= _sys_nerr_internal || _sys_errlist_internal[errnum] == NULL)) { @@ -48,11 +50,16 @@ strerror_l (int errnum, locale_t loc) translate ("Unknown error ", loc), errnum) == -1) last_value = NULL; - return last_value; + r = last_value; } + else + r = (char *) translate (_sys_errlist_internal[errnum], loc); - return (char *) translate (_sys_errlist_internal[errnum], loc); + __set_errno (saved_errno); + return r; } +weak_alias (__strerror_l, strerror_l) +libc_hidden_def (__strerror_l) void __strerror_thread_freeres (void) diff --git a/sysdeps/mach/strerror_l.c b/sysdeps/mach/strerror_l.c index f514af341e..b6c9fdbe80 100644 --- a/sysdeps/mach/strerror_l.c +++ b/sysdeps/mach/strerror_l.c @@ -42,7 +42,7 @@ 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 system; int sub; @@ -86,6 +86,8 @@ strerror_l (int errnum, locale_t loc) return (char *) translate (es->subsystem[sub].codes[code], loc); } +weak_alias (__strerror_l, strerror_l) +libc_hidden_def (__strerror_l) /* This is called when a thread is exiting to free the last_value string. */ void