system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-04 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ls: versort incompatible w/ timesort and sizesort

Browse source 
ls.1: versort incompatible w/ timesort and sizesort

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/825
This commit is contained in:
Alexander Ziaee 2024-02-02 13:19:07 -07:00 committed by Warner Losh
parent 834517eff8
commit d854370fa8
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/ls/ls.1
View file

@ -29,7 +29,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.Dd July 18, 2023
.Dd January 12, 2024
.Dt LS 1
.Os
.Sh NAME
@ -457,9 +457,9 @@ options all override each other; the last one specified determines
the file time used.
.Pp
The
.Fl S
.Fl S , t
and
.Fl t
.Fl v
options override each other; the last one specified determines
the sort order used.
.Pp

12
bin/ls/ls.c
View file

@ -313,14 +313,21 @@ main(int argc, char *argv[])
case 'A':
f_listdot = 1;
break;
/* The -t and -S options override each other. */
/* The -S, -t and -v options override each other. */
case 'S':
f_sizesort = 1;
f_timesort = 0;
f_verssort = 0;
break;
case 't':
f_timesort = 1;
f_sizesort = 0;
f_verssort = 0;
break;
case 'v':
f_verssort = 1;
f_sizesort = 0;
f_verssort = 0;
break;
/* Other flags. Please keep alphabetic. */
case ',':
@ -434,9 +441,6 @@ main(int argc, char *argv[])
case 's':
f_size = 1;
break;
case 'v':
f_verssort = 1;
break;
case 'w':
f_nonprint = 0;
f_octal = 0;