Fix a segfault in lash, hush, and cmdedit. Each of these used

[oweals/busybox.git] / usage.h

diff --git a/usage.h b/usage.h
index f375dfd1948eedd0695aeb51918d590078326843..78ee628ab59e79ee7c7b65403d6a037c840ec5fc 100644 (file)
--- a/usage.h
+++ b/usage.h
@@ -75,11 +75,12 @@
        "-r--r--r--    1 root     root            0 Apr 12 18:25 /tmp/foo\n"
 
 #define chown_trivial_usage \
-       "[OPTION]...  OWNER[<.|:>[GROUP]] FILE..."
+       "[ -Rh ]...  OWNER[<.|:>[GROUP]] FILE..."
 #define chown_full_usage \
        "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n" \
        "\nOptions:\n" \
-       "\t-R\tChanges files and directories recursively."
+       "\t-R\tChanges files and directories recursively.\n" \
+       "\t-h\tDo not dereference symbolic links."
 #define chown_example_usage \
        "$ ls -l /tmp/foo\n" \
        "-r--r--r--    1 andersen andersen        0 Apr 12 18:25 /tmp/foo\n" \
@@ -115,6 +116,7 @@
 #define cmp_trivial_usage \
        "FILE1 [FILE2]"
 #define cmp_full_usage \
+       "\t-s\tquiet mode - do not print\n" \
        "Compare files."
 
 #define cp_trivial_usage \
@@ -346,7 +348,7 @@
        "Erik\nis\ncool\n"
 
 #define env_trivial_usage \
-       "[-] [-iu] [name=value ...] [command]"
+       "[-iu] [-] [name=value]... [command]"
 #define env_full_usage \
        "Prints the current environment or runs a program after setting\n" \
        "up the specified environment.\n\n" \
@@ -1263,18 +1265,13 @@
 #define reset_full_usage \
        "Resets the screen."
 
-#ifdef BB_FEATURE_RM_INTERACTIVE
-  #define USAGE_RM_INTERACTIVE(a) a
-#else
-  #define USAGE_RM_INTERACTIVE(a)
-#endif
 #define rm_trivial_usage \
        "[OPTION]... FILE..."
 #define rm_full_usage \
        "Remove (unlink) the FILE(s).  You may use '--' to\n" \
        "indicate that all following arguments are non-options.\n\n" \
        "Options:\n" \
-       USAGE_RM_INTERACTIVE("\t-i\t\talways prompt before removing each destinations\n") \
+       "\t-i\t\talways prompt before removing each destinations\n" \
        "\t-f\t\tremove existing destinations, never prompt\n" \
        "\t-r or -R\tremove the contents of directories recursively"
 #define rm_example_usage \
@@ -1356,15 +1353,24 @@
        "[2 second delay results]\n"
 
 
+#ifdef BB_FEATURE_SORT_UNIQUE
+  #define USAGE_SORT_UNIQUE(a) a
+#else
+  #define USAGE_SORT_UNIQUE(a)
+#endif
 #ifdef BB_FEATURE_SORT_REVERSE
   #define USAGE_SORT_REVERSE(a) a
 #else
   #define USAGE_SORT_REVERSE(a)
 #endif
 #define sort_trivial_usage \
-       "[-n]" USAGE_SORT_REVERSE(" [-r]") " [FILE]..."
+       "[-n" USAGE_SORT_REVERSE("r") USAGE_SORT_UNIQUE("u") "] [FILE]..."
 #define sort_full_usage \
-       "Sorts lines of text in the specified files"
+       "Sorts lines of text in the specified files\n\n"\
+       "Options:\n" \
+       USAGE_SORT_UNIQUE("\t-u\tsuppress duplicate lines\n") \
+       USAGE_SORT_REVERSE("\t-r\tsort in reverse order\n") \
+       "\t-n\tsort numerics"
 #define sort_example_usage \
        "$ echo -e \"e\\nf\\nb\\nd\\nc\\na\" | sort\n" \
        "a\n" \