From 438ad4ce2cffc27b2471b213c48f73375608510e Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Fri, 13 Mar 2015 21:17:33 -0500
Subject: Clean up sort help text.
Use tabs for option indent and don't have -g show up in menu (TOYBOX_FLOAT is
the decision).
---
toys/posix/sort.c | 36 +++++++++++++++++-------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/toys/posix/sort.c b/toys/posix/sort.c
index c9f887d9..b7e16c97 100644
--- a/toys/posix/sort.c
+++ b/toys/posix/sort.c
@@ -14,9 +14,9 @@ config SORT
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 @@ config SORT_BIG
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 @@ config SORT_BIG
(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
--
cgit v1.2.3