Switch (non-curses, non-ksh) programs that use COLUMNS to a single idiom.

Previously behaviors were all over the map. This changes them to
use COLUMNS first, and either terminal width or a hardcoded value
(typically 80) as appropriate.

ok deraadt@; man bits ok jmc@

1 files changed, 8 insertions, 6 deletions

diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 0d9cc32b157..5c35c1bf95b 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ls.1,v 1.74 2016/03/11 02:35:57 bentley Exp $
+.\"	$OpenBSD: ls.1,v 1.75 2016/03/17 05:27:10 bentley Exp $
 .\"	$NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
 .\"
-.Dd $Mdocdate: March 11 2016 $
+.Dd $Mdocdate: March 17 2016 $
 .Dt LS 1
 .Os
 .Sh NAME
@@ -436,10 +436,12 @@ option is not specified, the block counts
 .Fl s )
 will be displayed in units of that size block.
 .It Ev COLUMNS
-If this variable contains a string representing a
-decimal integer, it is used as the
-column position width for displaying
-multiple-text-column output.
+If set to a positive integer,
+.Nm Ns 's
+output is formatted to the given width in columns.
+Otherwise,
+.Nm
+defaults to the terminal width, or 80 columns if the output is not a terminal.
 .It Ev LC_CTYPE
 If set to a string ending in
 .Qq .UTF-8 ,