diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2018-11-28 14:23:06 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2018-11-28 14:23:06 +0000 |
| commit | f5913930621e7ef5c5cf923087225c5f9ebe1a65 (patch) | |
| tree | 0ed7ac695a8b634df93b4fdb84d9d10723a8f2f0 | |
| parent | 1fbcae9f084d687e46140f0d74377f522c899f5e (diff) | |
| download | mandoc-f5913930621e7ef5c5cf923087225c5f9ebe1a65.tar.gz mandoc-f5913930621e7ef5c5cf923087225c5f9ebe1a65.tar.zst mandoc-f5913930621e7ef5c5cf923087225c5f9ebe1a65.zip | |
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).
| -rw-r--r-- | term_ascii.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 <kristaps@bsd.lv> * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> @@ -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; |