New resolver to initialize. Also, include options for grammar and

options references.

diff --git a/fw.c b/fw.c
index 202c3e7..513cb23 100644 (file)
--- a/fw.c
+++ b/fw.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: fw.c,v 1.3 1999/07/26 23:30:42 mdw Exp $
+ * $Id: fw.c,v 1.4 1999/10/10 16:46:12 mdw Exp $
  *
  * Port forwarding thingy
  *
@@ -29,6 +29,10 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: fw.c,v $
+ * Revision 1.4  1999/10/10 16:46:12  mdw
+ * New resolver to initialize.  Also, include options for grammar and
+ * options references.
+ *
  * Revision 1.3  1999/07/26 23:30:42  mdw
  * Major reconstruction work for new design.
  *
@@ -57,6 +61,7 @@
 #include <unistd.h>
 #include <syslog.h>
 
+#include <mLib/bres.h>
 #include <mLib/dstr.h>
 #include <mLib/mdwopt.h>
 #include <mLib/quis.h>
@@ -65,7 +70,6 @@
 #include <mLib/sig.h>
 #include <mLib/sub.h>
 
-#include "bres.h"
 #include "conf.h"
 #include "endpt.h"
 #include "exec.h"
@@ -181,13 +185,12 @@ static void fw_tidy(int n, void *p)
 
 static void version(FILE *fp)
 {
-  fprintf(fp, "%s version " VERSION "\n", QUIS);
+  pquis(fp, "$ version " VERSION "\n");
 }
 
 static void usage(FILE *fp)
 {
-  fprintf(stderr, "Usage: %s [-db] [-f file] [config statements...]\n",
-         QUIS);
+  pquis(fp, "Usage: $ [-db] [-f file] [config statements...]\n");
 }
 
 static void help(FILE *fp)
@@ -195,7 +198,7 @@ static void help(FILE *fp)
   version(fp);
   fputc('\n', fp);
   usage(fp);
-  fputs("\n\
+  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\
@@ -204,6 +207,9 @@ are:\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\
 -d, --daemon           Fork into background after initializing.\n\
 \n\
@@ -216,8 +222,103 @@ Configuration is free-form.  Comments begin with a `#' character and\n\
 continue to the end of the line.  Each command line argument is considered\n\
 to be a separate line.\n\
 \n\
-The syntax is too complicated to describe here.  Read the manual.\n\
-", fp);
+The grammar is fairly complicated.  For a summary, run `$ --grammar'.\n\
+For a summary of the various options, run `$ --options'.\n\
+");
+}
+
+/* --- Other helpful options --- */
+
+static void grammar(FILE *fp)
+{
+  version(fp);
+  pquis(fp, "\n\
+Grammar summary\n\
+\n\
+Basic syntax\n\
+       file ::= empty | file stmt [`;']\n\
+       stmt ::= option-stmt | fw-stmt\n\
+       fw-stmt ::= `fw' source options [`to'|`->'] target options\n\
+       options ::= `{' option-seq `}'\n\
+       option-seq ::= empty | option-stmt [`;'] option-seq\n\
+\n\
+Option syntax\n\
+       option-stmt ::= q-option\n\
+       q-option ::= option\n\
+            | prefix `.' q-option\n\
+            | prefix `{' option-seq `}'\n\
+       prefix ::= word\n\
+\n\
+File source and target\n\
+       source ::= file\n\
+       target ::= file\n\
+       file ::= `file' [`.'] fspec [`,' fspec]\n\
+       fspec ::= fd-spec | name-spec | null-spec\n\
+       fd-spec ::= [[`:']`fd'[`:']] number|`stdin'|`stdout'\n\
+       name-spec ::= [[`:']`file'[`:']] file-name\n\
+       file-name ::= path-seq | [ path-seq ]\n\
+       path-seq ::= path-elt | path-seq path-elt\n\
+       path-elt ::= `/' | word\n\
+       null-spec ::= [`:']`null'[`:']\n\
+\n\
+Exec source and target\n\
+       source ::= exec\n\
+       target ::= exec\n\
+       exec ::= `exec' [`.'] cmd-spec\n\
+       cmd-spec ::= shell-cmd | [prog-name] `[' argv0 arg-seq `]'\n\
+       arg-seq ::= word | arg-seq word\n\
+       shell-cmd ::= word\n\
+       argv0 ::= word\n\
+\n\
+Socket source and target\n\
+       source ::= socket-source\n\
+       target ::= socket-target\n\
+       socket-source ::= [`socket'[`.']] [[`:']addr-type[`:']] source-addr\n\
+       socket-target ::= [`socket'[`.']] [[`:']addr-type[`:']] target-addr\n\
+\n\
+       inet-source-addr ::= [port] port\n\
+       inet-target-addr ::= address [`:'] port\n\
+       address ::= addr-elt | address addr-elt\n\
+       addr-elt ::= `.' | word\n\
+\n\
+       unix-source-addr ::= file-name\n\
+       unix-target-addr ::= file-name\n\
+");
+}
+
+static void options(FILE *fp)
+{
+  version(fp);
+  pquis(fp, "\n\
+Options summary\n\
+\n\
+File attributes (`fattr')\n\
+       prefix.fattr.mode [=] mode\n\
+       prefix.fattr.owner [=] user\n\
+       prefix.fattr.group [=] group\n\
+\n\
+File options\n\
+       file.create [=] yes|no\n\
+       file.open [=] no|truncate|append\n\
+       file.fattr.*\n\
+\n\
+Exec options\n\
+       exec.logging [=] yes|no\n\
+       exec.dir [=] file-name\n\
+       exec.root [=] file-name\n\
+       exec.user [=] user\n\
+       exec.group [=] group\n\
+       exec.rlimit.limit[.hard|.soft] [=] value\n\
+       exec.env.clear\n\
+       exec.env.unset var\n\
+       exec.env.[set] var [=] value\n\
+\n\
+Socket options\n\
+       socket.conn [=] number\n\
+       socket.logging [=] yes|no\n\
+       socket.inet.[allow|deny] [from] address [/ address]\n\
+       socket.unix.fattr.*\n\
+");
 }
 
 /* --- @main@ --- *
@@ -251,6 +352,7 @@ int main(int argc, char *argv[])
   sub_init();
   sig_init(sel);
   bres_init(sel);
+  bres_exec(0);
   exec_init();
   fattr_init(&fattr_global);
   scan_create(&sc);
@@ -272,6 +374,11 @@ int main(int argc, char *argv[])
       { "version",     0,              0,      'v' },
       { "usage",       0,              0,      'u' },
 
+      /* --- Other help options --- */
+
+      { "grammar",     0,              0,      'g' },
+      { "options",     0,              0,      'o' },
+
       /* --- Other useful arguments --- */
 
       { "file",                OPTF_ARGREQ,    0,      'f' },
@@ -283,7 +390,7 @@ int main(int argc, char *argv[])
 
       { 0,             0,              0,      0 }
     };
-    int i = mdwopt(argc, argv, "+hvu f:d", opts, 0, 0, 0);
+    int i = mdwopt(argc, argv, "+hvu go f:d", opts, 0, 0, 0);
 
     if (i < 0)
       break;
@@ -300,6 +407,14 @@ int main(int argc, char *argv[])
        usage(stdout);
        exit(0);
        break;
+      case 'g':
+       grammar(stdout);
+       exit(0);
+       break;
+      case 'o':
+       options(stdout);
+       exit(0);
+       break;
       case 'f':
        if (strcmp(optarg, "-") == 0)
          scan_add(&sc, scan_file(stdin, "<stdin>", SCF_NOCLOSE));