From patchwork Wed Jun 3 18:34:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 39462 X-Patchwork-Delegate: carlos@redhat.com 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 33B34388C017; Wed, 3 Jun 2020 18:35:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33B34388C017 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1591209305; bh=mVKTIelAAp1ICEAyEmkTJQXskgNwg5XvstVdNBgUpdQ=; 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=dJoeVkvPeT3AIjpIe1RB1PCpCemblcEME1F6+QtslUsK6TaU57EQ+2OIbD4RFdp59 kKZs/Z4UcoiJF86JRWS0yORzJ6V/6lzvuelxXLGLy4c+vFYz/QVtEUlC0F06bdUkc1 oSpF5MJxRixMGidgdR1rfx8njs+6+fKGi7gxQJFk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by sourceware.org (Postfix) with ESMTPS id 6B797388C030 for ; Wed, 3 Jun 2020 18:35:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6B797388C030 Received: by mail-qk1-x743.google.com with SMTP id f18so3264546qkh.1 for ; Wed, 03 Jun 2020 11:35:02 -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=mVKTIelAAp1ICEAyEmkTJQXskgNwg5XvstVdNBgUpdQ=; b=SnpZOSxW+LlWXNb1o/C/Fd3ZHKSX66kZ23/vsS/WFzl/th9Qnpr3F+4jR+/3N15Fco Qx58pKS5Tgt58hMRWXgg/SeTP04ve/U9qlrbvBA6sQD8NllqNZAinIGErA7j0Dw/Q4Wc yBd7vD4yGmBOCdqzu10jaIN789Z+Ky1CRDxXpwL2hndrTHWQ03gVGtf/CtgugJSaQhaN iU7jCVaxMofFZWq+ONpZGIfv0Plq308/NNCbq+HX/pH4ia/z0VreAS9kv0XVTRudgmlM GOUpSmJcrKvjuj3Y+XwAB1KX8TRa3ITN9T2ZNDOpLbEWHnfK+xdJfSqmFcNvWY5m2P1c tUxw== X-Gm-Message-State: AOAM530uUe/9eAV+ClhWnDlVZRw3osr65EOrOQipN3ezOEu97ut0wIZ8 peZ/F3chxBzW/upbRLiN9cP+csuhxNA= X-Google-Smtp-Source: ABdhPJwxQcdRfb1yFWDqkOhPnqXSm6TTfU+OzFO8k7tmyvHMnqSxNI0tlRcwxuwL8fOHfFROPKLjkw== X-Received: by 2002:ae9:dc84:: with SMTP id q126mr1049778qkf.430.1591209301652; Wed, 03 Jun 2020 11:35:01 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id z77sm1507361qka.59.2020.06.03.11.34.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2020 11:35:00 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 08/13] string: Simplify strerror_r Date: Wed, 3 Jun 2020 15:34:39 -0300 Message-Id: <20200603183444.587742-8-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200603183444.587742-1-adhemerval.zanella@linaro.org> References: <20200603183444.587742-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-15.1 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Changes from previous version: - Add commit note about snprintf usage. --- Use snprintf instead of mempcpy plus itoa_word and remove unused definitions. There is no potential for infinite recursion because snprintf only use strerror_r for the %m specifier. Checked on x86-64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, and s390x-linux-gnu. --- string/_strerror.c | 41 ++---------------------- sysdeps/mach/_strerror.c | 67 +++------------------------------------- 2 files changed, 7 insertions(+), 101 deletions(-) diff --git a/string/_strerror.c b/string/_strerror.c index 01226e3d4b..da3b22f5b1 100644 --- a/string/_strerror.c +++ b/string/_strerror.c @@ -15,22 +15,10 @@ License along with the GNU C Library; if not, see . */ +#include #include -#include #include #include -#include -#include -#include <_itoa.h> - -/* It is critical here that we always use the `dcgettext' function for - the message translation. Since only defines the macro - `dgettext' to use `dcgettext' for optimizing programs this is not - always guaranteed. */ -#ifndef dgettext -# include /* We need LC_MESSAGES. */ -# define dgettext(domainname, msgid) dcgettext (domainname, msgid, LC_MESSAGES) -#endif /* Return a string describing the errno code in ERRNUM. */ char * @@ -39,32 +27,7 @@ __strerror_r (int errnum, char *buf, size_t buflen) char *err = (char *) __get_errlist (errnum); if (__glibc_unlikely (err == NULL)) { - /* Buffer we use to print the number in. For a maximum size for - `int' of 8 bytes we never need more than 20 digits. */ - char numbuf[21]; - const char *unk = _("Unknown error "); - size_t unklen = strlen (unk); - char *p, *q; - bool negative = errnum < 0; - - numbuf[20] = '\0'; - p = _itoa_word (abs (errnum), &numbuf[20], 10, 0); - - /* Now construct the result while taking care for the destination - buffer size. */ - q = __mempcpy (buf, unk, MIN (unklen, buflen)); - if (negative && unklen < buflen) - { - *q++ = '-'; - ++unklen; - } - if (unklen < buflen) - memcpy (q, p, MIN ((size_t) (&numbuf[21] - p), buflen - unklen)); - - /* Terminate the string in any case. */ - if (buflen > 0) - buf[buflen - 1] = '\0'; - + __snprintf (buf, buflen, "%s%d", _("Unknown error "), errnum); return buf; } diff --git a/sysdeps/mach/_strerror.c b/sysdeps/mach/_strerror.c index d932b1bd58..399de330d9 100644 --- a/sysdeps/mach/_strerror.c +++ b/sysdeps/mach/_strerror.c @@ -15,22 +15,12 @@ License along with the GNU C Library; if not, see . */ +#include #include #include #include #include #include -#include -#include <_itoa.h> - -/* It is critical here that we always use the `dcgettext' function for - the message translation. Since only defines the macro - `dgettext' to use `dcgettext' for optimizing programs this is not - always guaranteed. */ -#ifndef dgettext -# include /* We need LC_MESSAGES. */ -# define dgettext(domainname, msgid) dcgettext (domainname, msgid, LC_MESSAGES) -#endif /* Return a string describing the errno code in ERRNUM. */ char * @@ -50,26 +40,8 @@ __strerror_r (int errnum, char *buf, size_t buflen) if (system > err_max_system || ! __mach_error_systems[system].bad_sub) { - /* Buffer we use to print the number in. For a maximum size for - `int' of 8 bytes we never need more than 20 digits. */ - char numbuf[21]; - const char *unk = _("Error in unknown error system: "); - const size_t unklen = strlen (unk); - char *p, *q; - - numbuf[20] = '\0'; - p = _itoa_word (errnum, &numbuf[20], 16, 1); - - /* Now construct the result while taking care for the destination - buffer size. */ - q = __mempcpy (buf, unk, MIN (unklen, buflen)); - if (unklen < buflen) - memcpy (q, p, MIN (&numbuf[21] - p, buflen - unklen)); - - /* Terminate the string in any case. */ - if (buflen > 0) - buf[buflen - 1] = '\0'; - + __snprintf (buf, buflen, "%s: %d", _("Error in unknown error system: "), + errnum); return buf; } @@ -80,37 +52,8 @@ __strerror_r (int errnum, char *buf, size_t buflen) if (code >= es->subsystem[sub].max_code) { - /* Buffer we use to print the number in. For a maximum size for - `int' of 8 bytes we never need more than 20 digits. */ - char numbuf[21]; - const char *unk = _("Unknown error "); - const size_t unklen = strlen (unk); - char *p, *q; - size_t len = strlen (es->subsystem[sub].subsys_name); - - numbuf[20] = '\0'; - p = _itoa_word (errnum, &numbuf[20], 10, 0); - - /* Now construct the result while taking care for the destination - buffer size. */ - q = __mempcpy (buf, unk, MIN (unklen, buflen)); - if (unklen < buflen) - { - q = __mempcpy (q, es->subsystem[sub].subsys_name, - MIN (len, buflen - unklen)); - if (unklen + len < buflen) - { - *q++ = ' '; - if (unklen + len + 1 < buflen) - memcpy (q, p, - MIN (&numbuf[21] - p, buflen - unklen - len - 1)); - } - } - - /* Terminate the string in any case. */ - if (buflen > 0) - buf[buflen - 1] = '\0'; - + __snprintf (buf, buflen, "%s%s %d", _("Unknown error "), + es->subsystem[sub].subsys_name, errnum); return buf; }