2 files changed, 607 insertions, 161 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 502c46e..d7d69d1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -37,65 +37,33 @@ check-format:
                 false; \
         fi
 
-check-pragmas:
-        @check-docs.sh pragmas \
-           '/} option_cache\[\] = {/,/^}/s/[ \t]*{ *"\(.*\)".*/\1/pg' \
-           's/@deffnx* {pragma option} *\([^@, ]*\) .*/\1/p' \
-           $(top_srcdir)/mfd/main.c -- \
-           $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
-                $(info_TEXINFOS) 
-
 check-options:
         @check-docs.sh options \
            '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
            's/@opindex *\([^@,]*\).*/\1/p' \
-           $(top_srcdir)/mfd/main.c -- \
+           $(top_srcdir)/src/pies.c -- \
            $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
                 $(info_TEXINFOS) 
 
 check-config:
         @check-docs.sh 'configuration statements' \
-           '/mf_cfg_param\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
-           's/@deffn {Pies Conf} *\([^@,]*\).*/\1/p' \
-           $(top_srcdir)/mfd/main.c -- \
+           '/pies_keywords\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
+           's/@deffn {Config} *\([^@,]*\).*/\1/p' \
+           $(top_srcdir)/src/pies.c -- \
            $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
                 $(info_TEXINFOS) 
 
 check-sub-config:
-        @list=`sed -n '/mf_cfg_param\[\] *= *{/,/^}/{s/[ \t]*{ *"\([^,"]*\)", *mu_cfg_section *,.*/\1/pg}' $(top_srcdir)/mfd/main.c`; \
-        for ident in $$list; do \
+        sed -n '/pies_keywords\[\] *= *{/,/^}/{p}' ../src/pies.c|tr  '\n{' ' \n'|sed -n '/grecs_type_section/s/"\([^"]*\)".*grecs_type_section,[^,]*,[^,]*,[^,]*,[^,]*, *\(.*\) *}.*/\1 \2/p' | \
+        while read ident kw; do \
            check-docs.sh "$$ident configuration statements" \
-           "/$${ident}_section_param"'\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
-           "s/@deffn {$${ident}}"' *\([^@,]*\).*/\1/p' \
-           $(top_srcdir)/mfd/main.c -- \
+           "/$$kw"'\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
+           "s/@deffn {Config: *$${ident}}"' *\([^@,]*\).*/\1/p' \
+           $(top_srcdir)/src/pies.c $(top_srcdir)/src/acl.c -- \
            $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
                 $(info_TEXINFOS); \
         done
 
-check-builtins:
-        @check-docs.sh builtins \
-    '/MF_DEFUN/{s/[ \t]*MF_DEFUN *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\1/p;s/[ \t]*MF_DEFUN_VARARGS\(_NO_PROM\)\? *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\2/p;s/[ \t]*MF_DEFUN_CTYPE *(\([a-zA-Z_][a-zA-Z0-9_]*\))/\1/p}'\
-    's/@deftypefnx\{0,1\} {Built-in Function} *[^ ][^ ]* *\([^ ]*\).*/\1/p' \
-    $(top_srcdir)/mfd/bi_*.m4 -- \
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
-                $(info_TEXINFOS) 
-
-check-mflib:
-        @check-docs.sh "library functions" \
-    '/^[ \t]*func[ \t][ \t]*__/b;/^[ \t]*func/s/[ \t]*func[ \t][ \t]*\(.[^ \t(]*\).*/\1/p' \
-    's/@deftypefn {Library Function} *[^ ][^ ]* *\([^ ]*\).*/\1/p' \
-    $(top_srcdir)/mflib/*.mf -- \
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
-                $(info_TEXINFOS)
-
-check-exceptions:
-        @check-docs.sh exceptions \
-     '/typedef enum mf_exception_code {/,/^};/s/[ \t]*mfe_\(.*\),.*/e_\1/p;/typedef enum mf_status_code {/,/^};/s/[ \t]*mf_\(.*\),.*/\1/p' \
-     's/@cindex \([^,][^,]*\), exception type/\1/p'     \
-     $(top_srcdir)/mfd/pies.h -- \
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
-                $(info_TEXINFOS) 
-
 check-refs:
         @for file in $(info_TEXINFOS) $(pies_TEXINFOS); \
         do \
@@ -147,9 +115,8 @@ check-unrevised:
           rm $@-t; \
         fi
 
-all-check-docs: check-format check-options check-pragmas \
+all-check-docs: check-format check-options \
                 check-config check-sub-config \
-                check-builtins check-mflib check-exceptions \
                 check-refs check-fixmes check-writeme check-unrevised
 
 check-docs: 
