diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2006-03-24 17:09:03 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2006-03-24 17:09:03 +0000 |
| commit | 93a5035fd721105b87d3a6a011e7b467062e9657 (patch) | |
| tree | c69754f4e580a5b01fa76b7b989b57cc6041e53f /bin/ls | |
| parent | 86cca1e75ed02a39d8fd8785fa8db8de71a72cfb (diff) | |
Notes
Diffstat (limited to 'bin/ls')
| -rw-r--r-- | bin/ls/ls.1 | 7 | ||||
| -rw-r--r-- | bin/ls/ls.c | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index 09abb13ba48d..becfa76ea06e 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -272,6 +272,13 @@ options all override each other; the last one specified determines the file time used. .Pp The +.Fl S +and +.Fl t +options override each other; the last one specified determines +the sort order used. +.Pp +The .Fl B , b , w , and .Fl q diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 053803cf2ec5..e9a6e652dd77 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -304,11 +304,14 @@ main(int argc, char *argv[]) case 'T': f_sectime = 1; break; + /* The -t and -S options override each other. */ case 't': f_timesort = 1; + f_sizesort = 0; break; case 'S': f_sizesort = 1; + f_timesort = 0; break; case 'W': f_whiteout = 1; |
