lobase

Linux port of OpenBSDs userland.
Log | Files | Refs | README

commit 6488f4f09ed83692451bae5a666ccf1369b39a1a
parent 251af6bed4f12edfbf39656a5577a2f46cf94cae
Author: Duncaen <mail@duncano.de>
Date:   Fri, 19 May 2017 18:01:56 +0200

usr.bin/ul: update to OPENBSD_6_1

Diffstat:
usr.bin/ul/ul.1 | 10+++++-----
usr.bin/ul/ul.c | 5++---
2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ul.1,v 1.16 2016/01/18 17:34:26 schwarze Exp $ +.\" $OpenBSD: ul.1,v 1.17 2016/10/24 13:46:58 schwarze Exp $ .\" $NetBSD: ul.1,v 1.3 1994/12/07 00:28:23 jtc Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)ul.1 8.1 (Berkeley) 6/6/93 .\" -.Dd $Mdocdate: January 18 2016 $ +.Dd $Mdocdate: October 24 2016 $ .Dt UL 1 .Os .Sh NAME @@ -153,10 +153,10 @@ Overrides the terminal type specified in the environment with .Sh ENVIRONMENT .Bl -tag -width LC_CTYPE .It Ev LC_CTYPE -The character set +The character encoding .Xr locale 1 . -It decides which byte sequences form characters, which characters are -printable, and how many output display columns each character occupies. +It decides which byte sequences form characters, which characters +are printable, and what their display width is. If set to .Qq C , .Qq POSIX , diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ul.c,v 1.21 2016/03/26 08:59:29 natano Exp $ */ +/* $OpenBSD: ul.c,v 1.23 2016/10/16 11:28:54 jca Exp $ */ /* $NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $ */ /* @@ -364,7 +364,7 @@ flushln(void) } if (lastmode != NORMAL) msetmode(0); - if (must_overstrike && hadmodes) + if (must_overstrike && hadmodes && !iflag) overstrike(); putwchar(L'\n'); if (iflag && hadmodes) @@ -382,7 +382,6 @@ flushln(void) void overstrike(void) { - wchar_t wc; int i, j, needspace; putwchar(L'\r');