From ad4499e38234f977ed8c3b0ae689f470db5916cc Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Thu, 5 May 2005 23:02:28 +0000
Subject: [PATCH] Fix up the help message.

---
 fw.c | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/fw.c b/fw.c
index 85e6573..6f886e5 100644
--- a/fw.c
+++ b/fw.c
@@ -417,7 +417,7 @@ static void version(FILE *fp)
 
 static void usage(FILE *fp)
 {
-  pquis(fp, "Usage: $ [-dql] [-f file] [config statements...]\n");
+  pquis(fp, "Usage: $ [-dql] [-p PIDFILE] [-f FILE] [CONFIG-STMTS...]\n");
 }
 
 static void help(FILE *fp)
@@ -427,22 +427,7 @@ static void help(FILE *fp)
   usage(fp);
   pquis(fp, "\n\
 An excessively full-featured port-forwarder, which subsumes large chunks\n\
-of the functionality of inetd, netcat, and normal cat.  Options available\n\
-are:\n\
-\n\
--h, --help	  Display this help message.\n\
--v, --version	  Display the program's version number.\n\
--u, --usage	  Display a terse usage summary.\n\
-\n\
--G, --grammar	  Show a summary of the configuration language.\n\
--O, --options	  Show a summary of the source and target options.\n\
-\n\
--f, --file=FILE	  Read configuration from a file.\n\
--q, --quiet	  Don't emit any logging information.\n\
--d, --daemon	  Fork into background after initializing.\n\
--l, --syslog	  Send log output to the system logger.\n\
--s, --setuid=USER Change uid to USER after initializing sources.\n\
--g, --setgid=GRP  Change gid to GRP after initializing sources.\n\
+of the functionality of inetd, netcat, and normal cat.\n\
 \n\
 Configuration may be supplied in one or more configuration files, or on\n\
 the command line (or both).  If no `-f' option is present, and no\n\
@@ -455,6 +440,26 @@ to be a separate line.\n\
 \n\
 The grammar is fairly complicated.  For a summary, run `$ --grammar'.\n\
 For a summary of the various options, run `$ --options'.\n\
+\n\
+Options available are:\n\
+\n\
+Help options:\n\
+  -h, --help           Display this help message.\n\
+  -v, --version        Display the program's version number.\n\
+  -u, --usage          Display a terse usage summary.\n\
+\n\
+Configuration summary:\n\
+  -G, --grammar        Show a summary of the configuration language.\n\
+  -O, --options        Show a summary of the source and target options.\n\
+\n\
+Other options:\n\
+  -f, --file=FILE      Read configuration from a file.\n\
+  -q, --quiet          Don't emit any logging information.\n\
+  -d, --daemon         Fork into background after initializing.\n\
+  -p, --pidfile=FILE   Write process-id to the named FILE.\n\
+  -l, --syslog         Send log output to the system logger.\n\
+  -s, --setuid=USER    Change uid to USER after initializing sources.\n\
+  -g, --setgid=GRP     Change gid to GRP after initializing sources.\n\
 ");
 }
 
-- 
2.11.0