From nobody Wed Oct 12 14:25:07 2022 X-Original-To: dev-commits-src-all@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 4MnZg73QF6z4fSjw; Wed, 12 Oct 2022 14:25:07 +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 4MnZg72cBjz45Hj; Wed, 12 Oct 2022 14:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665584707; 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=PdT4XM8QwkbkowlhU/SI5ffjEg+wOIE6S+PH9Mese1o=; b=dQd6LY6Go9swu2knIoVPPiA5PcNdGqQ8SPajJCwANi3obEE7z3C6JVHwrC5g/8S/xhjutD eF22s8/5EnWdpKT05cUh9WcxGCKIPrAt1cZIIRzb/1bxfNHDt0mlanDtUSeZOHlpjSoWns hKKldLR3mbXPuTW53i6jZWajKTtnZU4M9zO9FF/+smuKFJjtZgdckPQSeb2Fvg8EbDk78s k51zVR/9YAVt2qIrgtYEtF453E/lfiUINvHztH4fxMX0sDqATyKvS36GN7qE8nL/DYCm3J GwmX5jxFA965vQX1E4+9RAxI52i7KY8utNMQ2X1f3G5kJ1OA9jZAD4bUSAOm7g== 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 4MnZg71Y4hz1KvR; Wed, 12 Oct 2022 14:25:07 +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 29CEP7nv032171; Wed, 12 Oct 2022 14:25:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29CEP79x032170; Wed, 12 Oct 2022 14:25:07 GMT (envelope-from git) Date: Wed, 12 Oct 2022 14:25:07 GMT Message-Id: <202210121425.29CEP79x032170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: ed990a7a2ff8 - main - sort: remove NLS support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed990a7a2ff8899314f512dda045b90f1027b9aa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665584707; 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=PdT4XM8QwkbkowlhU/SI5ffjEg+wOIE6S+PH9Mese1o=; b=CqH7tWufdPSQpD86f6uohVVlG1DIwQnW3gSO7kMIAfh2b4QImksVJbbs06g8vigfsKm8l+ FkWbLgLp86ES7wxRMxqoZ/FeTHpXeyaP8JrbN/hj1aWeTai59JFpUidMmNhcOcNeyZRO2R +OL23v5DffDADhXpTItnMpu2eCRo5TY99GdLza9VR70aNFHC2qHc5sTssVxIkHfM8AuCr+ zfRr2tmJvkhwUdlU4/MaznRcMp7N0LGhg0AddTuFVZksohb1Ju95yTvReCkwNuQmMbGEN2 5VRU9ciu+uHAUtAcM9S9KXv5Qn+kKLve1VDw79xXfaDW+O2NqUToRfWPq8Hqjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665584707; a=rsa-sha256; cv=none; b=RdbvcR1OalPTXSWISl27y+BQMthkptnH226AqZXxfe1XUukssMy/40C7/krwuT1bR7Nlfm AkoUzOyTxb9fqyaml17kesr60G0YTfMfIL3K5XNJFoUei2DLZpJJDQnAuJNtXIpdruKY89 a5kEF057ItXjbEil4z5bU4nF5YYoUUdLiQ3YtExBk2t0rFdiWUc6fInK+xXuXtuI3hQdjj 64A3hTIbu/xR515Vlq/3Xb6UFpG+xOX3+/qrpfJ1/rUao6H7F+8DwU711yix940eOPfPJm VEvHCfh9Z9F+QpT2gPuFXBm7wU4V36kpubj/oYMgrj/0Xn5f4MkTqu49X2Hk1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ed990a7a2ff8899314f512dda045b90f1027b9aa commit ed990a7a2ff8899314f512dda045b90f1027b9aa Author: Baptiste Daroussin AuthorDate: 2022-10-12 14:18:59 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-12 14:24:29 +0000 sort: remove NLS support NLS support for sort(1) is: 1/ incomplete: many error string are not using nls 2/ only covers hu_HU.ISO8859-2 --- ObsoleteFiles.inc | 3 +++ tools/build/mk/OptionalObsoleteFiles.inc | 1 - usr.bin/sort/Makefile | 12 ------------ usr.bin/sort/nls/C.msg | 16 ---------------- usr.bin/sort/nls/hu_HU.ISO8859-2.msg | 16 ---------------- usr.bin/sort/sort.1.in | 2 -- usr.bin/sort/sort.c | 17 +---------------- usr.bin/sort/sort.h | 8 -------- 8 files changed, 4 insertions(+), 71 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 6cccea90c74f..d5c8744d9c4c 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20221012: remove nls support from sort +OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/sort.cat + # 20221003: ip6protosw.h removed OLD_FILES+=usr/include/netinet6/ip6protosw.h diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index f0ddd90b784c..979225d24b99 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6361,7 +6361,6 @@ OLD_DIRS+=usr/share/nls/hu_HU.ISO8859-2 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/grep.cat OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/libc.cat -OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/sort.cat OLD_DIRS+=usr/share/nls/hr_HR.UTF-8 OLD_DIRS+=usr/share/nls/hu_HU.UTF-8 OLD_DIRS+=usr/share/nls/hy_AM.ARMSCII-8 diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile index 40cd99086b95..1192b26b3252 100644 --- a/usr.bin/sort/Makefile +++ b/usr.bin/sort/Makefile @@ -21,18 +21,6 @@ LIBADD= md MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g' .endif -.if ${MK_NLS} != "no" -NLS+= hu_HU.ISO8859-2 -NLSSRCFILES= ${NLS:S@$@.msg@} -MAN_SUB+= -e 's|%%NLS%%||g' -.for lang in ${NLS} -NLSSRCDIR_${lang}= ${.CURDIR}/nls -.endfor -.else -CFLAGS+= -DWITHOUT_NLS -MAN_SUB+= -e 's|%%NLS%%|\.\\"|g' -.endif - HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/usr.bin/sort/nls/C.msg b/usr.bin/sort/nls/C.msg deleted file mode 100644 index 541d1d889647..000000000000 --- a/usr.bin/sort/nls/C.msg +++ /dev/null @@ -1,16 +0,0 @@ -$ $FreeBSD$ -$ -$set 1 -$quote " -1 "mutually exclusive flags" -2 "extra argument not allowed with -c" -3 "Unknown feature" -4 "Wrong memory buffer specification" -5 "0 field in key specs" -6 "0 column in key specs" -7 "Wrong file mode" -8 "Cannot open file for reading" -9 "Radix sort cannot be used with these sort options" -10 "The chosen sort method cannot be used with stable and/or unique sort" -11 "Invalid key position" -12 "Usage: %s [-bcCdfigMmnrsuz] [-kPOS1[,POS2] ... ] [+POS1 [-POS2]] [-S memsize] [-T tmpdir] [-t separator] [-o outfile] [--batch-size size] [--files0-from file] [--heapsort] [--mergesort] [--radixsort] [--qsort] [--nthreads thread_no] [--human-numeric-sort] [--version-sort] [--random-sort [--random-source file]] [--compress-program program] [file ...]\n" diff --git a/usr.bin/sort/nls/hu_HU.ISO8859-2.msg b/usr.bin/sort/nls/hu_HU.ISO8859-2.msg deleted file mode 100644 index 054acc6ad612..000000000000 --- a/usr.bin/sort/nls/hu_HU.ISO8859-2.msg +++ /dev/null @@ -1,16 +0,0 @@ -$ $FreeBSD$ -$ -$set 1 -$quote " -1 "egymást kizáró opciók" -2 "extra argumentum a -%c opcióval" -3 "Ismeretlen funkció\n" -4 "Rossz memória puffer érték" -5 "0 mező a kulcsspecifikációban\n" -6 "0 oszlop a kulcsspecifikációban\n" -7 "Helytelen fájl mód" -8 "A fájl nem nyitható meg olvasásra" -9 "A radix rendezés nem használható a megadott rendezési opciókkal" -10 "A választott rendezési mód nem használható a --stable és --unique opciókkal" -11 "Érvénytelen kulcs pozíció" -12 "Használat: %s [-bcCdfigMmnrsuz] [-kPOS1[,POS2] ... ] [+POS1 [-POS2]] [-S memóriaméret] [-T ideiglenes_könyvtár] [-t elválasztó] [-o kimeneti_fájl] [--batch-size méret] [--files0-from fájl] [--heapsort] [--mergesort] [--radixsort] [--qsort] [--nthreads szálak_száma] [--human-numeric-sort] [--version-sort] [--random-sort [--random-source fájl]] [--compress-program program] [fájl ...]\n" diff --git a/usr.bin/sort/sort.1.in b/usr.bin/sort/sort.1.in index a6ef4378d778..6aabdd6965d9 100644 --- a/usr.bin/sort/sort.1.in +++ b/usr.bin/sort/sort.1.in @@ -527,8 +527,6 @@ Used as a last resort to determine different kinds of locale-specific behavior if neither the respective environment variable, nor .Ev LC_ALL are set. -%%NLS%%.It Ev NLSPATH -%%NLS%%Path to NLS catalogs. .It Ev TMPDIR Path to the directory in which temporary files will be stored. Note that diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index b7c8107cc22d..25d7e0c624ae 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -55,11 +55,6 @@ __FBSDID("$FreeBSD$"); #include "file.h" #include "sort.h" -#ifndef WITHOUT_NLS -#include -nl_catd catalog = (nl_catd)-1; -#endif - #define OPTIONS "bcCdfghik:Mmno:RrsS:t:T:uVz" static bool need_random; @@ -67,8 +62,7 @@ static bool need_random; MD5_CTX md5_ctx; /* - * Default messages to use when NLS is disabled or no catalogue - * is found. + * Default messages to use */ const char *nlsstr[] = { "", /* 1*/"mutually exclusive flags", @@ -1011,10 +1005,6 @@ 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)) @@ -1339,10 +1329,5 @@ 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 47ce6ea29ab3..634a9d90c22e 100644 --- a/usr.bin/sort/sort.h +++ b/usr.bin/sort/sort.h @@ -43,15 +43,7 @@ #define VERSION "2.3-FreeBSD" -#ifdef WITHOUT_NLS #define getstr(n) nlsstr[n] -#else -#include - -extern nl_catd catalog; -#define getstr(n) \ - (catalog == (nl_catd)-1 ? nlsstr[n] : catgets(catalog, 1, n, nlsstr[n])) -#endif extern const char *nlsstr[];