diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2009-01-04 00:20:18 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2009-01-04 00:20:18 +0000 |
| commit | 67ac7fd74816fa1d7314c2678b8788cef0f0c867 (patch) | |
| tree | 622153b1edc9e5962f62b9cf438dff83c8c514bd /sys/dev/syscons | |
| parent | d5474fd85f6d8044976511534faa78061d078efe (diff) | |
Notes
Diffstat (limited to 'sys/dev/syscons')
| -rw-r--r-- | sys/dev/syscons/teken/teken.c | 6 | ||||
| -rw-r--r-- | sys/dev/syscons/teken/teken_demo.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/syscons/teken/teken.c b/sys/dev/syscons/teken/teken.c index acf35f7635e7..b3c8bd42592d 100644 --- a/sys/dev/syscons/teken/teken.c +++ b/sys/dev/syscons/teken/teken.c @@ -53,10 +53,14 @@ static FILE *df; #include "teken_wcwidth.h" #else /* !TEKEN_UTF8 */ static inline int -teken_wcwidth(teken_char_t c) +teken_wcwidth(teken_char_t c __unused) { +#ifdef TEKEN_CONS25 + return (1); +#else /* !TEKEN_CONS25 */ return (c <= 0x1B) ? -1 : 1; +#endif /* TEKEN_CONS25 */ } #endif /* TEKEN_UTF8 */ diff --git a/sys/dev/syscons/teken/teken_demo.c b/sys/dev/syscons/teken/teken_demo.c index 74b4321ae7e8..acea4f7f099e 100644 --- a/sys/dev/syscons/teken/teken_demo.c +++ b/sys/dev/syscons/teken/teken_demo.c @@ -280,7 +280,9 @@ main(int argc __unused, char *argv[] __unused) exit(1); case 0: setenv("TERM", "cons25", 1); +#ifdef TEKEN_UTF8 setenv("LC_CTYPE", "UTF-8", 0); +#endif /* TEKEN_UTF8 */ execlp("zsh", "-zsh", NULL); execlp("bash", "-bash", NULL); execlp("sh", "-sh", NULL); |