Change the -g flag from a no-op to be POSIX conforming. We allow the

-l flag to override -g regardless of its position on the command line
for backwards compat with 4.3BSD.  From NetBSD.
OK jmc@, tom@, sobrado@

1 files changed, 25 insertions, 11 deletions

diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index dfc7c7ff77b..eec8842bf8c 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ls.1,v 1.47 2007/03/03 23:26:12 jmc Exp $
+.\"	$OpenBSD: ls.1,v 1.48 2007/05/07 18:39:28 millert Exp $
 .\"	$NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -111,8 +111,9 @@ after each that is a FIFO.
 .It Fl f
 Output is not sorted.
 .It Fl g
-Does nothing; kept for compatibility with older versions of
-.Nm ls .
+The same as
+.Fl l ,
+except that the owner is not printed.
 .It Fl h
 When used with a long format
 option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte,
@@ -198,11 +199,19 @@ Multi-column output sorted across the page rather than down the page.
 The
 .Fl 1 ,
 .Fl C ,
+.Fl g ,
 .Fl l ,
 and
 .Fl n
 options all override each other; the last one specified determines
-the format used.
+the format used with the exception that if both
+.Fl l
+and
+.Fl g
+are specified,
+.Fl l
+will always override
+.Fl g .
 .Pp
 The
 .Fl c
@@ -446,15 +455,20 @@ printed first:
 .Xr symlink 7 ,
 .Xr sticky 8
 .Sh STANDARDS
-The group field is now automatically included in the long listing for
-files in order to be compatible with the
-.St -p1003.2
-specification.
-.Pp
 The
 .Nm
-utility is expected to be a superset of the
-.St -p1003.2
+utility is a superset of the
+.St -p1003.1-2004
+specification.
+.Pp
+Historically, the
+.Fl g
+flag was used to specify that the group field be included in long listings.
+The group field is now automatically included in the long listing for
+files and the meaning of the
+.Fl g
+flag has been changed in order to be compatible with the
+.St -p1003.1-2004
 specification.
 .Sh HISTORY
 An