Update

* doc/macros.texi (xprindex)
(example-output, mtasimopt): Remove
(RFC): New macro.
* doc/pies.texi: Document inetd-style components.
* doc/Makefile.am (fix-sentence-spacing): Fix rule.
* src/progman.c (progman_lookup_tcpmux): Use case-insensitive
comparison, as required by RFC.

4 files changed, 250 insertions, 33 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 73bd72a..21618f0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -144,7 +144,7 @@ fix-sentence-spacing:
         do \
                 if grep -q '\. [@A-Z]' $$file; then \
                         mv $$file $${file}~; \
-                        sed -r 's/\. ([@A-Z])/.  \1/g' $${file}~ > $$file; \
+                        sed -r -f fix-sentence-spacing.sed $${file}~ > $$file; \
                 fi; \
         done
 
diff --git a/doc/macros.texi b/doc/macros.texi
index a26ad0c..bc9fd0a 100644
--- a/doc/macros.texi
+++ b/doc/macros.texi
@@ -10,21 +10,8 @@
 @xopindex{\option\, summary}
 @end macro
 
-@macro xprindex{option}
-@ifclear ANCHOR-PR-\option\
-@set ANCHOR-PR-\option\ 1
-@anchor{pragma \option\}
-@end ifclear
-@end macro
-
-@macro example-output{text}
-@smallexample
-\text\
-@end smallexample
-@end macro
-
-@macro mtasimopt{option,text}
-@mtindex \option\, --\option\, @r{@command{mtasim} option, \text\}
+@macro RFC{number}
+@uref{http://tools.ietf.org/html/rfc\number\, RFC \number\}
 @end macro
 
   
diff --git a/doc/pies.texi b/doc/pies.texi
index e21ea62..d5e9d02 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -126,6 +126,12 @@ Component Statement
 * Meta1-Style Components::
 * Component Syntax Summary::
 
+Inetd-Style Components
+
+* builtin:: Built-in Inetd Services
+* TCPMUX:: TCPMUX Services
+* sockenv:: Socket Environment Variables
+
 Global Configuration
 
 * Less Useful Statements::
@@ -632,6 +638,7 @@ statement.  Its value will be available to the program as
 @code{argv[0]}. 
 @end deffn
 
+@anchor{flags}
 @deffn {Config: component} flags (@var{flag-list})
 Define flags for this component.  The @var{flag-list} is a
 comma-separated list of flags.  Valid flags are:
@@ -662,7 +669,7 @@ This is an internal inetd component.  @xref{builtin}.
 
 @item sockenv
 This inetd component wants socket description variables in its
-environment.  @FIXME-xref{sockenv}.
+environment.  @xref{sockenv}.
 
 @item resolve
 When used with @samp{sockenv}, the @env{LOCALHOST} and
@@ -1075,6 +1082,7 @@ provided that @code{chdir} statement is used for this component
 @end table
 @end deffn
 
+@anchor{socket-type}
 @deffn {Config: component} socket-type @var{type}
 Sets the socket type.  Allowed values for @var{type} are:
 @samp{stream}, @samp{dgram}, @samp{raw}, @samp{rdm},
@@ -1100,26 +1108,227 @@ opened connections.
 @menu
 * builtin:: Built-in Inetd Services
 * TCPMUX:: TCPMUX Services
+* sockenv:: Socket Environment Variables
 @end menu
 
 @node builtin
 @subsubsection Built-in Inetd Services
 @cindex builtin services
-@WRITEME
+@cindex internal services
+@dfn{Built-in} or @dfn{internal} services are such inetd-style
+components that are supported internally by @command{pies} and do not
+require external programs.  In @command{pies} version @value{VERSION}
+those are:
+
+@table @asis
+@cindex echo
+@item echo
+Send back any received data.  Defined in @RFC{862}.
+@cindex discard
+@item discard
+Read the data and discard them.  Defined in @RFC{863}.
+@cindex time
+@item time
+Return a machine readable date and time as seconds since the Epoch.
+Defined in @RFC{868}.
+@cindex daytime
+@item daytime
+Return current date and time in human-readable format.  Defined in
+@RFC{867}.
+@cindex chargen
+@item chargen
+Send a continuous stream of ASCII printable characters without regard
+to the input.  Defined in @RFC{864}
+@cindex qotd
+@item qotd
+Send a @samp{quotation of the day} text without regard
+to the input.  Defined in @RFC{865}.
+@cindex tcpmux
+@item tcpmux
+TCP Port Service Multiplexer.  Defined in @RFC{1078}.
+@end table
+
+@cindex @code{internal} flag
+A definition of a built-in service component must
+have the @code{internal} flag (@pxref{flags}).  It may not have
+@code{command} or @code{program} statements, as built-in services do
+not need external programs.  Instead, it must have a @dfn{service}
+declaration:
+
+@deffn {Config: component} service @var{name}
+Set the built-in service name.  Its argument is one of the keywords
+listed in the above table.
+@end deffn
+
+  For example, the following component declaration defines a standard
+TCP-based echo service:
+
+@smallexample
+@group
+component echo @{
+        socket "inet://0.0.0.0:echo";
+        service echo;
+        flags internal;
+@}
+@end group
+@end smallexample
+
+  It corresponds to the following @file{inetd.conf} line:
+
+@smallexample
+echo stream  tcp     nowait  root    internal
+@end smallexample
+
+  Another built-in services are defined in the same manner, replacing
+@samp{echo} in the @code{service} field with the corresponding service
+name.
+
+  The @samp{qotd} service reads the contents of the @dfn{qotd file}
+and sends it back to the client.  By default the @samp{qotd} file
+is located in the local state directory and named
+@file{@var{instance}.qotd} (where @var{instance} is the name of the
+@command{pies} instance, @FIXME-pxref{instances}).  This default location
+can be changed using the following statement:
+
+@deffn {Config} qotd-file @var{file-name}
+Set the name of the @samp{quotation-of-the-day} file.
+@end deffn
+
+  The text read from the @samp{qotd} file is preprocessed, by
+replacing each @acronym{LF} character (@acronym{ASCII} 10) with two
+characters: @acronym{CR} (@acronym{ASCII} 13) followed by
+@acronym{LF}.  The resulting text is truncated to 512 characters.    
+
+  The use of @samp{tcpmux} services is covered below.
 
 @node TCPMUX
 @subsubsection TCPMUX Services
 @cindex TCPMUX
-@UNREVISED
+
+  TCPMUX allows to use multiple services on a single well-known TCP
+port using a service name instead of a well-known number.  It is
+defined in @RFC{1078}.  The protocol operation is as follows.
+The @dfn{master} TCPMUX component listens on a certain TCP port
+(usually on port 1) for incoming requests.  After connecting to the
+master, the client sends the name of the service it wants, followed
+by a carriage-return line-feed (@acronym{CRLF}).  @command{Pies}
+looks up this name in the list of services handled by the master
+(@dfn{subordinate services}) and reports with @samp{+} or @samp{-}
+followed by optional text and terminated with the @acronym{CRLF},
+depending on whether such service name is found or not.  If the reply
+was @samp{+}, @command{pies} then starts the requested component.
+Otherwise, it closes the connection.
+
+  TCPMUX service names are case-insensitive.  The special service
+@samp{help} is always defined; it outputs a list of all the
+subordinate services, one name per line, and closes the connection.
+
+  The master TCPMUX service is declared as a usual built-in service,
+e.g.:
+
+@smallexample
+component tcpmux-master @{
+        socket "inet://0.0.0.0:1";
+        service tcpmux;
+        flags internal;
+@}
+@end smallexample
+
+  Any number of subordinate services may be defined for each master.
+A subordinate server component definition must contain at least the
+following statements:
 
 @deffn {Config: component} service @var{name}
-Sets the name of the service for TCPMUX sub-services.
+Sets the name of the subordinate service.  The @var{name} will be compared