diff --git a/doc/pies.texi b/doc/pies.texi
index cc35b5d..22c0f83 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -78,27 +78,25 @@ documents @command{pies} Version @value{VERSION}.
 @menu
 * Intro::
 * Pies Configuration File::
-* Component Statement::
-* include-meta1::
-* Global Configuration::
 * Pies Debugging::
 * Configuration Example::
 * Command Line Usage::
 * Pies Invocation::
+* Reporting Bugs::
 
 Appendices
 
 * Copying This Manual::  The GNU Free Documentation License.
 * Concept Index::        Index of Concepts.
 
-@c @detailmenu
-@c @end detailmenu
+@detailmenu
+@end detailmenu
 
 @end menu
 
 @node Intro
 @chapter Introduction
-@cindex component, pies
+@cindex component
   The name @command{pies} (pronounced @samp{p-yes}) stands for
 @samp{Program Invocation and Execution Supervisor}.  This utility
 starts and controls execution of external programs, called
@@ -110,9 +108,9 @@ terminates, @command{pies} restarts it.  Its configuration allows to
 specify actions other than simple restart, depending on the exit code
 of the component.
 
-@cindex prerequisite, pies
-@cindex dependency, pies
-@cindex dependents, pies
+@cindex prerequisite
+@cindex dependency
+@cindex dependents
 @anchor{component prerequisite}
   A component @samp{A} may depend on another components, say
 @samp{B} and @samp{C}, i.e. require them to be running at the moment of its
@@ -131,7 +129,7 @@ redirected to a file or to an arbitrary @command{syslog} channel.
 
 @anchor{init-style}
 @cindex init-style components
-  These way of operation applies to so-called @dfn{init-style}
+  This way of operation applies to the @dfn{init-style}
 components, called so because of the similarity with the
 @command{init} process manager.  @command{Pies} is also able to handle
 components that receive input on their @samp{stdin} and send reply to
@@ -180,40 +178,304 @@ stopping component dependencies, the same ordering is preserved.
   This order is reversed for files included by @code{include-meta1}
 statement (@pxref{include-meta1}).
 
+@node Pies Configuration File
+@chapter Pies Configuration File
+@cindex configuration file
+@flindex pies.conf
+@xopindex{config-file, introduced}
+  @command{Pies} reads its settings and component definitions from the
+@dfn{configuration file} @file{pies.conf}, located in the @dfn{system
+configuration directory} (in most cases @file{/etc} or
+@file{/usr/local/etc}, depending on how the package was compiled).
+An alternative location may be specified using @option{--config-file}
+(@option{-c} command line option.
+
+  If any errors are encountered in the configuration file, the program
+reports them on the standard error and exits with a non-zero status.
+
+@xopindex{lint, introduced}
+  To test the configuration file without actually starting the server, the 
+@option{--lint} (@option{-t}) command line option is provided.  It causes
+@command{pies} to check its configuration file and exit with status 0
+if no errors were detected, and with status 1 otherwise.
+
+@opindex -E, introduced
+  Before parsing, configuration file is preprocessed using
+@command{m4} (@pxref{Preprocessor}).  To see the preprocessed
+configuration without actually parsing it, use @option{-E} command
+line option.
+
+@xopindex{config-help, introduced}
+  The rest of this section describes the configuration file syntax in
+detail.  You can receive a concise summary of all configuration
+directives any time by running @command{pies --config-help}.
+
 @menu
+* Syntax::               Configuration file syntax.
+* Component Statement::
+* ACL::                  Access Control Lists
+* include-meta1::
+* Global Configuration::
 @end menu
 
-@node Pies Configuration File
-@chapter Pies Configuration File
-  @command{Pies} reads its configuration from the main Mailutils
-configuration file.  @xref{configuration, Mailutils Configuration
-File,, mailutils, GNU Mailutils Manual}, for a description of GNU
-Mailutils configuration system.  It is recommended to use
-@code{include @var{directory}} statement (@pxref{Include, Include
-Statement,, mailutils, GNU Mailutils Manual}), and to place
-@command{pies} configuration in file @file{@var{directory}/pies}.
-@xref{MeTA1,,, mailfromd, Mailfromd Manual}, for an example.
-
-The following standard Mailutils configuration statements are understood:
-
+@node Syntax
+@section Configuration File Syntax
+  The configuration file consists of statements and comments.
+
+  There are three classes of lexical tokens: keywords, values, and
+separators. Blanks, tabs, newlines and comments, collectively called
+@dfn{white space} are ignored except as they serve to separate
+tokens.  Some white space is required to separate otherwise adjacent 
+keywords and values.
+
+@menu
+* Comments::
+* Statements::