From f5913930621e7ef5c5cf923087225c5f9ebe1a65 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 28 Nov 2018 14:23:06 +0000 Subject: Bugfix: never set termp->enc to the ambiguous value TERMENC_LOCALE, but instead set it to TERMENC_UTF8 or TERMENC_ASCII. Makes tbl(7) box drawing work under -T locale (that is, by default when LC_CTYPE is defined appropriately). --- term_ascii.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'term_ascii.c') diff --git a/term_ascii.c b/term_ascii.c index 4ff93da1..368623ca 100644 --- a/term_ascii.c +++ b/term_ascii.c @@ -1,4 +1,4 @@ -/* $Id: term_ascii.c,v 1.63 2018/08/21 16:06:48 schwarze Exp $ */ +/* $Id: term_ascii.c,v 1.64 2018/11/28 14:23:06 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze @@ -90,7 +90,7 @@ ascii_init(enum termenc enc, const struct manoutput *outopts) p->width = ascii_width; #if HAVE_WCHAR - if (TERMENC_ASCII != enc) { + if (enc != TERMENC_ASCII) { /* * Do not change any of this to LC_ALL. It might break @@ -99,7 +99,7 @@ ascii_init(enum termenc enc, const struct manoutput *outopts) * worst case, it might even cause buffer overflows. */ - v = TERMENC_LOCALE == enc ? + v = enc == TERMENC_LOCALE ? setlocale(LC_CTYPE, "") : setlocale(LC_CTYPE, UTF8_LOCALE); @@ -113,7 +113,7 @@ ascii_init(enum termenc enc, const struct manoutput *outopts) v = setlocale(LC_CTYPE, "C"); if (v != NULL && MB_CUR_MAX > 1) { - p->enc = enc; + p->enc = TERMENC_UTF8; p->advance = locale_advance; p->endline = locale_endline; p->letter = locale_letter; -- cgit v1.2.3-56-ge451