Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin/ls Sort options (AaBb...).



details:   https://anonhg.NetBSD.org/src/rev/57839fc98297
branches:  trunk
changeset: 551234:57839fc98297
user:      wiz <wiz%NetBSD.org@localhost>
date:      Tue Sep 02 08:36:20 2003 +0000

description:
Sort options (AaBb...).

diffstat:

 bin/ls/ls.1   |  54 +++++++++++++++++++++++++++---------------------------
 bin/ls/util.c |   6 +++---
 2 files changed, 30 insertions(+), 30 deletions(-)

diffs (140 lines):

diff -r 7b55aca4ef84 -r 57839fc98297 bin/ls/ls.1
--- a/bin/ls/ls.1       Tue Sep 02 07:47:48 2003 +0000
+++ b/bin/ls/ls.1       Tue Sep 02 08:36:20 2003 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ls.1,v 1.41 2003/08/28 19:44:09 wiz Exp $
+.\"    $NetBSD: ls.1,v 1.42 2003/09/02 08:36:20 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
 .\"    The Regents of the University of California.  All rights reserved.
@@ -40,7 +40,7 @@
 .Nd list directory contents
 .Sh SYNOPSIS
 .Nm
-.Op Fl ACFLRSTWacdfgiklmnopqrstux1
+.Op Fl AaCcdFfgikLlmnopqRrSsTtuWx1
 .Op Ar
 .Sh DESCRIPTION
 For each operand that names a
@@ -73,8 +73,17 @@
 and
 .Ql \&.. .
 Always set for the super-user.
+.It Fl a
+Include directory entries whose names begin with a
+dot
+.Pq Sq \&. .
 .It Fl C
 Force multi-column output; this is the default when output is to a terminal.
+.It Fl c
+Use time when file status was last changed for sorting or printing.
+.It Fl d
+Directories are listed as plain files (not searched recursively) and
+symbolic links in the argument list are not indirected through.
 .It Fl F
 Display a slash
 .Pq Sq \&/
@@ -95,31 +104,6 @@
 .Pq Sq \&|
 after each that is a
 .Tn FIFO .
-.It Fl L
-If argument is a symbolic link, list the file or directory the link references
-rather than the link itself.
-.It Fl R
-Recursively list subdirectories encountered.
-.It Fl S
-Sort by size, largest file first.
-.It Fl T
-When used with the
-.Fl l
-(the lowercase letter
-.Dq ell )
-option, display complete time information for the file, including
-month, day, hour, minute, second, and year.
-.It Fl W
-Display whiteouts when scanning directories.
-.It Fl a
-Include directory entries whose names begin with a
-dot
-.Pq Sq \&. .
-.It Fl c
-Use time when file status was last changed for sorting or printing.
-.It Fl d
-Directories are listed as plain files (not searched recursively) and
-symbolic links in the argument list are not indirected through.
 .It Fl f
 Output is not sorted.
 .It Fl g
@@ -132,6 +116,9 @@
 Modifies the
 .Fl s
 option, causing the sizes to be reported in kilobytes.
+.It Fl L
+If argument is a symbolic link, list the file or directory the link references
+rather than the link itself.
 .It Fl l
 (The lowercase letter
 .Dq ell ) .
@@ -165,14 +152,25 @@
 the character
 .Sq \&? ;
 this is the default when output is to a terminal.
+.It Fl R
+Recursively list subdirectories encountered.
 .It Fl r
 Reverse the order of the sort to get reverse
 lexicographical order or the smallest or oldest entries first.
+.It Fl S
+Sort by size, largest file first.
 .It Fl s
 Display the number of file system blocks actually used by each file, in units
 of 512 bytes, where partial units are rounded up to the next integer value.
 If the output is to a terminal, a total sum for all the file
 sizes is output on a line before the listing.
+.It Fl T
+When used with the
+.Fl l
+(the lowercase letter
+.Dq ell )
+option, display complete time information for the file, including
+month, day, hour, minute, second, and year.
 .It Fl t
 Sort by time modified (most recently modified
 first) before sorting the operands by lexicographical
@@ -184,6 +182,8 @@
 .Pq Fl t
 or printing
 .Pq Fl l .
+.It Fl W
+Display whiteouts when scanning directories.
 .It Fl x
 Multi-column output sorted across the page rather than down the page.
 .It Fl \&1
diff -r 7b55aca4ef84 -r 57839fc98297 bin/ls/util.c
--- a/bin/ls/util.c     Tue Sep 02 07:47:48 2003 +0000
+++ b/bin/ls/util.c     Tue Sep 02 08:36:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.24 2003/08/07 09:05:16 agc Exp $    */
+/*     $NetBSD: util.c,v 1.25 2003/09/02 08:36:21 wiz Exp $    */
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)util.c     8.5 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: util.c,v 1.24 2003/08/07 09:05:16 agc Exp $");
+__RCSID("$NetBSD: util.c,v 1.25 2003/09/02 08:36:21 wiz Exp $");
 #endif
 #endif /* not lint */
 
@@ -72,7 +72,7 @@
 {
 
        (void)fprintf(stderr,
-           "usage: ls [-ACFLRSTWacdfgiklmnopqrstux1] [file ...]\n");
+           "usage: ls [-AaCcdFfgikLlmnopqRrSsTtuWx1] [file ...]\n");
        exit(EXIT_FAILURE);
        /* NOTREACHED */
 }



Home | Main Index | Thread Index | Old Index