From patchwork Wed Jun 3 18:34:41 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: 39465 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 EDFCD388E802; Wed, 3 Jun 2020 18:35:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EDFCD388E802 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1591209310; bh=m16FfTUHze2nlba9+hDhT3ggopulUx9E1hn6IG7kAe0=; 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=Ht9VRVUHDIxfr+QMe/FNl6XnTHzMa+9kJiDLrezqnaB1Mn91k8dRDJpVEXXLykbqA bnwVQ1AXwqKxuWYm5kY4DBi94VaA3aOXdl79ZeotaRtudgJ79jZX53YhaARvhWhV5v HDTDDN2PU4grWjpfwxsjjsP5yqorlTYuCCbn+O14= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by sourceware.org (Postfix) with ESMTPS id 50484388C03C for ; Wed, 3 Jun 2020 18:35:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 50484388C03C Received: by mail-qt1-x844.google.com with SMTP id e16so2975418qtg.0 for ; Wed, 03 Jun 2020 11:35:06 -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=m16FfTUHze2nlba9+hDhT3ggopulUx9E1hn6IG7kAe0=; b=LY0ZP0qikJ6VvcXeCR4BBWn/phCqUsq7w+Dm1MHPeLh6WaQ97D9BugpWANz3LHBXai E2GbY8t2PgMgE9d0wj6VU6Gb3TVCN0zGz96A/QzszgYZA7bsQ6hXpxcfoWeThensYyFU OQUthNJiM7pCq+YOUr9kLVyVJt97oOSRyaow8INa+3FpDK6V9vGFEl7uYyhuMCOGkX5X 9JUtT84klh2W1urU+J4bAgFz3Z63rI+tsniWIBq/M4xZzVx09N36V66hkWrLQQ5ZpeMW 7ig/eLCKHd5yaVCzir5UQmB/kMljHYG/MBrE2QZzJ6MSIWykGnVlTUX1kUOZFOPS9lMk YsTw== X-Gm-Message-State: AOAM5306v1qL/Rmim42Jw6d6Wgs2v7+HPgg8I7zTXSCy3xy3RzIZ0iUv 0C41jabOFibnBO8091wimUQ/RMFdrwo= X-Google-Smtp-Source: ABdhPJyQ+nD0CBD7d31CKuhKG4GWUIk2fgPCpOypUwV6b2X08hO+2SGnlwhLc53Nfx4AToWIdy1i6Q== X-Received: by 2002:ac8:3f14:: with SMTP id c20mr779758qtk.22.1591209304799; Wed, 03 Jun 2020 11:35:04 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id z77sm1507361qka.59.2020.06.03.11.35.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2020 11:35:03 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 10/13] string: Add strerror, strerror_r, and strerror_l test Date: Wed, 3 Jun 2020 15:34:41 -0300 Message-Id: <20200603183444.587742-10-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 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. --- string/Makefile | 3 +- string/tst-strerror.c | 76 +++++++++++++++++++++++++++++++++++++++++++ support/Makefile | 2 ++ support/support.h | 4 +++ support/xnewlocale.c | 31 ++++++++++++++++++ support/xuselocale.c | 30 +++++++++++++++++ 6 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 string/tst-strerror.c create mode 100644 support/xnewlocale.c create mode 100644 support/xuselocale.c diff --git a/string/Makefile b/string/Makefile index 470ff77ded..73e5ac2ebe 100644 --- a/string/Makefile +++ b/string/Makefile @@ -65,7 +65,7 @@ tests := tester inl-tester noinl-tester testcopy test-ffs \ # This test allocates a lot of memory and can run for a long time. xtests = tst-strcoll-overflow -tests-container += tst-strsignal +tests-container += tst-strsignal tst-strerror # This test needs libdl. ifeq (yes,$(build-shared)) @@ -118,5 +118,6 @@ $(objpfx)tst-strxfrm2.out: $(gen-locales) $(objpfx)bug-strcoll2.out: $(gen-locales) $(objpfx)tst-strcoll-overflow.out: $(gen-locales) $(objpfx)tst-strsignal.out: $(gen-locales) +$(objpfx)tst-strerror.out: $(gen-locales) endif diff --git a/string/tst-strerror.c b/string/tst-strerror.c new file mode 100644 index 0000000000..3af51236d7 --- /dev/null +++ b/string/tst-strerror.c @@ -0,0 +1,76 @@ +/* Test for strerror, strerror_r, and strerror_l. + + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include + +#include +#include + +static int +do_test (void) +{ + xsetlocale (LC_ALL, "C"); + + TEST_COMPARE_STRING (strerror (EINVAL), "Invalid argument"); + TEST_COMPARE_STRING (strerror (-1), "Unknown error -1"); + + { + char buffer[32]; + TEST_COMPARE_STRING (strerror_r (EINVAL, buffer, 8), + "Invalid argument"); + TEST_COMPARE_STRING (strerror_r (-1, buffer, 8), + "Unknown"); + TEST_COMPARE_STRING (strerror_r (-1, buffer, 16), + "Unknown error -"); + TEST_COMPARE_STRING (strerror_r (-1, buffer, 32), + "Unknown error -1"); + } + + locale_t l = xnewlocale (LC_ALL_MASK, "pt_BR.UTF-8", NULL); + + TEST_COMPARE_STRING (strerror_l (EINVAL, l), "Argumento inv\303\241lido"); + TEST_COMPARE_STRING (strerror_l (-1, l), "Erro desconhecido -1"); + + xuselocale (l); + + TEST_COMPARE_STRING (strerror (EINVAL), "Argumento inv\303\241lido"); + TEST_COMPARE_STRING (strerror (-1), "Erro desconhecido -1"); + + { + char buffer[32]; + TEST_COMPARE_STRING (strerror_r (EINVAL, buffer, 8), + "Argumento inv\303\241lido"); + TEST_COMPARE_STRING (strerror_r (-1, buffer, 8), + "Erro de"); + TEST_COMPARE_STRING (strerror_r (-1, buffer, 16), + "Erro desconheci"); + TEST_COMPARE_STRING (strerror_r (-1, buffer, 32), + "Erro desconhecido -1"); + } + + freelocale (l); + + return 0; +} + +#include diff --git a/support/Makefile b/support/Makefile index 51484310cd..764b471033 100644 --- a/support/Makefile +++ b/support/Makefile @@ -108,6 +108,7 @@ libsupport-routines = \ xmmap \ xmprotect \ xmunmap \ + xnewlocale \ xopen \ xpipe \ xpoll \ @@ -173,6 +174,7 @@ libsupport-routines = \ xsymlink \ xsysconf \ xunlink \ + xuselocale \ xwaitpid \ xwrite \ diff --git a/support/support.h b/support/support.h index 8e1a6a17f7..905b5a76d8 100644 --- a/support/support.h +++ b/support/support.h @@ -29,6 +29,8 @@ #include /* For ssize_t and off64_t. */ #include +/* For locale_t. */ +#include __BEGIN_DECLS @@ -92,6 +94,8 @@ char *xasprintf (const char *format, ...) char *xstrdup (const char *); char *xstrndup (const char *, size_t); char *xsetlocale (int category, const char *locale); +locale_t xnewlocale (int category_mask, const char *locale, locale_t base); +char *xuselocale (locale_t newloc); /* These point to the TOP of the source/build tree, not your (or support's) subdirectory. */ diff --git a/support/xnewlocale.c b/support/xnewlocale.c new file mode 100644 index 0000000000..f532873c7f --- /dev/null +++ b/support/xnewlocale.c @@ -0,0 +1,31 @@ +/* newlocale with error checking. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +#include + +locale_t +xnewlocale (int category_mask, const char *locale, locale_t base) +{ + locale_t r = newlocale (category_mask, locale, base); + if (r == (locale_t) 0) + FAIL_EXIT1 ("error: newlocale (%d, \"%s\", %p)\n", category_mask, + locale, base); + return r; +} diff --git a/support/xuselocale.c b/support/xuselocale.c new file mode 100644 index 0000000000..3d6125b57d --- /dev/null +++ b/support/xuselocale.c @@ -0,0 +1,30 @@ +/* uselocale with error checking. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +#include + +locale_t +xuselocale (locale_t newloc) +{ + locale_t r = uselocale (newloc); + if (r == (locale_t) 0) + FAIL_EXIT1 ("error: uselocale (%p)\n", newloc); + return r; +}