From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 2ED9C382F0B3; Tue, 30 Aug 2022 09:20:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2ED9C382F0B3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1661851250; bh=Wu9V5IqKv9J8KBTamz6TNu2vssfvI+0fledst5Qa8JE=; h=From:To:Subject:Date:From; b=wiF3wu82OfBZwKs2PTKLX29iRpfHQcjBxannYDPq+dn74tBtc9ML8SceIGY6fmtWw NGZtps2UkqilICNpBrTJ2oW4JfnXf2XgRL6TzuXrRiKI7up4bLhWRx2jTHJOGh1grG pL2rii8riag4RKCOUQvpnFxxJlPlbZMBLAnNx7zU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.29/master] support: Add xsetlocale function X-Act-Checkin: glibc X-Git-Author: Arjun Shankar X-Git-Refname: refs/heads/release/2.29/master X-Git-Oldrev: b2b761bc47f27be953ed1413342fb4e265c5ee64 X-Git-Newrev: f22d1cb932535114e8d81ab59de3935d884df02d Message-Id: <20220830092050.2ED9C382F0B3@sourceware.org> Date: Tue, 30 Aug 2022 09:20:50 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f22d1cb932535114e8d81ab59de3935d884df02d commit f22d1cb932535114e8d81ab59de3935d884df02d Author: Arjun Shankar Date: Mon Nov 11 14:57:23 2019 +0100 support: Add xsetlocale function (cherry picked from commit cce35a50c1de0cec5cd1f6c18979ff6ee3ea1dd1) Diff: --- support/Makefile | 1 + support/support.h | 1 + support/xsetlocale.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/support/Makefile b/support/Makefile index a9b5eb4b05..ac35651745 100644 --- a/support/Makefile +++ b/support/Makefile @@ -146,6 +146,7 @@ libsupport-routines = \ xrealloc \ xrecvfrom \ xsendto \ + xsetlocale \ xsetsockopt \ xsigaction \ xsignal \ diff --git a/support/support.h b/support/support.h index b162491be6..aeb5813c51 100644 --- a/support/support.h +++ b/support/support.h @@ -91,6 +91,7 @@ char *xasprintf (const char *format, ...) __attribute__ ((format (printf, 1, 2), malloc)); char *xstrdup (const char *); char *xstrndup (const char *, size_t); +char *xsetlocale (int category, const char *locale); /* These point to the TOP of the source/build tree, not your (or support's) subdirectory. */ diff --git a/support/xsetlocale.c b/support/xsetlocale.c new file mode 100644 index 0000000000..063ed4b0d6 --- /dev/null +++ b/support/xsetlocale.c @@ -0,0 +1,30 @@ +/* setlocale with error checking. + Copyright (C) 2019 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 + +char * +xsetlocale (int category, const char *locale) +{ + char *p = setlocale (category, locale); + if (p == NULL) + FAIL_EXIT1 ("error: setlocale (%d, \"%s\")\n", category, locale); + return p; +}