changeset 1737:052b608826a3

Clean up sort help text. Use tabs for option indent and don't have -g show up in menu (TOYBOX_FLOAT is the decision).
author Rob Landley <rob@landley.net>
date Fri, 13 Mar 2015 21:17:33 -0500
parents 5892daac85ab
children 783dc27590de
files toys/posix/sort.c
diffstat 1 files changed, 17 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/toys/posix/sort.c	Thu Mar 12 15:34:03 2015 -0500
+++ b/toys/posix/sort.c	Fri Mar 13 21:17:33 2015 -0500
@@ -14,9 +14,9 @@
 
     Sort all lines of text from input files (or stdin) to stdout.
 
-    -r    reverse
-    -u    unique lines only
-    -n    numeric order (instead of alphabetical)
+    -r	reverse
+    -u	unique lines only
+    -n	numeric order (instead of alphabetical)
 
 config SORT_BIG
   bool "SuSv3 options (Support -ktcsbdfiozM)"
@@ -25,18 +25,18 @@
   help
     usage: sort [-bcdfiMsz] [-k#[,#[x]] [-t X]] [-o FILE]
 
-    -b    ignore leading blanks (or trailing blanks in second part of key)
-    -c    check whether input is sorted
-    -d    dictionary order (use alphanumeric and whitespace chars only)
-    -f    force uppercase (case insensitive sort)
-    -i    ignore nonprinting characters
-    -M    month sort (jan, feb, etc).
-    -x    Hexadecimal numerical sort
-    -s    skip fallback sort (only sort with keys)
-    -z    zero (null) terminated input
-    -k    sort by "key" (see below)
-    -t    use a key separator other than whitespace
-    -o    output to FILE instead of stdout
+    -b	ignore leading blanks (or trailing blanks in second part of key)
+    -c	check whether input is sorted
+    -d	dictionary order (use alphanumeric and whitespace chars only)
+    -f	force uppercase (case insensitive sort)
+    -i	ignore nonprinting characters
+    -M	month sort (jan, feb, etc).
+    -x	Hexadecimal numerical sort
+    -s	skip fallback sort (only sort with keys)
+    -z	zero (null) terminated input
+    -k	sort by "key" (see below)
+    -t	use a key separator other than whitespace
+    -o	output to FILE instead of stdout
 
     Sorting by key looks at a subset of the words on each line.  -k2
     uses the second word to the end of the line, -k2,2 looks at only
@@ -46,15 +46,13 @@
     (such as -2,2n) applies only to sorting that key.
 
 config SORT_FLOAT
-  bool "Floating point (-g)"
+  bool
   default y
-  depends on SORT_BIG
+  depends on SORT_BIG && TOYBOX_FLOAT
   help
     usage: sort [-g]
 
     -g	general numeric sort (double precision with nan and inf)
-
-    This version of sort requires floating point.
 */
 
 #define FOR_sort