From owner-svn-src-head@freebsd.org Sat Aug 24 15:50:14 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D538C30C6; Sat, 24 Aug 2019 15:50:14 +0000 (UTC) (envelope-from eugen@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46G2lp1Qn6z3MPY; Sat, 24 Aug 2019 15:50:14 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 128C2759A; Sat, 24 Aug 2019 15:50:14 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7OFoDQE037927; Sat, 24 Aug 2019 15:50:13 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7OFoD80037926; Sat, 24 Aug 2019 15:50:13 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201908241550.x7OFoD80037926@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Sat, 24 Aug 2019 15:50:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351459 - head/usr.bin/last X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/usr.bin/last X-SVN-Commit-Revision: 351459 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Aug 2019 15:50:14 -0000 Author: eugen Date: Sat Aug 24 15:50:13 2019 New Revision: 351459 URL: https://svnweb.freebsd.org/changeset/base/351459 Log: last(1): correction after r351413 Make that change no-op for C/POSIX locale just like for UTF-8 that it superset of US-ASCII. MFC after: 2 weeks X-MFC-With: r351413 Modified: head/usr.bin/last/last.c Modified: head/usr.bin/last/last.c ============================================================================== --- head/usr.bin/last/last.c Sat Aug 24 15:38:07 2019 (r351458) +++ head/usr.bin/last/last.c Sat Aug 24 15:50:13 2019 (r351459) @@ -92,8 +92,8 @@ static const char *crmsg; /* cause of last reboot */ static time_t currentout; /* current logout value */ static long maxrec; /* records to display */ static const char *file = NULL; /* utx.log file */ +static int noctfix = 0; /* locale is C or UTF-8 */ static int sflag = 0; /* show delta in seconds */ -static int utf8flag; /* current locale is UTF-8 */ static int width = 5; /* show seconds in delta */ static int yflag; /* show year */ static int d_first; @@ -120,7 +120,7 @@ ctf(const char *fmt) { const char *src, *end; char *dst; - if (utf8flag) + if (noctfix) return (fmt); end = buf + sizeof(buf); @@ -158,7 +158,9 @@ main(int argc, char *argv[]) d_first = (*nl_langinfo(D_MD_ORDER) == 'd'); (void) setlocale(LC_CTYPE, ""); - utf8flag = (strcmp(nl_langinfo(CODESET), "UTF-8") == 0); + p = nl_langinfo(CODESET); + if (strcmp (p, "UTF-8") == 0 || strcmp (p, "US-ASCII") == 0) + noctfix = 1; argc = xo_parse_args(argc, argv); if (argc < 0)