A bit more uniformity in those --help messages wouldn't go amiss.

git-svn-id: svn://svn.tartarus.org/sgt/utils@4874 cda61777-01e9-0310-a592-d414129be87e

diff --git a/base64/base64.c b/base64/base64.c
index 512f793..1c3d39e 100644 (file)
--- a/base64/base64.c
+++ b/base64/base64.c
@@ -83,12 +83,12 @@ void base64_encode_atom(unsigned char *data, int n, char *out) {
 const char usagemsg[] =
     "usage: base64 [-d] [filename]        decode from a file or from stdin\n"
     "   or: base64 -e [-cNNN] [filename]  encode from a file or from stdin\n"
-    " also: base64 --version              report version number\n"
-    "       base64 --help                 display this help text\n"
-    "       base64 --licence              display the (MIT) licence text\n"
     "where: -d     decode mode (default)\n"
     "       -e     encode mode\n"
     "       -cNNN  set number of chars per line for encoded output\n"
+    " also: base64 --version              report version number\n"
+    "       base64 --help                 display this help text\n"
+    "       base64 --licence              display the (MIT) licence text\n"
     ;
 
 void usage(void) {

diff --git a/cvt-utf8/cvt-utf8 b/cvt-utf8/cvt-utf8
index a3fff92..7a854c0 100755 (executable)
--- a/cvt-utf8/cvt-utf8
+++ b/cvt-utf8/cvt-utf8
@@ -216,16 +216,16 @@ def do(args):
        process_utf8(liststepper(list))
 
 def usage(arg):
-    print "Usage: cvt-utf8 [flags] <hex UTF-8 bytes and/or U+codepoints>"
+    print "usage: cvt-utf8 [flags] <hex UTF-8 bytes and/or U+codepoints>"
     print "  e.g. cvt-utf8 e2 82 ac"
     print "    or cvt-utf8 U+20ac"
     print "    or cvt-utf8 U-10ffff"
     print ""
-    print "Flags: -o or --output        just output well-formed UTF-8 instead of"
+    print "where: -o or --output        just output well-formed UTF-8 instead of"
     print "                             an analysis of the input data"
     print "       -h or --han           also give Han definitions from unihan db"
     print ""
-    print "Also:  cvt-utf8 --test       run Markus Kuhn's decoder stress tests" #'
+    print " also: cvt-utf8 --test       run Markus Kuhn's decoder stress tests" #'
     print "       cvt-utf8 --input (or -i)"
     print "                             read, analyse and decode UTF-8 from stdin"
     if arg == "--help-admin":

diff --git a/multi/multi b/multi/multi
index a69c682..80f09af 100755 (executable)
--- a/multi/multi
+++ b/multi/multi
@@ -18,10 +18,13 @@
 # variables stay as far out of its likely namespace as they can.
 
 $usage =
-  "usage: multi <cmd> <action> <files>\n" .
+  "usage: multi [flags] <cmd> <action> <files>\n" .
   "  e.g. multi mv 'tr/A-Z/a-z/' *\n" .
-  "   or: multi - <multiple-word-cmd> - <action> <files>\n" .
+  "   or: multi [flags] - <multiple-word-cmd> - <action> <files>\n" .
   "  e.g. multi - svn mv - 'tr/A-Z/a-z/' *\n" .
+  "where: -n                 print commands, but do not execute\n" .
+  "where: -q                 execute commands, but do not print\n" .
+  "where: -r                 reverse order of filenames passed to commands\n" .
   " also: multi --version    report version number\n" .
   "       multi --help       display this help text\n" .
   "       multi --licence    display (MIT) licence text\n";

diff --git a/xcopy/xcopy.c b/xcopy/xcopy.c
index 338b48c..bdd0a13 100644 (file)
--- a/xcopy/xcopy.c
+++ b/xcopy/xcopy.c
@@ -42,14 +42,14 @@ int convert_to_ctext = True;               /* Xmb convert to compound text? */
 
 const char usagemsg[] =
     "usage: xcopy [ -r ] [ -u | -c ] [ -C ]\n"
-    " also: xcopy --version              report version number\n"
-    "       xcopy --help                 display this help text\n"
-    "       xcopy --licence              display the (MIT) licence text\n"
     "where: -r     read X selection and print on stdout\n"
     "       no -r  read stdin and store in X selection\n"
     "       -u     work with UTF8_STRING type selections\n"
     "       -c     work with COMPOUND_TEXT type selections\n"
     "       -C     suppress automatic conversion to COMPOUND_TEXT\n"
+    " also: xcopy --version              report version number\n"
+    "       xcopy --help                 display this help text\n"
+    "       xcopy --licence              display the (MIT) licence text\n"
     ;
 
 void usage(void) {