ls: versort incompatible w/ timesort and sizesort

ls.1: versort incompatible w/ timesort and sizesort

Reviewed by: imp
Pull Request: #825

(cherry picked from commit d854370)

bin/ls/ls.1

@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
 .\"
-.Dd July 18, 2023
+.Dd January 12, 2024
 .Dt LS 1
 .Os
 .Sh NAME
@@ -459,9 +459,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

bin/ls/ls.c

@@ -325,14 +325,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 ',':
@@ -446,9 +453,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;