From nobody Fri Jan 28 21:52:40 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5933D197F06B; Fri, 28 Jan 2022 21:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jlrm820wPz3jLF; Fri, 28 Jan 2022 21:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643406760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYqZe43La18tmSDtyHQH5BQJ1U5JBNcTmfrQx5cTDIk=; b=BNEpDhaikNGftWQTXK2c6B0lhwd6BS72AptqZwDHoTBP65pXFbb8AO/yCuBQlvPczz2gKN o4q32tcVD7cJICQSJJdeQpPSR92uYomqcmE7mGkrFMZRSpTk/9nZTLt0LNJqi9k78fDR3Q /vsC+Tb0Qde8NV1Qyri2l6L1Ie6guPhyoPL7HyETG1s0a+OHckN7i5eMIrIjTpkHdrYUsV bvqx/jMKXpDiw6H5r4yG2KRlJBp30f1KMQbhfxq1iNxRVSGzquhhQzvZDPzhndZGqkU4a3 kDfg1uIfQfv5Bmdu0HCesCN9kzr1wUD6ty27CSP1FMUhTVJwcQk1SQzkop5u6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 250141B75; Fri, 28 Jan 2022 21:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20SLqei2069599; Fri, 28 Jan 2022 21:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20SLqeTW069598; Fri, 28 Jan 2022 21:52:40 GMT (envelope-from git) Date: Fri, 28 Jan 2022 21:52:40 GMT Message-Id: <202201282152.20SLqeTW069598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8d8b9b560afd - main - sort: Fix message catalogue usage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d8b9b560afdf88f5537f259a4a14660d2a85b1f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643406760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYqZe43La18tmSDtyHQH5BQJ1U5JBNcTmfrQx5cTDIk=; b=HqunKTqc21q0NThxPEhuovqytUGKmU1PNy6t4+CLRba9RY6jFF6IweGaqHaYop5x3Eeu6m UxSOeP53YaHP3BQO19XemN8M2vfeIdpWpbw6Pm+vmft3hai/lO0+PGWzMQkSYik1OsTvId DjZCERH1CpOt3w93wiXiAYUd++AYqhnOQkHGm+WK0AVovPGC0VKoDJWx44i+1/urZByE2U xtrhvIJL+kQclAbzOr9vaoAr2KtYwSVeqLSqhCqtXW/YQohiuhd6qDwNdEoybBCm6fNlZ0 oNt2lOj+a/uvtYxKbqhPM5TaATsEzSMjTrs0FuVo51AawVfhmYerz0LnJ4Y+ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643406760; a=rsa-sha256; cv=none; b=PFmd4Ip0WyWEAxxlAbpFPXcLS263/FkhFLmCDfF1tAtp6MXJk2Gu0qnxeXCXfhOZX7nG6P HDnDrr8AWZM55G9IXU2H1sasCWpkh9H7cxUjaaJlBt7sZ7fR4zQj1iupF5hjh3w2EfG5IC ln2TamsOCK4YEz1fy4hBUg+gOrJT0UN6mua2gy7xCutHY2lc9yz0yK2syWxlCQsu41Muiq 8hmurEqs/ixRtXFyb5bK5vcbKAkF4ikvOXOx8FYrS9Rhk98YWCLV/8P5fzicBq+U/M0UP2 BaAmPZHpadzRwFPih57GMpRKFztFpXr5MMy6Uh+RauRCOKXMKQ8GOOoB7xKoUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8d8b9b560afdf88f5537f259a4a14660d2a85b1f commit 8d8b9b560afdf88f5537f259a4a14660d2a85b1f Author: Mark Johnston AuthorDate: 2022-01-28 17:49:28 +0000 Commit: Mark Johnston CommitDate: 2022-01-28 21:52:29 +0000 sort: Fix message catalogue usage - Check that catopen() succeeded before calling catclose(). musl will crash in the latter if the catalogue descriptor is -1. - Keep the message catalogue open for most of sort(1)'s actual operation. - Don't use catgets(3) to print error messages if catopen(3) had failed. Reviewed by: arichardson, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34081 --- usr.bin/sort/sort.c | 19 ++++++++++--------- usr.bin/sort/sort.h | 3 ++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index 0fbbd9284aad..b7c8107cc22d 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); #ifndef WITHOUT_NLS #include -nl_catd catalog; +nl_catd catalog = (nl_catd)-1; #endif #define OPTIONS "bcCdfghik:Mmno:RrsS:t:T:uVz" @@ -1011,6 +1011,10 @@ main(int argc, char **argv) set_tmpdir(); set_sort_opts(); +#ifndef WITHOUT_NLS + catalog = catopen("sort", NL_CAT_LOCALE); +#endif + fix_obsolete_keys(&argc, argv); while (((c = getopt_long(argc, argv, OPTIONS, long_options, NULL)) @@ -1194,17 +1198,9 @@ main(int argc, char **argv) argv = argv_from_file0; } -#ifndef WITHOUT_NLS - catalog = catopen("sort", NL_CAT_LOCALE); -#endif - if (sort_opts_vals.cflag && sort_opts_vals.mflag) errx(1, "%c:%c: %s", 'm', 'c', getstr(1)); -#ifndef WITHOUT_NLS - catclose(catalog); -#endif - if (keys_num == 0) { keys_num = 1; keys = sort_realloc(keys, sizeof(struct key_specs)); @@ -1343,5 +1339,10 @@ main(int argc, char **argv) sort_free(outfile); +#ifndef WITHOUT_NLS + if (catalog != (nl_catd)-1) + catclose(catalog); +#endif + return (result); } diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h index 96b36a65f4e4..47ce6ea29ab3 100644 --- a/usr.bin/sort/sort.h +++ b/usr.bin/sort/sort.h @@ -49,7 +49,8 @@ #include extern nl_catd catalog; -#define getstr(n) catgets(catalog, 1, n, nlsstr[n]) +#define getstr(n) \ + (catalog == (nl_catd)-1 ? nlsstr[n] : catgets(catalog, 1, n, nlsstr[n])) #endif extern const char *nlsstr[];