diff options
| -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 09abb13..becfa76 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 053803c..e9a6e65 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; |
