diff options
| author |   schwarze <schwarze@openbsd.org> | 2018-11-28 14:23:02 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2018-11-28 14:23:02 +0000 |
| commit | 53d61c88d76d5cdbdbbe9d2fe1d44f3a9fb11ec4 (patch) | |
| tree | 9a3315d811741596cb1323797e8fdb944555e017 | |
| parent | additional check needed after the previous (box drawing) patch (diff) | |
| download | wireguard-openbsd-53d61c88d76d5cdbdbbe9d2fe1d44f3a9fb11ec4.tar.xz wireguard-openbsd-53d61c88d76d5cdbdbbe9d2fe1d44f3a9fb11ec4.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-- | usr.bin/mandoc/term_ascii.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/mandoc/term_ascii.c b/usr.bin/mandoc/term_ascii.c index 2f1f26dac89..b2cc0e84f4c 100644 --- a/usr.bin/mandoc/term_ascii.c +++ b/usr.bin/mandoc/term_ascii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: term_ascii.c,v 1.48 2018/08/21 16:01:38 schwarze Exp $ */ +/* $OpenBSD: term_ascii.c,v 1.49 2018/11/28 14:23:02 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> @@ -79,7 +79,7 @@ ascii_init(enum termenc enc, const struct manoutput *outopts) p->setwidth = ascii_setwidth; p->width = ascii_width; - if (TERMENC_ASCII != enc) { + if (enc != TERMENC_ASCII) { /* * Do not change any of this to LC_ALL. It might break @@ -88,7 +88,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, "en_US.UTF-8"); @@ -102,7 +102,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; |