diff --git a/ChangeLog b/ChangeLog
index dad5f68..473e2c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,19 @@
 E-MailRelay Change Log
 ======================
 
+0.9.9 -> 1.0.0
+--------------
+* Briefer "--help" output; works with "--verbose".
+* Option to listen on a specific network interface ("--interface").
+* Option for an external address verifier program ("--verifier").
+* Some Linux Standard Base stuff added to the "init.d" script.
+* Pid files world-readable and deleted on abnormal termination.
+* Compiles with gcc 3.0 and intel 6.0.
+* Autoconf tweak for MacOS X.
+* Corrected the "Received:" typo [bug-id 572236].
+* EHLO response parsing is now case-insensitive [bug-id 561522].
+* Fewer missing-secrets warnings [bug-id 564987].
+
 0.9.8 -> 0.9.9
 --------------
 * More flexible logging options ("--verbose" and "--debug" work better).
diff --git a/INSTALL b/INSTALL
index cb1f796..a1a5ca9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,20 @@
 Introduction
 ============
+
    What follows are generic installation instructions for doing a standard GNU 
 "./configure; make; make install" installation from source under Linux, FreeBSD 
 etc. The Windows installation instructions are in a separate document.
 
-   Note that a non-standard "configure" switch is available, "--enable-fhs",
-which overrides all other directory modifiers, forcing compliance with the File 
-Hierarchy Standard. There are also a set of variables which can be defined on 
-the "configure" command line for controlling all the installation directories 
-in more detail, augmenting the standard command-line switches like "--sbindir" 
-and "--libexecdir". For more information refer to the E-MailRelay reference 
-document.
+   A non-standard "configure" switch is available, "--enable-fhs", which overrides 
+all other directory modifiers, forcing compliance with the File Hierarchy Standard. 
+This switch is used in building the RPMs, and may become the default in future
+releases. 
+
+   There are also a set of variables which can be defined on the "configure" command 
+line for controlling all the installation directories in more detail, augmenting 
+the standard command-line switches like "--sbindir" and "--libexecdir". For more 
+information refer to the E-MailRelay reference document under 
+"Files and directories".
 
    The E-MailRelay user guide describes what needs to be done after the "make 
 install" in order to get the emailrelay daemon to start up at boot-time, 
@@ -18,6 +22,7 @@ automatically forward e-mail and bounce failed mail.
 
 Basic Installation
 ==================
+
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
diff --git a/Makefile.am b/Makefile.am
index 464720b..936832e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,4 +21,6 @@ SUBDIRS = src bin lib doc
 e_doc_DATA = NEWS README changelog.gz
 CLEANFILES = changelog.gz
 changelog.gz: ChangeLog
-	if test -n "$(GZIP)" ; then $(GZIP) -c $< > changelog.tmp && mv changelog.tmp changelog.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/ChangeLog > changelog.tmp && mv changelog.tmp changelog.gz ; fi
+uninstall-local:
+	-rmdir $(DESTDIR)$(e_docdir) 2>/dev/null
diff --git a/Makefile.in b/Makefile.in
index 312f5d4..2d21618 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,6 +79,7 @@ POST_UNINSTALL = :
 AR = @AR@
 AWK = @AWK@
 CC = @CC@
+COMPILER_VERSION = @COMPILER_VERSION@
 CXX = @CXX@
 GZIP = @GZIP@
 HAVE_DOXYGEN = @HAVE_DOXYGEN@
@@ -346,7 +347,7 @@ install-data: install-data-recursive
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-recursive
-uninstall-am: uninstall-e_docDATA
+uninstall-am: uninstall-e_docDATA uninstall-local
 uninstall: uninstall-recursive
 all-am: Makefile $(DATA) config.h
 all-redirect: all-recursive-am
@@ -398,12 +399,15 @@ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
 install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+install uninstall-local uninstall-am uninstall all-redirect all-am all \
+installdirs-am installdirs mostlyclean-generic distclean-generic \
+clean-generic maintainer-clean-generic clean mostlyclean distclean \
+maintainer-clean
 
 changelog.gz: ChangeLog
-	if test -n "$(GZIP)" ; then $(GZIP) -c $< > changelog.tmp && mv changelog.tmp changelog.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/ChangeLog > changelog.tmp && mv changelog.tmp changelog.gz ; fi
+uninstall-local:
+	-rmdir $(DESTDIR)$(e_docdir) 2>/dev/null
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/NEWS b/NEWS
index 5589d96..ae51f8d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1 @@
-
-To do...
-* optionally enforce authentication by clients
-* OS-X port
-* better windows gui (esp. client side)
-* sample pre-processor script for spamassassin
-
+no news
diff --git a/README b/README
index fbb5d58..510eba8 100644
--- a/README
+++ b/README
@@ -12,8 +12,8 @@ than to a local postmaster. Because of this functional simplicity it is
 extremely easy to configure, typically only requiring the address of the 
 next-hop SMTP server to be put on the command line.
 
-C++ source code is available for Linux, FreeBSD and Windows. Distribution is
-under the GNU General Public License.
+C++ source code is available for Linux, FreeBSD (etc) and Windows. 
+Distribution is under the GNU General Public License.
 
 Quick start
 -----------
@@ -78,11 +78,12 @@ and ported to Windows 98 using:
 
 The code has also been built successfully on:
 * Windows NT 4.0
+* MacOS X
+* FreeBSD on Intel hardware
+* Solaris 8, using gcc, on Sparc hardware
 * Linux on Alpha hardware (Debian 2.2)
 * Linux on Sparc hardware
 * Linux on RS6000 PPC hardware
-* FreeBSD on Intel hardware
-* Solaris, using gcc, on Sparc hardware
 
 
 Feedback
diff --git a/acinclude.m4 b/acinclude.m4
index e25740e..cd100c7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -18,6 +18,62 @@ dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 dnl 
 dnl ===
 
+dnl derived from lars brinkhoff...
+AC_DEFUN(ACLOCAL_TYPE_SOCKLEN_T,
+[AC_CACHE_CHECK([for socklen_t], aclocal_cv_type_socklen_t,
+[
+  AC_TRY_COMPILE(
+  [#include <sys/types.h>
+#include <sys/socket.h>],
+  [socklen_t len = 42; return len;],
+  aclocal_cv_type_socklen_t=yes,
+  aclocal_cv_type_socklen_t=no)
+])
+  if test $aclocal_cv_type_socklen_t = yes; then
+    AC_DEFINE(HAVE_SOCKLEN_T, 1,[Define if socklen_t type definition in sys/socket.h])
+  else
+    AC_DEFINE(HAVE_SOCKLEN_T, 0,[Define if socklen_t type definition in sys/socket.h])
+  fi
+])
+
+AC_DEFUN([ACLOCAL_CHECK_GMTIME_R],
+[AC_CACHE_CHECK([for gmtime_r], aclocal_cv_gmtime_r,
+[
+	AC_TRY_COMPILE(
+		[#include <time.h>],
+		[gmtime_r((time_t*)0,(struct tm*)0) ;],
+		aclocal_cv_gmtime_r=yes ,
+		aclocal_cv_gmtime_r=no )
+])
+	if test $aclocal_cv_gmtime_r = yes; then
+		AC_DEFINE(HAVE_GMTIME_R,1,[Define if gmtime_r in time.h])
+	else
+		AC_DEFINE(HAVE_GMTIME_R,0,[Define if gmtime_r in time.h])
+	fi
+])
+
+AC_DEFUN([ACLOCAL_CHECK_LOCALTIME_R],
+[AC_CACHE_CHECK([for localtime_r], aclocal_cv_localtime_r,
+[
+	AC_TRY_COMPILE(
+		[#include <time.h>],
+		[localtime_r((time_t*)0,(struct tm*)0) ;],
+		aclocal_cv_localtime_r=yes ,
+		aclocal_cv_localtime_r=no )
+])
+	if test $aclocal_cv_localtime_r = yes; then
+		AC_DEFINE(HAVE_LOCALTIME_R,1,[Define if localtime_r in time.h])
+	else
+		AC_DEFINE(HAVE_LOCALTIME_R,0,[Define if localtime_r in time.h])
+	fi
+])
+
+AC_DEFUN([ACLOCAL_COMPILER_VERSION],
+[
+	COMPILER_VERSION=`$CXX --version 2>/dev/null | sed 's/\./ /;s/\..*//;s/ /\./;s/ .*//;s/^/gcc/'`
+	AC_SUBST(COMPILER_VERSION)
+])
+
 AC_DEFUN([ENABLE_FHS],
 [
 if test "$enable_fhs" = "yes"
diff --git a/aclocal.m4 b/aclocal.m4
index bfc41fc..ab7c840 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -30,6 +30,62 @@ dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 dnl 
 dnl ===
 
+dnl derived from lars brinkhoff...
+AC_DEFUN(ACLOCAL_TYPE_SOCKLEN_T,
+[AC_CACHE_CHECK([for socklen_t], aclocal_cv_type_socklen_t,
+[
+  AC_TRY_COMPILE(
+  [#include <sys/types.h>
+#include <sys/socket.h>],
+  [socklen_t len = 42; return len;],
+  aclocal_cv_type_socklen_t=yes,
+  aclocal_cv_type_socklen_t=no)
+])
+  if test $aclocal_cv_type_socklen_t = yes; then
+    AC_DEFINE(HAVE_SOCKLEN_T, 1,[Define if socklen_t type definition in sys/socket.h])
+  else
+    AC_DEFINE(HAVE_SOCKLEN_T, 0,[Define if socklen_t type definition in sys/socket.h])
+  fi
+])
+
+AC_DEFUN([ACLOCAL_CHECK_GMTIME_R],
+[AC_CACHE_CHECK([for gmtime_r], aclocal_cv_gmtime_r,
+[
+	AC_TRY_COMPILE(
+		[#include <time.h>],
+		[gmtime_r((time_t*)0,(struct tm*)0) ;],
+		aclocal_cv_gmtime_r=yes ,
+		aclocal_cv_gmtime_r=no )
+])
+	if test $aclocal_cv_gmtime_r = yes; then
+		AC_DEFINE(HAVE_GMTIME_R,1,[Define if gmtime_r in time.h])
+	else
+		AC_DEFINE(HAVE_GMTIME_R,0,[Define if gmtime_r in time.h])
+	fi
+])
+
+AC_DEFUN([ACLOCAL_CHECK_LOCALTIME_R],
+[AC_CACHE_CHECK([for localtime_r], aclocal_cv_localtime_r,
+[
+	AC_TRY_COMPILE(
+		[#include <time.h>],
+		[localtime_r((time_t*)0,(struct tm*)0) ;],
+		aclocal_cv_localtime_r=yes ,
+		aclocal_cv_localtime_r=no )
+])
+	if test $aclocal_cv_localtime_r = yes; then
+		AC_DEFINE(HAVE_LOCALTIME_R,1,[Define if localtime_r in time.h])
+	else
+		AC_DEFINE(HAVE_LOCALTIME_R,0,[Define if localtime_r in time.h])
+	fi
+])
+
+AC_DEFUN([ACLOCAL_COMPILER_VERSION],
+[
+	COMPILER_VERSION=`$CXX --version 2>/dev/null | sed 's/\./ /;s/\..*//;s/ /\./;s/ .*//;s/^/gcc/'`
+	AC_SUBST(COMPILER_VERSION)
+])
+
 AC_DEFUN([ENABLE_FHS],
 [
 if test "$enable_fhs" = "yes"
diff --git a/bin/Makefile.am b/bin/Makefile.am
index b3a9cdc..421bd64 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -37,9 +37,12 @@ emailrelay: emailrelay.sh
 	cp emailrelay.sh emailrelay
 	chmod ugo+x emailrelay
 
-install-data-local:
+install-data-local: install-e_examplesDATA install-e_initSCRIPTS
 	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-notify.sh
 	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-resubmit.sh
 	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-deliver.sh
 	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-process.sh
 
+uninstall-local:
+	-rmdir $(DESTDIR)$(e_examplesdir) 2>/dev/null
+
diff --git a/bin/Makefile.in b/bin/Makefile.in
index 8d8a597..368c09b 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -79,6 +79,7 @@ POST_UNINSTALL = :
 AR = @AR@
 AWK = @AWK@
 CC = @CC@
+COMPILER_VERSION = @COMPILER_VERSION@
 CXX = @CXX@
 GZIP = @GZIP@
 HAVE_DOXYGEN = @HAVE_DOXYGEN@
@@ -232,7 +233,8 @@ install-data: install-data-am
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-e_initSCRIPTS uninstall-e_examplesDATA
+uninstall-am: uninstall-e_initSCRIPTS uninstall-e_examplesDATA \
+		uninstall-local
 uninstall: uninstall-am
 all-am: Makefile $(SCRIPTS) $(DATA)
 all-redirect: all-am
@@ -274,10 +276,10 @@ maintainer-clean: maintainer-clean-am
 uninstall-e_examplesDATA install-e_examplesDATA tags distdir \
 check-TESTS info-am info dvi-am dvi check check-am installcheck-am \
 installcheck install-exec-am install-exec install-data-local \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+install-data-am install-data install-am install uninstall-local \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 .sh_.sh:
@@ -288,12 +290,15 @@ emailrelay: emailrelay.sh
 	cp emailrelay.sh emailrelay
 	chmod ugo+x emailrelay
 
-install-data-local:
+install-data-local: install-e_examplesDATA install-e_initSCRIPTS
 	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-notify.sh
 	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-resubmit.sh
 	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-deliver.sh
 	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-process.sh
 
+uninstall-local:
+	-rmdir $(DESTDIR)$(e_examplesdir) 2>/dev/null
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/bin/emailrelay-doxygen-filter.sh_ b/bin/emailrelay-doxygen-filter.sh_
index c504983..afd1103 100644
--- a/bin/emailrelay-doxygen-filter.sh_
+++ b/bin/emailrelay-doxygen-filter.sh_
@@ -23,6 +23,10 @@
 #
 
 awk="gawk"
+if test "`echo a | ${awk} '{print}'`" != "a"
+then
+	awk="nawk"
+fi 2>/dev/null
 
 # PreFilter()
 # Removes banner comments (including legalese) from the top of the file.
diff --git a/bin/emailrelay-soak.sh_ b/bin/emailrelay-soak.sh_
index e127cb1..73ee86c 100644
--- a/bin/emailrelay-soak.sh_
+++ b/bin/emailrelay-soak.sh_
@@ -59,7 +59,7 @@ Auth()
 
 Content()
 {
-	echo "To:" ${USER}@localhost
+	echo "To:" ${USER}@`uname -n`
 	echo "Subject: test message from process" $$
 	echo "From: tester"
 	echo ""
@@ -75,7 +75,7 @@ Envelope()
 	echo "X-MailRelay-Content: 8bit"
 	echo "X-MailRelay-From: me"
 	echo "X-MailRelay-ToCount: 1"
-	echo "X-MailRelay-To-Remote:" ${USER}@localhost
+	echo "X-MailRelay-To-Remote:" ${USER}@`uname -n`
 	echo "X-MailRelay-Authentication: anon"
 	echo "X-MailRelay-Client: 127.0.0.1"
 	echo "X-MailRelay-End: 1"
diff --git a/bin/emailrelay.sh_ b/bin/emailrelay.sh_
index ce77442..98abe67 100644
--- a/bin/emailrelay.sh_
+++ b/bin/emailrelay.sh_
@@ -24,27 +24,201 @@
 # A shell-script wrapper for E-MailRelay designed for
 # use in the SysV-init system (/etc/init.d).
 #
-# usage: emailrelay { start [<emailrelay-switches>] | stop }
+# See also: LSB, start_daemon (lsb), startproc (suse), 
+# install_initd (lsb), insserv (suse)
 #
+# usage: emailrelay { start [<emailrelay-switches>] | stop | restart | force-reload | status }
+#
+
+# LSB comment block
+#
+### BEGIN INIT INFO
+# Provides:       emailrelay
+# Required-Start: $network
+# Required-Stop:  $network
+# Default-Start:  3 4 5
+# Default-Stop:   3 4 5
+# Description:    E-MailRelay store-and-forward Message Transfer Agent.
+### END INIT INFO
+
+# choose an infrastructure style
+#
+if test -f /etc/rc.status 
+then 
+	style="suse"
+	. /etc/rc.status
+elif test -f /lib/lsb/init-functions
+then 
+	style="lsb" 
+	. /lib/lsb/init-functions
+else
+	style="unix"
+fi
 
 # configuration
 #
+switches=""
+sbin="/sbin"
 var_run="/var/run"
 emailrelay="__SBIN_DIR__/emailrelay"
-switches=""
-
-# configuration fallback
-#
 if test \! -d "${var_run}" ; then var_run="/tmp" ; fi
-if test \! -x "${emailrelay}" ; then emailrelay="emailrelay" ; fi
-
-# initialisation
-#
+if test \! -x "${emailrelay}" ; then emailrelay="./emailrelay" ; fi
 pid_file="${var_run}/emailrelay.pid"
+PATH="${PATH}:/sbin:/bin:/usr/bin"
+
+# functions...
+#
+# <style>_reset() -- initialise
+# <style>_message() -- do echo -n
+# <style>_status() [-v] -- save errno and say ok/failed for -v
+# <style>_startproc() -- start the server
+# <style>_killproc() -- kill the server
+# <style>_checkproc() -- return true if running
+# <style>_exit() -- exit with saved errno
+
+function unix_reset()
+{
+	unix_errno="0"
+}
+
+function unix_message()
+{
+	echo -n "${1}"
+}
+
+function unix_status()
+{
+	unix_errno="$?"
+	if test "${1}" = "-v" -a "${unix_errno}" -eq 0
+	then
+		echo " ... done" 
+	fi
+	if test "${1}" = "-v" -a "${unix_errno}" -ne 0
+	then
+		echo " ... failed" 
+	fi
+}
+
+function unix_startproc()
+{
+	$@
+}
+
+function unix_killproc()
+{
+	if test -f "${pid_file}" && test "`cat ${pid_file}`" != ""
+	then
+		kill "`cat ${pid_file}`"
+		rm -f "${pid_file}" 2>/dev/null
+	fi
+	return 0
+}
+
+function unix_checkproc()
+{
+	if test -f "${pid_file}" && test "`cat ${pid_file}`" != "" && kill -0 "`cat ${pid_file}`" 2>/dev/null
+	then
+		return 0
+	elif test -f "${pid_file}" 
+	then
+		return 1
+	else
+		return 3
+	fi
+}
+
+function unix_exit()
+{
+	exit "${unix_errno}"
+}
+
+##
+
+function suse_reset()
+{
+	rc_reset
+}
+
+function suse_message()
+{
+	echo -n "${1}"
+}
+
+function suse_status()
+{
+	rc_status $@
+}
+
+function suse_startproc()
+{
+	startproc $@
+}
+
+function suse_killproc()
+{
+	killproc $@
+}
+
+function suse_checkproc()
+{
+	checkproc $@
+}
+
+function suse_exit()
+{
+	rc_exit
+}
+
+##
+
+function lsb_reset()
+{
+	lsb_errno="0"
+	lsb_text=""
+}
+
+function lsb_message()
+{
+	lsb_text="$@"
+}
+
+function lsb_status()
+{
+	lsb_errno=$?
+	if test "${lsb_errno}" -eq 0 -a "${1}" = "-v"
+	then
+		log_success_msg "${lsb_text}: done"
+	elif test "${1}" = "-v"
+	then
+		log_failure_msg "${lsb_text}: failed"
+	fi
+}
+
+function lsb_startproc()
+{
+	start_daemon "`basename \"${1}\"`"
+}
+
+function lsb_killproc()
+{
+	killproc "`basename \"${1}\"`"
+}
+
+function lsb_checkproc()
+{
+	base="`basename \"${1}\"`"
+	pids="`pidofproc \"${base}\" | sed 's/ *$//'`"
+	test "${pids}" != ""
+}
+
+function lsb_exit()
+{
+	exit ${lsb_errno}
+}
 
 # check the command line
 #
-usage="{ start | stop }"
+usage="{ start [<server-switches>] | stop | restart | force-reload | status }"
 if test $# -eq 0
 then
 	echo usage: `basename $0` "${usage}" >&2
@@ -53,25 +227,44 @@ fi
 
 # process the command line
 #
-if test "${1}" = "start"
-then
-	# "start"
-	#
-	shift
-	rm -f "${pid_file}" 2>/dev/null
-	${emailrelay} --as-server --pid-file "${pid_file}" ${switches} $@
+${style}_reset
+case "${1}" in
 
-elif test "${1}" = "stop"
-then
-	# "stop"
-	#
-	if test -f "${pid_file}" && test "`cat ${pid_file}`" != ""
-	then
-		kill "`cat ${pid_file}`"
-	fi
+	start)
+		shift
+		${style}_message "Starting E-MailRelay server"
+		${style}_startproc ${emailrelay} --as-server --pid-file "${pid_file}" ${switches} $@
+		${style}_status -v
+		;;
 
-else
-	echo usage: `basename $0` "${usage}" >&2
-	exit 2
-fi
+	stop)
+		${style}_message "Shutting down E-MailRelay"
+		${style}_killproc "${emailrelay}"
+		${style}_status -v
+		;;
+
+	restart|force-reload)
+		shift
+		$0 stop
+		$0 start $@
+		${style}_status
+		;;
+
+	reload)
+		echo usage: `basename $0` reload: not implemented >&2
+		exit 3
+		;;
+
+	status)
+		${style}_message "Checking for E-MailRelay"
+		${style}_checkproc "${emailrelay}"
+		${style}_status -v
+		;;
+
+	*)
+		echo usage: `basename $0` "${usage}" >&2
+		exit 2
+		;;
+esac
+${style}_exit
 
diff --git a/bin/expand.sh_ b/bin/expand.sh_
index 4a44cf6..feb84e2 100644
--- a/bin/expand.sh_
+++ b/bin/expand.sh_
@@ -26,15 +26,22 @@
 # Only does one sustitution per line. Directives which start the line are
 # multi-line. Those within a line are one-line, expanded in-place.
 #
-# The "-t" switch can be used to suppress expansion of files
-# with an extension of ".html".
+# The "-t" switch can be used to suppress expansion where the included
+# file has an extension of ".html".
 #
-# Bugs: Does not do nested expansion. Only supports one include statement
-# per line.
+# In edit mode (--edit) the exit value is 0 (shell true) if the file is 
+# modified. This allows for recursive expansion using a shell while loop.
 #
-# usage: expand.sh [-a <awk>] [-t]
+# usage: expand.sh [-a <awk>] [-t] { --edit <file> | [<file> ...] }
 #
 
+Usage()
+{
+	echo usage: `basename $0` '[-a <awk>] [-t] { --edit <file> | [<file> ...] }' >&2
+}
+
+tmp="/tmp/`basename $0`.$$.tmp"
+
 awk="gawk"
 if test "${1}" = "-a"
 then
@@ -50,40 +57,64 @@ then
 	expand_html="0"
 fi
 
-${awk} -v expand_html="${expand_html}" -v cat="${awk} '{print}'" '
-{
-	line = $0
-	if( match(line,"#include#[^#]*#") )
-	{
-		rstart = RSTART
-		directive = substr(line,RSTART,RLENGTH)
-		path = substr(line,RSTART+9,RLENGTH-10)
+edit="0"
+if test "${1}" = "--edit"
+then
+	shift
+	edit="1"
+	if test $# -ne 1 ; then Usage ; exit 1 ; fi
+fi
 
-		if( !expand_html && match(path,".html$") )
+Expand()
+{
+	${awk} -v expand_html="${expand_html}" -v cat="${awk} '{print}'" '
+	BEGIN { modified = 0 }
+	{
+		line = $0
+		if( match(line,"#include#[^#]*#") )
 		{
-			print line
-		}
-		else
-		{
-			head = substr(line,1,rstart-1)
-			if( match(head,"^[[:space:]]*$") )
+			rstart = RSTART
+			directive = substr(line,RSTART,RLENGTH)
+			path = substr(line,RSTART+9,RLENGTH-10)
+
+			if( !expand_html && match(path,".html$") )
 			{
-				system( cat "  " path )
+				print line
 			}
 			else
 			{
-				getline text <path
-				if( length(text) == 0 )
-					printf( "expand.sh: warning: line %d: empty text sustitution for %s\n" , NR , path ) >"/dev/fd/2"
-				sub( directive , text , line )
-				print line
+				modified = 1
+				head = substr(line,1,rstart-1)
+				if( match(head,"^[[:space:]]*$") )
+				{
+					system( cat "  " path )
+				}
+				else
+				{
+					getline text <path
+					if( length(text) == 0 )
+						printf( "expand.sh: warning: line %d: empty text sustitution for %s\n" , NR , path ) >"/dev/fd/2"
+					sub( directive , text , line )
+					print line
+				}
 			}
 		}
+		else
+		{
+			print line
+		}
 	}
-	else
-	{
-		print line
-	}
+	END { exit ! modified }
+	' $@
 }
-' $@
+
+if test "${edit}" -eq 1
+then
+	# (use cp rather than mv here to protect read-only files)
+	Expand $@ > "${tmp}" && cp "${tmp}" "${1}"
+	rc=$? ; rm -f "${tmp}" 2>/dev/null ; exit "${rc}"
+else
+	Expand $@
+	true
+fi
 
diff --git a/bin/mu2html.sh_ b/bin/mu2html.sh_
index 83e1c33..2e090c9 100644
--- a/bin/mu2html.sh_
+++ b/bin/mu2html.sh_
@@ -70,7 +70,6 @@ Main()
 	BEGIN {
 		if( full )
 		{
-			colour = "#ffffff"
 			dtd_name = "-//W3C//DTD HTML 4.01//EN"
 			dtd_ref = "http://www.w3.org/TR/html4/strict.dtd"
 			printf( "<!DOCTYPE HTML PUBLIC \"%s\" \"%s\">\n" , dtd_name , dtd_ref )
@@ -81,7 +80,7 @@ Main()
 			if( length(stylesheet) )
 				printf( "  <link rel=\"stylesheet\" href=\"%s\" type=\"text/css\">\n" , stylesheet )
 			printf( " </head>\n" )
-			printf( " <body bgcolor=\"%s\">\n" , colour )
+			printf( " <body>\n" )
 			printf( "  <!-- index:0::::%s -->\n" , title )
 			printf( " <div class=\"div-main\">\n" )
 		}
@@ -161,37 +160,37 @@ Main()
 	
 		# item-outer
 		else if( match(type,"^item-outer,1[:,]") )
-			printf( "    <ul>\n     <li>%s</li>\n" , etail )
+			printf( "    <ul>\n     <li>%s\n" , etail )
 		else if( match(type,"^item-outer[:,]") )
-			printf( "     <li>%s</li>\n" , etail )
+			printf( "     </li>\n     <li>%s\n" , etail )
 		else if( match(type,"^item-outer-end[:,]") )
-			printf( "    </ul>\n" , etail )
+			printf( "     </li>\n    </ul>\n" , etail )
 	
 		# item-inner
 		else if( match(type,"^item-inner,1[:,]") )
-			printf( "       <ul>\n        <li>%s</li>\n" , etail )
+			printf( "      <ul>\n       <li>%s</li>\n" , etail )
 		else if( match(type,"^item-inner[:,]") )
-			printf( "        <li>%s</li>\n" , etail )
+			printf( "       <li>%s</li>\n" , etail )
 		else if( match(type,"^item-inner-end[:,]") )
-			printf( "       </ul>\n" , etail )
+			printf( "      </ul>\n" , etail )
 	
 		# item-name
 		else if( match(type,"^item-name,1[:,]") )
 			printf( "    <dl>\n     <dt>%s</dt>\n" , etail )
 		else if( match(type,"^item-name[:,]") )
-			printf( "    <dt>%s</dt>\n" , etail )
+			printf( "     <dt>%s</dt>\n" , etail )
 		else if( match(type,"^item-name-end[:,]") )
 			printf( "    </dl>\n" , etail )
 	
 		# item-detail
 		else if( match(type,"^item-detail,1[:,]") )
-			printf( "      <dd>\n       <p>\n         %s\n" , etail )
+			printf( "      <dd>\n       %s\n" , etail )
 		else if( match(type,"^item-detail[:,]") )
-			printf( "         %s\n" , etail )
+			printf( "       %s\n" , etail )
 		else if( match(type,"^item-detail-end[:,]") )
-			printf( "       </p>\n      </dd>\n" )
+			printf( "      </dd>\n" )
 		else if( match(type,"^item-detail-blank[:,]") )
-			printf( "       </p>\n       <p>\n" )
+			printf( "       <p class=\"p-break\"></p>\n" )
 
 		# code
 		else if( match(type,"^code,1[:,]") )
@@ -239,7 +238,7 @@ Main()
 
 		# image
 		else if( match(type,"^image[:,]") )
-			printf( "<img src=\"%s\">\n" , tail )
+			printf( "<img src=\"%s\" alt=\"%s\">\n" , tail , "image" )
 
 		# blank
 		else if( match(type,"^blank[:,]") )
diff --git a/bin/txt2mu.sh_ b/bin/txt2mu.sh_
index a2efd30..95d135c 100644
--- a/bin/txt2mu.sh_
+++ b/bin/txt2mu.sh_
@@ -104,7 +104,7 @@ Main()
 			is_author = 0
 			is_html = 0
 			is_code = match( line , "^" tab )
-			is_item_outer = match( line , "^+ " ) 
+			is_item_outer = match( line , "^\\+ " ) 
 			is_item_inner = match( line , "^  - " ) 
 		}
 
@@ -119,7 +119,7 @@ Main()
 		}
 		else if( is_image )
 		{
-			sub( "^<<" , "" , line )
+			sub( "^[[:space:]]*<<" , "" , line )
 			sub( ">>[[:space:]]*$" , "" , line )
 			tagOutputRaw( line , "image" )
 		}
@@ -148,7 +148,7 @@ Main()
 		}
 		else if( is_item_outer )
 		{
-			sub( "^+ " , "" , line )
+			sub( "^\\+ " , "" , line )
 			tagOutput( line , "item-outer" )
 		}
 		else if( is_item_inner )
@@ -213,14 +213,15 @@ Main()
 #
 Number()
 {
-	${awk} -v item_tag="${1}" -v ignore_1="${2}" -v ignore_2="${3}" -v ignore_3="${4}" '
+	${awk} -v item_tag="${1}" -v ignore_1="${2}" -v ignore_2="${3}" -v ignore_3="${4}" -v ignore_4="${5}" '
 	function ignore_line( line )
 	{
 		i_0 = match( line , "^ignore" )
 		i_1 = length(ignore_1) && match( line , "^" ignore_1 "[:,]" )
 		i_2 = length(ignore_2) && match( line , "^" ignore_2 "[:,]" )
 		i_3 = length(ignore_3) && match( line , "^" ignore_3 "[:,]" )
-		return i_0 || i_1 || i_2 || i_3
+		i_4 = length(ignore_3) && match( line , "^" ignore_4 "[:,]" )
+		return i_0 || i_1 || i_2 || i_3 || i_4
 	}
 	BEGIN {
 		n = 1
@@ -327,8 +328,8 @@ Cat ${file} | \
 	Number "item-outer" "item-inner" "blank" | \
 	Number "item-inner" "blank" | \
 	Number "item-numbered" | \
-	Number "item-name" "item-detail" "blank" "item-detail-blank" | \
-	Number "item-detail" "item-detail-blank" | \
+	Number "item-name" "item-detail" "blank" "item-detail-blank" "code" | \
+	Number "item-detail" "item-detail-blank" "code" | \
 	Number "code" "blank" "image" | \
 	Number "footer" "blank" "image" | \
 	Number "citation" "blank" | \
diff --git a/config.h.in b/config.h.in
index 382bef5..3867cd7 100644
--- a/config.h.in
+++ b/config.h.in
@@ -6,15 +6,18 @@
 /* Define if you have the `glob' function. */
 #undef HAVE_GLOB
 
-/* have reentrant gmtime */
+/* Define if gmtime_r in time.h */
 #undef HAVE_GMTIME_R
 
-/* have reentrant localtime */
+/* Define if localtime_r in time.h */
 #undef HAVE_LOCALTIME_R
 
 /* Define if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
+/* Define if socklen_t type definition in sys/socket.h */
+#undef HAVE_SOCKLEN_T
+
 /* Define if you have the <sys/dir.h> header file, and it defines `DIR'. */
 #undef HAVE_SYS_DIR_H
 
diff --git a/configure b/configure
index e19eecd..603c216 100755
--- a/configure
+++ b/configure
@@ -104,7 +104,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # only ac_max_sed_lines should be used.
 : ${ac_max_here_lines=38}
 
-ac_unique_file="src/main/gsmtp.h"
+ac_unique_file="src/gsmtp/gsmtp.h"
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -565,10 +565,6 @@ ac_env_CPP_set=${CPP+set}
 ac_env_CPP_value=$CPP
 ac_cv_env_CPP_set=${CPP+set}
 ac_cv_env_CPP_value=$CPP
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
 
 #
 # Report the --help message.
@@ -657,7 +653,6 @@ Some influential environment variables:
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CPP         C preprocessor
-  CXXCPP      C++ preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -842,7 +837,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:845: loading site script $ac_site_file" >&5
+    { echo "$as_me:840: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -853,7 +848,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:856: loading cache $cache_file" >&5
+    { echo "$as_me:851: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -861,7 +856,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:864: creating cache $cache_file" >&5
+  { echo "$as_me:859: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -877,21 +872,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:880: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:875: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:884: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:879: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:890: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:885: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:892:   former value:  $ac_old_val" >&5
+        { echo "$as_me:887:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:894:   current value: $ac_new_val" >&5
+        { echo "$as_me:889:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -910,9 +905,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:913: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:908: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:915: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:910: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -932,10 +927,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:935: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:930: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:938: \$? = $ac_status" >&5
+  echo "$as_me:933: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -961,7 +956,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:964: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:959: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -981,7 +976,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:984: checking for a BSD compatible install" >&5
+echo "$as_me:979: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -1030,7 +1025,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:1033: result: $INSTALL" >&5
+echo "$as_me:1028: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1041,7 +1036,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:1044: checking whether build environment is sane" >&5
+echo "$as_me:1039: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
@@ -1064,7 +1059,7 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:1067: error: ls -t appears to fail.  Make sure there is not a broken
+      { { echo "$as_me:1062: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
 echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
@@ -1077,14 +1072,14 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:1080: error: newly created file is older than distributed files!
+   { { echo "$as_me:1075: error: newly created file is older than distributed files!
 Check your system clock" >&5
 echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest*
-echo "$as_me:1087: result: yes" >&5
+echo "$as_me:1082: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 test "$program_prefix" != NONE &&
   program_transform_name="s,^,$program_prefix,;$program_transform_name"
@@ -1099,7 +1094,7 @@ _ACEOF
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
 rm conftest.sed
 
-echo "$as_me:1102: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1097: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -1119,21 +1114,21 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1122: result: yes" >&5
+  echo "$as_me:1117: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1126: result: no" >&5
+  echo "$as_me:1121: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 PACKAGE=emailrelay
 
-VERSION=0.9.9
+VERSION=1.0.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { { echo "$as_me:1136: error: source directory already configured; run \"make distclean\" there first" >&5
+  { { echo "$as_me:1131: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1147,78 +1142,78 @@ cat >>confdefs.h <<EOF
 EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo "$as_me:1150: checking for working aclocal" >&5
+echo "$as_me:1145: checking for working aclocal" >&5
 echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (aclocal --version) < /dev/null > /dev/null 2>&1; then
    ACLOCAL=aclocal
-   echo "$as_me:1157: result: found" >&5
+   echo "$as_me:1152: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    ACLOCAL="$missing_dir/missing aclocal"
-   echo "$as_me:1161: result: missing" >&5
+   echo "$as_me:1156: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "$as_me:1165: checking for working autoconf" >&5
+echo "$as_me:1160: checking for working autoconf" >&5
 echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (autoconf --version) < /dev/null > /dev/null 2>&1; then
    AUTOCONF=autoconf
-   echo "$as_me:1172: result: found" >&5
+   echo "$as_me:1167: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOCONF="$missing_dir/missing autoconf"
-   echo "$as_me:1176: result: missing" >&5
+   echo "$as_me:1171: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "$as_me:1180: checking for working automake" >&5
+echo "$as_me:1175: checking for working automake" >&5
 echo $ECHO_N "checking for working automake... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (automake --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake
-   echo "$as_me:1187: result: found" >&5
+   echo "$as_me:1182: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOMAKE="$missing_dir/missing automake"
-   echo "$as_me:1191: result: missing" >&5
+   echo "$as_me:1186: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "$as_me:1195: checking for working autoheader" >&5
+echo "$as_me:1190: checking for working autoheader" >&5
 echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (autoheader --version) < /dev/null > /dev/null 2>&1; then
    AUTOHEADER=autoheader
-   echo "$as_me:1202: result: found" >&5
+   echo "$as_me:1197: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$as_me:1206: result: missing" >&5
+   echo "$as_me:1201: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "$as_me:1210: checking for working makeinfo" >&5
+echo "$as_me:1205: checking for working makeinfo" >&5
 echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
    MAKEINFO=makeinfo
-   echo "$as_me:1217: result: found" >&5
+   echo "$as_me:1212: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$as_me:1221: result: missing" >&5
+   echo "$as_me:1216: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
@@ -1234,7 +1229,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1237: checking for $ac_word" >&5
+echo "$as_me:1232: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1249,7 +1244,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1252: found $ac_dir/$ac_word" >&5
+echo "$as_me:1247: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1257,10 +1252,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1260: result: $CC" >&5
+  echo "$as_me:1255: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1263: result: no" >&5
+  echo "$as_me:1258: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1269,7 +1264,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1272: checking for $ac_word" >&5
+echo "$as_me:1267: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1284,7 +1279,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1287: found $ac_dir/$ac_word" >&5
+echo "$as_me:1282: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1292,10 +1287,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1295: result: $ac_ct_CC" >&5
+  echo "$as_me:1290: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1298: result: no" >&5
+  echo "$as_me:1293: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1308,7 +1303,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1311: checking for $ac_word" >&5
+echo "$as_me:1306: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1323,7 +1318,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1326: found $ac_dir/$ac_word" >&5
+echo "$as_me:1321: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1331,10 +1326,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1334: result: $CC" >&5
+  echo "$as_me:1329: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1337: result: no" >&5
+  echo "$as_me:1332: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1343,7 +1338,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1346: checking for $ac_word" >&5
+echo "$as_me:1341: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1358,7 +1353,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1361: found $ac_dir/$ac_word" >&5
+echo "$as_me:1356: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1366,10 +1361,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1369: result: $ac_ct_CC" >&5
+  echo "$as_me:1364: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1372: result: no" >&5
+  echo "$as_me:1367: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1382,7 +1377,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1385: checking for $ac_word" >&5
+echo "$as_me:1380: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1402,7 +1397,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1405: found $ac_dir/$ac_word" >&5
+echo "$as_me:1400: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1424,10 +1419,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1427: result: $CC" >&5
+  echo "$as_me:1422: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1430: result: no" >&5
+  echo "$as_me:1425: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1438,7 +1433,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1441: checking for $ac_word" >&5
+echo "$as_me:1436: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1453,7 +1448,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1456: found $ac_dir/$ac_word" >&5
+echo "$as_me:1451: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1461,10 +1456,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1464: result: $CC" >&5
+  echo "$as_me:1459: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1467: result: no" >&5
+  echo "$as_me:1462: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1477,7 +1472,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1480: checking for $ac_word" >&5
+echo "$as_me:1475: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1492,7 +1487,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1495: found $ac_dir/$ac_word" >&5
+echo "$as_me:1490: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1500,10 +1495,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1503: result: $ac_ct_CC" >&5
+  echo "$as_me:1498: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1506: result: no" >&5
+  echo "$as_me:1501: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1515,32 +1510,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1518: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1513: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1523:" \
+echo "$as_me:1518:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1526: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1521: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
+  echo "$as_me:1524: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1526: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
   echo "$as_me:1529: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1531: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (eval echo "$as_me:1531: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
   echo "$as_me:1534: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1536: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:1539: \$? = $ac_status" >&5
-  (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1543 "configure"
+#line 1538 "configure"
 #include "confdefs.h"
 
 int
@@ -1556,13 +1551,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1559: checking for C compiler default output" >&5
+echo "$as_me:1554: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1562: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1557: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1565: \$? = $ac_status" >&5
+  echo "$as_me:1560: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1585,34 +1580,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1588: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1583: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1594: result: $ac_file" >&5
+echo "$as_me:1589: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1599: checking whether the C compiler works" >&5
+echo "$as_me:1594: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1608: \$? = $ac_status" >&5
+  echo "$as_me:1603: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1615: error: cannot run C compiled programs.
+	{ { echo "$as_me:1610: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1620,24 +1615,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1623: result: yes" >&5
+echo "$as_me:1618: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1630: checking whether we are cross compiling" >&5
+echo "$as_me:1625: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1632: result: $cross_compiling" >&5
+echo "$as_me:1627: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1635: checking for executable suffix" >&5
+echo "$as_me:1630: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1637: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1632: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1640: \$? = $ac_status" >&5
+  echo "$as_me:1635: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1653,25 +1648,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1656: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1651: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1662: result: $ac_cv_exeext" >&5
+echo "$as_me:1657: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1668: checking for object suffix" >&5
+echo "$as_me:1663: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1674 "configure"
+#line 1669 "configure"
 #include "confdefs.h"
 
 int
@@ -1683,10 +1678,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1686: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1681: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1689: \$? = $ac_status" >&5
+  echo "$as_me:1684: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1698,24 +1693,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1701: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1696: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1708: result: $ac_cv_objext" >&5
+echo "$as_me:1703: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1712: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1707: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1718 "configure"
+#line 1713 "configure"
 #include "confdefs.h"
 
 int
@@ -1730,16 +1725,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1728: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1736: \$? = $ac_status" >&5
+  echo "$as_me:1731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1742: \$? = $ac_status" >&5
+  echo "$as_me:1737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1751,19 +1746,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1754: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1749: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1760: checking whether $CC accepts -g" >&5
+echo "$as_me:1755: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1766 "configure"
+#line 1761 "configure"
 #include "confdefs.h"
 
 int
@@ -1775,16 +1770,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1773: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1781: \$? = $ac_status" >&5
+  echo "$as_me:1776: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1787: \$? = $ac_status" >&5
+  echo "$as_me:1782: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1794,7 +1789,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1797: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1792: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1821,16 +1816,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1824: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1819: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1827: \$? = $ac_status" >&5
+  echo "$as_me:1822: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1833: \$? = $ac_status" >&5
+  echo "$as_me:1828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1842,7 +1837,7 @@ if { (eval echo "$as_me:1824: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1845 "configure"
+#line 1840 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1855,16 +1850,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1858: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1853: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1861: \$? = $ac_status" >&5
+  echo "$as_me:1856: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1867: \$? = $ac_status" >&5
+  echo "$as_me:1862: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1874,7 +1869,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1877 "configure"
+#line 1872 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1886,16 +1881,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1892: \$? = $ac_status" >&5
+  echo "$as_me:1887: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1898: \$? = $ac_status" >&5
+  echo "$as_me:1893: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1932,7 +1927,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1935: checking for $ac_word" >&5
+echo "$as_me:1930: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1947,7 +1942,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:1950: found $ac_dir/$ac_word" >&5
+echo "$as_me:1945: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1955,10 +1950,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:1958: result: $CXX" >&5
+  echo "$as_me:1953: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:1961: result: no" >&5
+  echo "$as_me:1956: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1971,7 +1966,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1974: checking for $ac_word" >&5
+echo "$as_me:1969: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1986,7 +1981,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:1989: found $ac_dir/$ac_word" >&5
+echo "$as_me:1984: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1994,10 +1989,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:1997: result: $ac_ct_CXX" >&5
+  echo "$as_me:1992: result: $ac_ct_CXX" >&5
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  echo "$as_me:2000: result: no" >&5
+  echo "$as_me:1995: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2009,32 +2004,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:2012:" \
+echo "$as_me:2007:" \
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:2015: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2010: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
+  echo "$as_me:2013: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:2015: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
   echo "$as_me:2018: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:2020: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (eval echo "$as_me:2020: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
   echo "$as_me:2023: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:2025: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:2028: \$? = $ac_status" >&5
-  (exit $ac_status); }
 
-echo "$as_me:2031: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:2026: checking whether we are using the GNU C++ compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2037 "configure"
+#line 2032 "configure"
 #include "confdefs.h"
 
 int
@@ -2049,16 +2044,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2052: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2047: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2055: \$? = $ac_status" >&5
+  echo "$as_me:2050: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2061: \$? = $ac_status" >&5
+  echo "$as_me:2056: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2070,19 +2065,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2073: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:2068: result: $ac_cv_cxx_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
 GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="-g"
-echo "$as_me:2079: checking whether $CXX accepts -g" >&5
+echo "$as_me:2074: checking whether $CXX accepts -g" >&5
 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cxx_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2085 "configure"
+#line 2080 "configure"
 #include "confdefs.h"
 
 int
@@ -2094,16 +2089,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2097: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2100: \$? = $ac_status" >&5
+  echo "$as_me:2095: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2106: \$? = $ac_status" >&5
+  echo "$as_me:2101: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cxx_g=yes
 else
@@ -2113,7 +2108,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2116: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:2111: result: $ac_cv_prog_cxx_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -2140,7 +2135,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 2143 "configure"
+#line 2138 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2153,16 +2148,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2156: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2151: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2159: \$? = $ac_status" >&5
+  echo "$as_me:2154: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2165: \$? = $ac_status" >&5
+  echo "$as_me:2160: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2172,7 +2167,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2175 "configure"
+#line 2170 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2184,16 +2179,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2187: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2190: \$? = $ac_status" >&5
+  echo "$as_me:2185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2196: \$? = $ac_status" >&5
+  echo "$as_me:2191: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2218,7 +2213,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:2221: checking for $ac_word" >&5
+echo "$as_me:2216: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2233,7 +2228,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2236: found $ac_dir/$ac_word" >&5
+echo "$as_me:2231: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2241,10 +2236,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2244: result: $RANLIB" >&5
+  echo "$as_me:2239: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2247: result: no" >&5
+  echo "$as_me:2242: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2253,7 +2248,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:2256: checking for $ac_word" >&5
+echo "$as_me:2251: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2268,7 +2263,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:2271: found $ac_dir/$ac_word" >&5
+echo "$as_me:2266: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2277,10 +2272,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2280: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2275: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2283: result: no" >&5
+  echo "$as_me:2278: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2301,7 +2296,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2304: checking for a BSD compatible install" >&5
+echo "$as_me:2299: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2350,7 +2345,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2353: result: $INSTALL" >&5
+echo "$as_me:2348: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2365,7 +2360,7 @@ for ac_prog in mawk gawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2368: checking for $ac_word" >&5
+echo "$as_me:2363: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2380,7 +2375,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:2383: found $ac_dir/$ac_word" >&5
+echo "$as_me:2378: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2388,10 +2383,10 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2391: result: $AWK" >&5
+  echo "$as_me:2386: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2394: result: no" >&5
+  echo "$as_me:2389: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2402,7 +2397,7 @@ for ac_prog in make gmake
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2405: checking for $ac_word" >&5
+echo "$as_me:2400: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2417,7 +2412,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE="$ac_prog"
-echo "$as_me:2420: found $ac_dir/$ac_word" >&5
+echo "$as_me:2415: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2425,10 +2420,10 @@ fi
 fi
 MAKE=$ac_cv_prog_MAKE
 if test -n "$MAKE"; then
-  echo "$as_me:2428: result: $MAKE" >&5
+  echo "$as_me:2423: result: $MAKE" >&5
 echo "${ECHO_T}$MAKE" >&6
 else
-  echo "$as_me:2431: result: no" >&5
+  echo "$as_me:2426: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2439,7 +2434,7 @@ for ac_prog in ar gar
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2442: checking for $ac_word" >&5
+echo "$as_me:2437: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2454,7 +2449,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="$ac_prog"
-echo "$as_me:2457: found $ac_dir/$ac_word" >&5
+echo "$as_me:2452: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2462,10 +2457,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:2465: result: $AR" >&5
+  echo "$as_me:2460: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:2468: result: no" >&5
+  echo "$as_me:2463: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2476,7 +2471,7 @@ for ac_prog in gzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2479: checking for $ac_word" >&5
+echo "$as_me:2474: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2491,7 +2486,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GZIP="$ac_prog"
-echo "$as_me:2494: found $ac_dir/$ac_word" >&5
+echo "$as_me:2489: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2499,10 +2494,10 @@ fi
 fi
 GZIP=$ac_cv_prog_GZIP
 if test -n "$GZIP"; then
-  echo "$as_me:2502: result: $GZIP" >&5
+  echo "$as_me:2497: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:2505: result: no" >&5
+  echo "$as_me:2500: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2511,7 +2506,7 @@ done
 
 # Extract the first word of "doxygen", so it can be a program name with args.
 set dummy doxygen; ac_word=$2
-echo "$as_me:2514: checking for $ac_word" >&5
+echo "$as_me:2509: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_HAVE_DOXYGEN+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2526,7 +2521,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_HAVE_DOXYGEN="yes"
-echo "$as_me:2529: found $ac_dir/$ac_word" >&5
+echo "$as_me:2524: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2534,16 +2529,16 @@ fi
 fi
 HAVE_DOXYGEN=$ac_cv_prog_HAVE_DOXYGEN
 if test -n "$HAVE_DOXYGEN"; then
-  echo "$as_me:2537: result: $HAVE_DOXYGEN" >&5
+  echo "$as_me:2532: result: $HAVE_DOXYGEN" >&5
 echo "${ECHO_T}$HAVE_DOXYGEN" >&6
 else
-  echo "$as_me:2540: result: no" >&5
+  echo "$as_me:2535: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "man2html", so it can be a program name with args.
 set dummy man2html; ac_word=$2
-echo "$as_me:2546: checking for $ac_word" >&5
+echo "$as_me:2541: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_HAVE_MAN2HTML+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2558,7 +2553,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_HAVE_MAN2HTML="yes"
-echo "$as_me:2561: found $ac_dir/$ac_word" >&5
+echo "$as_me:2556: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2566,20 +2561,22 @@ fi
 fi
 HAVE_MAN2HTML=$ac_cv_prog_HAVE_MAN2HTML
 if test -n "$HAVE_MAN2HTML"; then
-  echo "$as_me:2569: result: $HAVE_MAN2HTML" >&5
+  echo "$as_me:2564: result: $HAVE_MAN2HTML" >&5
 echo "${ECHO_T}$HAVE_MAN2HTML" >&6
 else
-  echo "$as_me:2572: result: no" >&5
+  echo "$as_me:2567: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
+	COMPILER_VERSION=`$CXX --version 2>/dev/null | sed 's/\./ /;s/\..*//;s/ /\./;s/ .*//;s/^/gcc/'`
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-echo "$as_me:2582: checking for library containing gethostbyname" >&5
+echo "$as_me:2579: checking for library containing gethostbyname" >&5
 echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_search_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2587,7 +2584,7 @@ else
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_gethostbyname=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 2590 "configure"
+#line 2587 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2606,16 +2603,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2606: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2612: \$? = $ac_status" >&5
+  echo "$as_me:2609: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2618: \$? = $ac_status" >&5
+  echo "$as_me:2615: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_gethostbyname="none required"
 else
@@ -2627,7 +2624,7 @@ if test "$ac_cv_search_gethostbyname" = no; then
   for ac_lib in nsl; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 2630 "configure"
+#line 2627 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2646,16 +2643,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2649: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2652: \$? = $ac_status" >&5
+  echo "$as_me:2649: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2658: \$? = $ac_status" >&5
+  echo "$as_me:2655: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_gethostbyname="-l$ac_lib"
 break
@@ -2668,14 +2665,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:2671: result: $ac_cv_search_gethostbyname" >&5
+echo "$as_me:2668: result: $ac_cv_search_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6
 if test "$ac_cv_search_gethostbyname" != no; then
   test "$ac_cv_search_gethostbyname" = "none required" || LIBS="$ac_cv_search_gethostbyname $LIBS"
 
 fi
 
-echo "$as_me:2678: checking for library containing connect" >&5
+echo "$as_me:2675: checking for library containing connect" >&5
 echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6
 if test "${ac_cv_search_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2683,7 +2680,7 @@ else
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_connect=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 2686 "configure"
+#line 2683 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2702,16 +2699,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2708: \$? = $ac_status" >&5
+  echo "$as_me:2705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2714: \$? = $ac_status" >&5
+  echo "$as_me:2711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_connect="none required"
 else
@@ -2723,7 +2720,7 @@ if test "$ac_cv_search_connect" = no; then
   for ac_lib in socket; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 2726 "configure"
+#line 2723 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2742,16 +2739,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2742: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2748: \$? = $ac_status" >&5
+  echo "$as_me:2745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2754: \$? = $ac_status" >&5
+  echo "$as_me:2751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_connect="-l$ac_lib"
 break
@@ -2764,7 +2761,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:2767: result: $ac_cv_search_connect" >&5
+echo "$as_me:2764: result: $ac_cv_search_connect" >&5
 echo "${ECHO_T}$ac_cv_search_connect" >&6
 if test "$ac_cv_search_connect" != no; then
   test "$ac_cv_search_connect" = "none required" || LIBS="$ac_cv_search_connect $LIBS"
@@ -2776,7 +2773,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2779: checking how to run the C preprocessor" >&5
+echo "$as_me:2776: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2797,18 +2794,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2800 "configure"
+#line 2797 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2805: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2802: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2811: \$? = $ac_status" >&5
+  echo "$as_me:2808: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2831,17 +2828,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2834 "configure"
+#line 2831 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2838: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2835: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2844: \$? = $ac_status" >&5
+  echo "$as_me:2841: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2878,7 +2875,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2881: result: $CPP" >&5
+echo "$as_me:2878: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2888,18 +2885,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2891 "configure"
+#line 2888 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2896: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2893: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2902: \$? = $ac_status" >&5
+  echo "$as_me:2899: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2922,17 +2919,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2925 "configure"
+#line 2922 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2929: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2926: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2935: \$? = $ac_status" >&5
+  echo "$as_me:2932: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2960,7 +2957,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2963: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2960: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2971,13 +2968,13 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-echo "$as_me:2974: checking for ANSI C header files" >&5
+echo "$as_me:2971: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2980 "configure"
+#line 2977 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2985,13 +2982,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:2988: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2985: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2994: \$? = $ac_status" >&5
+  echo "$as_me:2991: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3013,7 +3010,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3016 "configure"
+#line 3013 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -3031,7 +3028,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3034 "configure"
+#line 3031 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -3052,7 +3049,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3055 "configure"
+#line 3052 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -3078,15 +3075,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3084: \$? = $ac_status" >&5
+  echo "$as_me:3081: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3089: \$? = $ac_status" >&5
+  echo "$as_me:3086: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3099,7 +3096,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:3102: result: $ac_cv_header_stdc" >&5
+echo "$as_me:3099: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -3112,13 +3109,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:3115: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:3112: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3121 "configure"
+#line 3118 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -3133,16 +3130,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3133: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3139: \$? = $ac_status" >&5
+  echo "$as_me:3136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3145: \$? = $ac_status" >&5
+  echo "$as_me:3142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -3152,7 +3149,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3155: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3152: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3165,7 +3162,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:3168: checking for opendir in -ldir" >&5
+  echo "$as_me:3165: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3173,7 +3170,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3176 "configure"
+#line 3173 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3192,16 +3189,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3192: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3198: \$? = $ac_status" >&5
+  echo "$as_me:3195: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3204: \$? = $ac_status" >&5
+  echo "$as_me:3201: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -3212,14 +3209,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3215: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:3212: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:3222: checking for opendir in -lx" >&5
+  echo "$as_me:3219: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3227,7 +3224,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3230 "configure"
+#line 3227 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3246,16 +3243,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3246: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3252: \$? = $ac_status" >&5
+  echo "$as_me:3249: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3258: \$? = $ac_status" >&5
+  echo "$as_me:3255: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -3266,7 +3263,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3269: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:3266: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -3274,13 +3271,13 @@ fi
 
 fi
 
-echo "$as_me:3277: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:3274: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3283 "configure"
+#line 3280 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3296,16 +3293,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3299: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3296: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3302: \$? = $ac_status" >&5
+  echo "$as_me:3299: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3308: \$? = $ac_status" >&5
+  echo "$as_me:3305: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -3315,7 +3312,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3318: result: $ac_cv_header_time" >&5
+echo "$as_me:3315: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -3328,23 +3325,23 @@ fi
 for ac_header in unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3331: checking for $ac_header" >&5
+echo "$as_me:3328: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3337 "configure"
+#line 3334 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3341: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3338: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3347: \$? = $ac_status" >&5
+  echo "$as_me:3344: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3363,7 +3360,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3366: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3363: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3376,23 +3373,23 @@ done
 for ac_header in sys/time.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3379: checking for $ac_header" >&5
+echo "$as_me:3376: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3385 "configure"
+#line 3382 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3389: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3386: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3395: \$? = $ac_status" >&5
+  echo "$as_me:3392: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3411,7 +3408,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3414: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3411: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3424,13 +3421,13 @@ done
 for ac_func in glob
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:3427: checking for $ac_func" >&5
+echo "$as_me:3424: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3433 "configure"
+#line 3430 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -3461,16 +3458,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3461: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3467: \$? = $ac_status" >&5
+  echo "$as_me:3464: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3473: \$? = $ac_status" >&5
+  echo "$as_me:3470: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -3480,7 +3477,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3483: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:3480: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3496,233 +3493,171 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:3504: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+echo "$as_me:3496: checking for socklen_t" >&5
+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+if test "${aclocal_cv_type_socklen_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
+
   cat >conftest.$ac_ext <<_ACEOF
-#line 3521 "configure"
+#line 3503 "configure"
 #include "confdefs.h"
-#include <assert.h>
-                     Syntax error
+#include <sys/types.h>
+#include <sys/socket.h>
+int
+main ()
+{
+socklen_t len = 42; return len;
+  ;
+  return 0;
+}
 _ACEOF
-if { (eval echo "$as_me:3526: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3516: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:3532: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
+  echo "$as_me:3519: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3522: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3525: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  aclocal_cv_type_socklen_t=yes
 else
   echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Broken: fails on valid input.
-continue
+cat conftest.$ac_ext >&5
+aclocal_cv_type_socklen_t=no
 fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-#line 3555 "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:3559: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:3565: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
+rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-echo "$as_me:3602: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-#line 3612 "configure"
-#include "confdefs.h"
-#include <assert.h>
-                     Syntax error
-_ACEOF
-if { (eval echo "$as_me:3617: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:3623: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-#line 3646 "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:3650: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:3656: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:3684: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-cat >conftest.$ac_ext <<_ACEOF
-#line 3696 "configure"
-#include "confdefs.h"
-#include <time.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "localtime_r" >/dev/null 2>&1; then
+echo "$as_me:3536: result: $aclocal_cv_type_socklen_t" >&5
+echo "${ECHO_T}$aclocal_cv_type_socklen_t" >&6
+  if test $aclocal_cv_type_socklen_t = yes; then
 
 cat >>confdefs.h <<\EOF
-#define HAVE_LOCALTIME_R 1
+#define HAVE_SOCKLEN_T 1
 EOF
 
-fi
-rm -f conftest*
+  else
 
-cat >conftest.$ac_ext <<_ACEOF
-#line 3712 "configure"
+cat >>confdefs.h <<\EOF
+#define HAVE_SOCKLEN_T 0
+EOF
+
+  fi
+
+echo "$as_me:3552: checking for gmtime_r" >&5
+echo $ECHO_N "checking for gmtime_r... $ECHO_C" >&6
+if test "${aclocal_cv_gmtime_r+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+	cat >conftest.$ac_ext <<_ACEOF
+#line 3559 "configure"
 #include "confdefs.h"
 #include <time.h>
-
+int
+main ()
+{
+gmtime_r((time_t*)0,(struct tm*)0) ;
+  ;
+  return 0;
+}
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "gmtime_r" >/dev/null 2>&1; then
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3571: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3574: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3577: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3580: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  aclocal_cv_gmtime_r=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+aclocal_cv_gmtime_r=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:3591: result: $aclocal_cv_gmtime_r" >&5
+echo "${ECHO_T}$aclocal_cv_gmtime_r" >&6
+	if test $aclocal_cv_gmtime_r = yes; then
 
 cat >>confdefs.h <<\EOF
 #define HAVE_GMTIME_R 1
 EOF
 
+	else
+
+cat >>confdefs.h <<\EOF
+#define HAVE_GMTIME_R 0
+EOF
+
+	fi
+
+echo "$as_me:3607: checking for localtime_r" >&5
+echo $ECHO_N "checking for localtime_r... $ECHO_C" >&6
+if test "${aclocal_cv_localtime_r+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+	cat >conftest.$ac_ext <<_ACEOF
+#line 3614 "configure"
+#include "confdefs.h"
+#include <time.h>
+int
+main ()
+{
+localtime_r((time_t*)0,(struct tm*)0) ;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3626: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3629: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3632: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3635: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  aclocal_cv_localtime_r=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+aclocal_cv_localtime_r=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:3646: result: $aclocal_cv_localtime_r" >&5
+echo "${ECHO_T}$aclocal_cv_localtime_r" >&6
+	if test $aclocal_cv_localtime_r = yes; then
+
+cat >>confdefs.h <<\EOF
+#define HAVE_LOCALTIME_R 1
+EOF
+
+	else
+
+cat >>confdefs.h <<\EOF
+#define HAVE_LOCALTIME_R 0
+EOF
+
+	fi
 
 # Check whether --enable-fhs or --disable-fhs was given.
 if test "${enable_fhs+set}" = set; then
@@ -3780,7 +3715,7 @@ fi
 
 SET_MAKE=""
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/glib/Makefile src/gnet/Makefile src/main/Makefile src/win32/Makefile lib/Makefile lib/gcc2.95/Makefile lib/msvc6.0/Makefile bin/Makefile doc/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/glib/Makefile src/gnet/Makefile src/gsmtp/Makefile src/main/Makefile src/win32/Makefile lib/Makefile lib/gcc2.95/Makefile lib/msvc6.0/Makefile bin/Makefile doc/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -3860,7 +3795,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:3863: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:3798: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -4036,7 +3971,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:4039: error: ambiguous option: $1
+    { { echo "$as_me:3974: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -4055,7 +3990,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:4058: error: unrecognized option: $1
+  -*) { { echo "$as_me:3993: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -4101,6 +4036,7 @@ do
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
   "src/glib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/glib/Makefile" ;;
   "src/gnet/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gnet/Makefile" ;;
+  "src/gsmtp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gsmtp/Makefile" ;;
   "src/main/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/main/Makefile" ;;
   "src/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/win32/Makefile" ;;
   "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
@@ -4110,7 +4046,7 @@ do
   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:4113: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:4049: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -4221,8 +4157,8 @@ s,@AR@,$AR,;t t
 s,@GZIP@,$GZIP,;t t
 s,@HAVE_DOXYGEN@,$HAVE_DOXYGEN,;t t
 s,@HAVE_MAN2HTML@,$HAVE_MAN2HTML,;t t
+s,@COMPILER_VERSION@,$COMPILER_VERSION,;t t
 s,@CPP@,$CPP,;t t
-s,@CXXCPP@,$CXXCPP,;t t
 s,@e_sbindir@,$e_sbindir,;t t
 s,@e_libexecdir@,$e_libexecdir,;t t
 s,@e_docdir@,$e_docdir,;t t
@@ -4344,7 +4280,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:4347: creating $ac_file" >&5
+    { echo "$as_me:4283: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -4362,7 +4298,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:4365: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:4301: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -4375,7 +4311,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:4378: error: cannot find input file: $f" >&5
+           { { echo "$as_me:4314: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -4436,7 +4372,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:4439: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:4375: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -4447,7 +4383,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:4450: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:4386: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -4460,7 +4396,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:4463: error: cannot find input file: $f" >&5
+           { { echo "$as_me:4399: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -4577,7 +4513,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:4580: $ac_file is unchanged" >&5
+      { echo "$as_me:4516: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.ac b/configure.ac
old mode 100755
new mode 100644
index 0e7eab5..a2820b0
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@ dnl ===
 dnl
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(src/main/gsmtp.h)
-AM_INIT_AUTOMAKE(emailrelay,0.9.9)
+AC_INIT(src/gsmtp/gsmtp.h)
+AM_INIT_AUTOMAKE(emailrelay,1.0.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl ===
@@ -37,6 +37,7 @@ AC_CHECK_PROGS(AR,ar gar)
 AC_CHECK_PROGS(GZIP,gzip)
 AC_CHECK_PROG(HAVE_DOXYGEN,doxygen,yes)
 AC_CHECK_PROG(HAVE_MAN2HTML,man2html,yes)
+ACLOCAL_COMPILER_VERSION
 
 dnl ===
 dnl check for libraries...
@@ -55,11 +56,9 @@ AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(sys/time.h)
 AC_CHECK_FUNCS(glob)
 AC_LANG_CPLUSPLUS
-dnl check for *_r() declarations -- using ac_check_funcs
-dnl is no good here since they may be in the library but
-dnl not the header (depending on preprocessor switches)
-AC_EGREP_HEADER(localtime_r,time.h,[AC_DEFINE(HAVE_LOCALTIME_R,1,[have reentrant localtime])])
-AC_EGREP_HEADER(gmtime_r,time.h,[AC_DEFINE(HAVE_GMTIME_R,1,[have reentrant gmtime])])
+ACLOCAL_TYPE_SOCKLEN_T
+ACLOCAL_CHECK_GMTIME_R
+ACLOCAL_CHECK_LOCALTIME_R
 
 dnl ===
 dnl directory tweaking...
@@ -89,5 +88,5 @@ SET_MAKE=""
 dnl ===
 dnl generate files...
 dnl
-AC_OUTPUT(Makefile src/Makefile src/glib/Makefile src/gnet/Makefile src/main/Makefile src/win32/Makefile lib/Makefile lib/gcc2.95/Makefile lib/msvc6.0/Makefile bin/Makefile doc/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/glib/Makefile src/gnet/Makefile src/gsmtp/Makefile src/main/Makefile src/win32/Makefile lib/Makefile lib/gcc2.95/Makefile lib/msvc6.0/Makefile bin/Makefile doc/Makefile)
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0f7a0ff..fdad2f8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -24,8 +24,9 @@ man_files_out=emailrelay.1.gz emailrelay-passwd.1.gz emailrelay-poke.1.gz emailr
 html_files_in=doxygen_header.html
 html_files_thru=index.html $(stylesheet)
 html_files_out=readme.html developer.html reference.html userguide.html windows.html emailrelay-man.html changelog.html
+png_files=gsmtp-classes.png gnet-classes.png
 
-EXTRA_DIST = $(man_files_in) $(txt_files) $(html_files_in) $(html_files_thru)
+EXTRA_DIST = $(man_files_in) $(txt_files) $(html_files_in) $(html_files_thru) $(png_files)
 noinst_SCRIPTS = .dox
 e_man1_DATA = $(man_files_out)
 e_doc_DATA = $(txt_files) $(html_files_out) $(html_files_thru)
@@ -45,7 +46,7 @@ converter_helper3=$(top_builddir)/bin/expand.sh
 converter_helper3_src=$(top_srcdir)/bin/expand.sh_
 
 .txt.html:
-	$(converter) -a "$(AWK)" $< $(stylesheet) > $*.html
+	$(converter) -a "$(AWK)" $(top_srcdir)/doc/$*.txt $(stylesheet) > $*.html
 
 $(filter): $(filter_src)
 	cp $(filter_src) $(filter)
@@ -71,7 +72,7 @@ $(converter_helper3): $(converter_helper3_src)
 	if test "$(HAVE_DOXYGEN)" = "yes" ; then cat $(top_srcdir)/src/main/doxygen.cfg | sed "s:__TOP_SRC__:$(top_srcdir):g" | sed "s:__TOP_BUILD__:$(top_builddir):g" | doxygen - && touch .dox ; else echo no doxygen ; fi
 
 emailrelay-man.html: emailrelay.1
-	if test "$(HAVE_MAN2HTML)" = "yes" ; then man2html $< > emailrelay-man.html ; fi
+	if test "$(HAVE_MAN2HTML)" = "yes" ; then man2html emailrelay.1 > emailrelay-man.html ; fi
 
 developer.html reference.html userguide.html: $(converter)
 
@@ -82,21 +83,22 @@ changelog.html: $(top_srcdir)/ChangeLog $(converter)
 	$(converter) -a "$(AWK)" $(top_srcdir)/ChangeLog $(stylesheet) > changelog.html
 
 emailrelay.1.gz : emailrelay.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $< > emailrelay.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay.1 > emailrelay.1.gz ; fi
 
 emailrelay-passwd.1.gz : emailrelay-passwd.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $< > emailrelay-passwd.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-passwd.1 > emailrelay-passwd.1.gz ; fi
 
 emailrelay-submit.1.gz : emailrelay-submit.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $< > emailrelay-submit.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-submit.1 > emailrelay-submit.1.gz ; fi
 
 emailrelay-poke.1.gz: emailrelay-poke.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $< > emailrelay-poke.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-poke.1 > emailrelay-poke.1.gz ; fi
 
-install-data-local:
+install-data-local: install-e_docDATA install-e_man1DATA
 	$(mkinstalldirs) $(DESTDIR)$(e_docdir)/doxygen
 	if test "$(HAVE_DOXYGEN)" = "yes" ; then for file in doxygen/* ; do $(INSTALL) $$file $(DESTDIR)$(e_docdir)/$$file ; done ; fi
 
 uninstall-local:
-	-rm -f $(DESTDIR)$(e_docdir)/html/* 2>/dev/null
+	-rmdir $(DESTDIR)$(e_docdir)/doxygen 2>/dev/null
+	-rmdir $(DESTDIR)$(e_docdir) 2>/dev/null
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index fa9fbf9..b1999ce 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -79,6 +79,7 @@ POST_UNINSTALL = :
 AR = @AR@
 AWK = @AWK@
 CC = @CC@
+COMPILER_VERSION = @COMPILER_VERSION@
 CXX = @CXX@
 GZIP = @GZIP@
 HAVE_DOXYGEN = @HAVE_DOXYGEN@
@@ -103,8 +104,9 @@ man_files_out = emailrelay.1.gz emailrelay-passwd.1.gz emailrelay-poke.1.gz emai
 html_files_in = doxygen_header.html
 html_files_thru = index.html $(stylesheet)
 html_files_out = readme.html developer.html reference.html userguide.html windows.html emailrelay-man.html changelog.html
+png_files = gsmtp-classes.png gnet-classes.png
 
-EXTRA_DIST = $(man_files_in) $(txt_files) $(html_files_in) $(html_files_thru)
+EXTRA_DIST = $(man_files_in) $(txt_files) $(html_files_in) $(html_files_thru) $(png_files)
 noinst_SCRIPTS = .dox
 e_man1_DATA = $(man_files_out)
 e_doc_DATA = $(txt_files) $(html_files_out) $(html_files_thru)
@@ -272,7 +274,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 .txt.html:
-	$(converter) -a "$(AWK)" $< $(stylesheet) > $*.html
+	$(converter) -a "$(AWK)" $(top_srcdir)/doc/$*.txt $(stylesheet) > $*.html
 
 $(filter): $(filter_src)
 	cp $(filter_src) $(filter)
@@ -298,7 +300,7 @@ $(converter_helper3): $(converter_helper3_src)
 	if test "$(HAVE_DOXYGEN)" = "yes" ; then cat $(top_srcdir)/src/main/doxygen.cfg | sed "s:__TOP_SRC__:$(top_srcdir):g" | sed "s:__TOP_BUILD__:$(top_builddir):g" | doxygen - && touch .dox ; else echo no doxygen ; fi
 
 emailrelay-man.html: emailrelay.1
-	if test "$(HAVE_MAN2HTML)" = "yes" ; then man2html $< > emailrelay-man.html ; fi
+	if test "$(HAVE_MAN2HTML)" = "yes" ; then man2html emailrelay.1 > emailrelay-man.html ; fi
 
 developer.html reference.html userguide.html: $(converter)
 
@@ -309,23 +311,24 @@ changelog.html: $(top_srcdir)/ChangeLog $(converter)
 	$(converter) -a "$(AWK)" $(top_srcdir)/ChangeLog $(stylesheet) > changelog.html
 
 emailrelay.1.gz : emailrelay.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $< > emailrelay.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay.1 > emailrelay.1.gz ; fi
 
 emailrelay-passwd.1.gz : emailrelay-passwd.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $< > emailrelay-passwd.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-passwd.1 > emailrelay-passwd.1.gz ; fi
 
 emailrelay-submit.1.gz : emailrelay-submit.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $< > emailrelay-submit.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-submit.1 > emailrelay-submit.1.gz ; fi
 
 emailrelay-poke.1.gz: emailrelay-poke.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $< > emailrelay-poke.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-poke.1 > emailrelay-poke.1.gz ; fi
 
-install-data-local:
+install-data-local: install-e_docDATA install-e_man1DATA
 	$(mkinstalldirs) $(DESTDIR)$(e_docdir)/doxygen
 	if test "$(HAVE_DOXYGEN)" = "yes" ; then for file in doxygen/* ; do $(INSTALL) $$file $(DESTDIR)$(e_docdir)/$$file ; done ; fi
 
 uninstall-local:
-	-rm -f $(DESTDIR)$(e_docdir)/html/* 2>/dev/null
+	-rmdir $(DESTDIR)$(e_docdir)/doxygen 2>/dev/null
+	-rmdir $(DESTDIR)$(e_docdir) 2>/dev/null
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/developer.txt b/doc/developer.txt
index d3d80b9..93f5017 100644
--- a/doc/developer.txt
+++ b/doc/developer.txt
@@ -3,15 +3,12 @@ E-MailRelay Developer guide
 
 Module structure
 ----------------
-There are two C++ libraries in the E-MailRelay code: "glib" provides low-level
+There are three C++ libraries in the E-MailRelay code: "glib" provides low-level
 classes for file-system abstraction, date and time representation, string
-utility functions, logging, command line parsing etc., and "gnet" provides
-network classes using the Berkley socket and Winsock APIs. Both libraries
-are portable between POSIX-like systems (eg. Linux) and Windows.
-
-The application-level classes are implemented within the "GSmtp" and "Main"
-namespaces. The key interfaces in the "GSmtp" namespace are "ClientProtocol",
-"ServerProtocol" and "MessageStore".
+utility functions, logging, command line parsing etc., "gnet" provides network
+classes using the Berkley socket and Winsock APIs, and "gsmtp" contains SMTP and
+message-store classes. All three libraries are portable between POSIX-like
+systems (eg. Linux) and Windows.
 
 Under Windows there is an additional library for event handling. Windows has
 historically built network event processing on top of the GUI event system,
@@ -38,8 +35,8 @@ another for immediate forwarding ("ProtocolMessageForward").
 The protocol and message-store functionality are brought together by the
 high-level "GSmtp::Server" and "GSmtp::Client" classes.
 
-Simplified class diagrams for the *GNet* [graphics/gnet-classes.png] and
-*GSmtp* [graphics/gsmtp-classes.png] namespaces are available.
+Simplified class diagrams for the *GNet* [gnet-classes.png] and
+*GSmtp* [gsmtp-classes.png] namespaces are available.
 
 Directory structure
 -------------------
@@ -57,6 +54,10 @@ Directory structure
 
   A network library using Berkley sockets or Winsock.
 
+# src/gsmtp
+
+  An SMTP library.
+
 # src/win32
 
   Additional classes for windows event processing.
@@ -87,9 +88,9 @@ For a quick bottom-up tour of the code take a look at the following headers:
 * src/gnet/gaddress.h
 * src/gnet/gsocket.h
 * src/gnet/gserver.h
-* src/main/gmessagestore.h
-* src/main/gserverprotocol.h
-* src/main/gsmtpserver.h
+* src/smtp/gmessagestore.h
+* src/smtp/gserverprotocol.h
+* src/smtp/gsmtpserver.h
 
 Portability
 -----------
diff --git a/doc/emailrelay.1 b/doc/emailrelay.1
index 0092c85..2aa431b 100644
--- a/doc/emailrelay.1
+++ b/doc/emailrelay.1
@@ -58,13 +58,13 @@ server.
 Enables the administration interface and specifies its listening port number.
 .TP
 .B \-q,--as-client \fIhost:port\fR
-Equivalent to \fI--log\fR \fI--no-syslog\fR \fI--no-daemon\fR \fI--dont-serve\fR \fI--forward\fR \fI--forward-to\fR.
+Runs as a client, forwarding spooled mail to <host>: equivalent to \fI--log\fR \fI--no-syslog\fR \fI--no-daemon\fR \fI--dont-serve\fR \fI--forward\fR \fI--forward-to\fR.
 .TP
 .B \-y,--as-proxy \fIhost:port\fR
-Equivalent to \fI--log\fR \fI--close-stderr\fR \fI--immediate\fR \fI--forward-to\fR.
+Runs as a proxy: equivalent to \fI--log\fR \fI--close-stderr\fR \fI--immediate\fR \fI--forward-to\fR.
 .TP
 .B \-d,--as-server 
-Equivalent to \fI--log\fR \fI--close-stderr\fR.
+Runs as a server: equivalent to \fI--log\fR \fI--close-stderr\fR.
 .TP
 .B \-C,--client-auth \fIfile\fR
 Enables authentication with remote server, using the given secrets file.
@@ -75,14 +75,20 @@ Closes the standard error stream after start-up.
 .B \-U,--connection-timeout \fItime\fR
 Sets the timeout (in seconds) when connecting to a remote server (default is 40).
 .TP
+.B \-g,--debug 
+Generates debug-level logging (if compiled-in).
+.TP
 .B \-D,--domain \fIfqdn\fR
 Sets an override for the host's fully qualified domain name.
 .TP
+.B \-X,--dont-listen 
+Dont listen for smtp connections (usually used with \fI--admin\fR).
+.TP
 .B \-x,--dont-serve 
-Stops the process acting as a server (usually used with \fI--forward\fR).
+Dont act as a server (usually used with \fI--forward\fR).
 .TP
 .B \-z,--filter \fIprogram\fR
-Defines a mail pre-processor.
+Defines a mail processor program.
 .TP
 .B \-f,--forward 
 Forwards stored mail on startup (requires \fI--forward-to\fR).
@@ -96,8 +102,11 @@ Displays help text and exits.
 .B \-m,--immediate 
 Forwards each message as soon as it is received (requires \fI--forward-to\fR).
 .TP
+.B \-I,--interface \fIip-address\fR
+Listen on a specific interface.
+.TP
 .B \-l,--log 
-Writes log information on standard error (if open) and syslog (if not disabled).
+Writes log information on standard error and syslog.
 .TP
 .B \-L,--log-time 
 Adds a timestamp to the logging output.
@@ -124,68 +133,33 @@ Sets the response timeout (in seconds) when talking to a remote server (default
 Enables authentication of remote clients, using the given secrets file.
 .TP
 .B \-s,--spool-dir \fIdir\fR
-Specifies the spool directory (default is \fI/usr/local/var/spool/emailrelay\fR).
+Specifies the spool directory (default is \fI/var/spool/emailrelay\fR).
 .TP
 .B \-u,--user \fIusername\fR
 Names the effective user to switch to when started as root (default is \fIdaemon\fR).
 .TP
 .B \-v,--verbose 
-Generates more verbose logging (if compiled-in and logging enabled and stderr open).
+Generates more verbose output (works with \fI--help\fR and \fI--log\fR).
+.TP
+.B \-Z,--verifier \fIprogram\fR
+Defines an external address verifier program.
 .TP
 .B \-V,--version 
 Displays version information and exits.
 .SH FILES
 GNU style...
 .br
-/usr/local/libexec/emailrelay-passwd
-.br
-/usr/local/libexec/emailrelay-poke
-.br
 /usr/local/libexec/emailrelay
 .br
-/usr/local/libexec/emailrelay-notify.sh
-.br
 /usr/local/libexec/emailrelay-deliver.sh
 .br
+/usr/local/libexec/emailrelay-notify.sh
+.br
+/usr/local/libexec/emailrelay-poke
+.br
 /usr/local/libexec/emailrelay-process.sh
 .br
-/usr/local/sbin/emailrelay-submit
-.br
-/usr/local/sbin/emailrelay
-.br
-/usr/local/share/emailrelay/doc/developer.txt
-.br
-/usr/local/share/emailrelay/doc/reference.txt
-.br
-/usr/local/share/emailrelay/doc/userguide.txt
-.br
-/usr/local/share/emailrelay/doc/windows.txt
-.br
-/usr/local/share/emailrelay/doc/readme.html
-.br
-/usr/local/share/emailrelay/doc/developer.html
-.br
-/usr/local/share/emailrelay/doc/reference.html
-.br
-/usr/local/share/emailrelay/doc/userguide.html
-.br
-/usr/local/share/emailrelay/doc/windows.html
-.br
-/usr/local/share/emailrelay/doc/emailrelay-man.html
-.br
-/usr/local/share/emailrelay/doc/index.html
-.br
-/usr/local/share/emailrelay/doc/changelog.html
-.br
-/usr/local/share/emailrelay/doc/emailrelay.css
-.br
-/usr/local/share/emailrelay/doc/NEWS
-.br
-/usr/local/share/emailrelay/doc/README
-.br
-/usr/local/share/emailrelay/doc/changelog.gz
-.br
-/usr/local/man/man1/emailrelay.1.gz
+/usr/local/libexec/emailrelay-resubmit.sh
 .br
 /usr/local/man/man1/emailrelay-passwd.1.gz
 .br
@@ -193,51 +167,59 @@ GNU style...
 .br
 /usr/local/man/man1/emailrelay-submit.1.gz
 .br
-/usr/local/var/spool/emailrelay/emailrelay.*.envelope
+/usr/local/man/man1/emailrelay.1.gz
+.br
+/usr/local/sbin/emailrelay
+.br
+/usr/local/sbin/emailrelay-passwd
+.br
+/usr/local/sbin/emailrelay-submit
+.br
+/usr/local/share/emailrelay/doc/NEWS
+.br
+/usr/local/share/emailrelay/doc/README
+.br
+/usr/local/share/emailrelay/doc/changelog.gz
+.br
+/usr/local/share/emailrelay/doc/changelog.html
+.br
+/usr/local/share/emailrelay/doc/developer.html
+.br
+/usr/local/share/emailrelay/doc/developer.txt
+.br
+/usr/local/share/emailrelay/doc/emailrelay.css
+.br
+/usr/local/share/emailrelay/doc/index.html
+.br
+/usr/local/share/emailrelay/doc/readme.html
+.br
+/usr/local/share/emailrelay/doc/reference.html
+.br
+/usr/local/share/emailrelay/doc/reference.txt
+.br
+/usr/local/share/emailrelay/doc/userguide.html
+.br
+/usr/local/share/emailrelay/doc/userguide.txt
+.br
+/usr/local/share/emailrelay/doc/windows.html
+.br
+/usr/local/share/emailrelay/doc/windows.txt
 .br
 /usr/local/var/spool/emailrelay/emailrelay.*.content
+.br
+/usr/local/var/spool/emailrelay/emailrelay.*.envelope
 .LP
 FHS style...
 .br
-/usr/lib/emailrelay-passwd
+/etc/init.d/emailrelay
 .br
-/usr/lib/emailrelay-poke
-.br
-/usr/sbin/emailrelay-submit
+/usr/lib/emailrelay/emailrelay-poke
 .br
 /usr/sbin/emailrelay
 .br
-/usr/share/doc/emailrelay/examples/emailrelay-notify.sh
+/usr/sbin/emailrelay-passwd
 .br
-/usr/share/doc/emailrelay/examples/emailrelay-deliver.sh
-.br
-/usr/share/doc/emailrelay/examples/emailrelay-process.sh
-.br
-/usr/share/doc/emailrelay/developer.txt
-.br
-/usr/share/doc/emailrelay/reference.txt
-.br
-/usr/share/doc/emailrelay/userguide.txt
-.br
-/usr/share/doc/emailrelay/windows.txt
-.br
-/usr/share/doc/emailrelay/readme.html
-.br
-/usr/share/doc/emailrelay/developer.html
-.br
-/usr/share/doc/emailrelay/reference.html
-.br
-/usr/share/doc/emailrelay/userguide.html
-.br
-/usr/share/doc/emailrelay/windows.html
-.br
-/usr/share/doc/emailrelay/emailrelay-man.html
-.br
-/usr/share/doc/emailrelay/index.html
-.br
-/usr/share/doc/emailrelay/changelog.html
-.br
-/usr/share/doc/emailrelay/emailrelay.css
+/usr/sbin/emailrelay-submit
 .br
 /usr/share/doc/emailrelay/NEWS
 .br
@@ -245,7 +227,37 @@ FHS style...
 .br
 /usr/share/doc/emailrelay/changelog.gz
 .br
-/usr/share/man/man1/emailrelay.1.gz
+/usr/share/doc/emailrelay/changelog.html
+.br
+/usr/share/doc/emailrelay/developer.html
+.br
+/usr/share/doc/emailrelay/developer.txt
+.br
+/usr/share/doc/emailrelay/emailrelay.css
+.br
+/usr/share/doc/emailrelay/examples/emailrelay-deliver.sh
+.br
+/usr/share/doc/emailrelay/examples/emailrelay-notify.sh
+.br
+/usr/share/doc/emailrelay/examples/emailrelay-process.sh
+.br
+/usr/share/doc/emailrelay/examples/emailrelay-resubmit.sh
+.br
+/usr/share/doc/emailrelay/index.html
+.br
+/usr/share/doc/emailrelay/readme.html
+.br
+/usr/share/doc/emailrelay/reference.html
+.br
+/usr/share/doc/emailrelay/reference.txt
+.br
+/usr/share/doc/emailrelay/userguide.html
+.br
+/usr/share/doc/emailrelay/userguide.txt
+.br
+/usr/share/doc/emailrelay/windows.html
+.br
+/usr/share/doc/emailrelay/windows.txt
 .br
 /usr/share/man/man1/emailrelay-passwd.1.gz
 .br
@@ -253,11 +265,11 @@ FHS style...
 .br
 /usr/share/man/man1/emailrelay-submit.1.gz
 .br
-/etc/init.d/emailrelay
-.br
-/var/spool/emailrelay/emailrelay.*.envelope
+/usr/share/man/man1/emailrelay.1.gz
 .br
 /var/spool/emailrelay/emailrelay.*.content
+.br
+/var/spool/emailrelay/emailrelay.*.envelope
 .SH SEE ALSO
 E-MailRelay user guide
 .br
diff --git a/doc/emailrelay.css b/doc/emailrelay.css
index 45ae592..be33ca6 100644
--- a/doc/emailrelay.css
+++ b/doc/emailrelay.css
@@ -8,6 +8,7 @@ div.two-column-content
 
 div.two-column-menu
 {
+	color: inherit ;
 	background-color: #eee ;
 
 	position: absolute ;
@@ -28,7 +29,9 @@ div.two-column-menu
 body 
 {
 	font-family: verdana, arial, helvetica, sans-serif ;
-	background-color: white ;
+
+	color: #000 ;
+	background-color: #fff ;
 }
 
 div.div-main
@@ -39,7 +42,8 @@ div.div-main
 
 div.div-toc
 {
-	background: #eee ;
+	color: inherit ;
+	background-color: #eee ;
 }
 
 p.p-toc
@@ -55,7 +59,8 @@ div.div-pre
 {
 	margin-left: 3% ;
 	/* font-size: smaller ; */ /* smaller is unreadable on ie5 */
-	background: #eee ;
+	color: inherit ;
+	background-color: #eee ;
 	padding: 0.5em ;
 	border: none ;
 }
@@ -64,6 +69,7 @@ h1
 {
 	text-align: center ;
 	color: #09c ;
+	background-color: inherit ;
 }
 
 img
@@ -74,22 +80,25 @@ img
 h2
 {
 	color: #09c ;
+	background-color: inherit ;
 }
 
 p 
 {
-	font: verdana, arial, helvetica, sans-serif ;
+	font-family: verdana, arial, helvetica, sans-serif ;
 	text-align: justify ;
 }
 
 a.a-toc
 {
 	color: #09c ;
+	background-color: inherit ;
 	text-decoration: none ;
 }
 
 a.a-toc:hover 
 {
+	color: #09c ;
 	background-color: #ccc ;
 }
 
@@ -107,20 +116,24 @@ a.a-href
 a.a-href:link 
 {
 	color: #09c ;
+	background-color: inherit ;
 }
 
 a.a-href:visited 
 {
 	color: #07a ;
+	background-color: inherit ;
 }
 
 a.a-href:hover 
 {
+	color: #09c ;
 	background-color: #eee ;
 }
 
 div.two-column-header
 {
+	color: inherit ;
 	background-color: #eee ;
 
 	border-style: solid ;
diff --git a/doc/gnet-classes.png b/doc/gnet-classes.png
new file mode 100644
index 0000000..8918a00
Binary files /dev/null and b/doc/gnet-classes.png differ
diff --git a/doc/gsmtp-classes.png b/doc/gsmtp-classes.png
new file mode 100644
index 0000000..981b1b7
Binary files /dev/null and b/doc/gsmtp-classes.png differ
diff --git a/doc/index.html b/doc/index.html
index 4026a98..71b7dbd 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -8,15 +8,15 @@
   <div class="div-main">
    <h1>E-MailRelay Documentation</h1>
     <ul>
-     <li><a href="readme.html">Readme</a></li>
-     <li><a href="changelog.html">Change log</a></li>
-     <li><a href="userguide.html">User guide</a></li>
-     <li><a href="reference.html">Reference manual</a></li>
-     <li><a href="windows.html">Windows installation guide</a></li>
-     <li><a href="developer.html">Notes for developers</a></li>
-     <li><a href="doxygen/index.html">Source code documentation</a> (generated by <a href="http://www.doxygen.org">doxygen</a>, if available)</li>
-     <li><a href="emailrelay-man.html">Man page</a> (generated by man2html, if available)</li>
-     <li><a href="http://emailrelay.sourceforge.net">Web site</a></li>
+     <li><a class="a-href" href="readme.html">Readme</a></li>
+     <li><a class="a-href" href="changelog.html">Change log</a></li>
+     <li><a class="a-href" href="userguide.html">User guide</a></li>
+     <li><a class="a-href" href="reference.html">Reference manual</a></li>
+     <li><a class="a-href" href="windows.html">Windows installation guide</a></li>
+     <li><a class="a-href" href="developer.html">Notes for developers</a></li>
+     <li><a class="a-href" href="doxygen/index.html">Source code documentation</a> (generated by <a class="a-href" href="http://www.doxygen.org">doxygen</a>, if available)</li>
+     <li><a class="a-href" href="emailrelay-man.html">Man page</a> (generated by man2html, if available)</li>
+     <li><a class="a-href" href="http://emailrelay.sourceforge.net">Web site</a></li>
     </ul>
    </div>
  </body>
diff --git a/doc/reference.txt b/doc/reference.txt
index fbdec4d..c29eacb 100644
--- a/doc/reference.txt
+++ b/doc/reference.txt
@@ -13,18 +13,17 @@ The "emailrelay" program supports the following command-line usage:
 	emailrelay [<switch> [<switch> ...]]
 
 where <switch> is:
-
 # --admin (-a)
   Enables the administration interface and specifies its listening port number.
 
 # --as-client (-q)
-  Equivalent to "--log --no-syslog --no-daemon --dont-serve --forward --forward-to".
+  Runs as a client, forwarding spooled mail to <host>: equivalent to "--log --no-syslog --no-daemon --dont-serve --forward --forward-to".
 
 # --as-proxy (-y)
-  Equivalent to "--log --close-stderr --immediate --forward-to".
+  Runs as a proxy: equivalent to "--log --close-stderr --immediate --forward-to".
 
 # --as-server (-d)
-  Equivalent to "--log --close-stderr".
+  Runs as a server: equivalent to "--log --close-stderr".
 
 # --client-auth (-C)
   Enables authentication with remote server, using the given secrets file.
@@ -35,14 +34,20 @@ where <switch> is:
 # --connection-timeout (-U)
   Sets the timeout (in seconds) when connecting to a remote server (default is 40).
 
+# --debug (-g)
+  Generates debug-level logging (if compiled-in).
+
 # --domain (-D)
   Sets an override for the host's fully qualified domain name.
 
+# --dont-listen (-X)
+  Dont listen for smtp connections (usually used with --admin).
+
 # --dont-serve (-x)
-  Stops the process acting as a server (usually used with --forward).
+  Dont act as a server (usually used with --forward).
 
 # --filter (-z)
-  Defines a mail pre-processor.
+  Defines a mail processor program.
 
 # --forward (-f)
   Forwards stored mail on startup (requires --forward-to).
@@ -56,8 +61,11 @@ where <switch> is:
 # --immediate (-m)
   Forwards each message as soon as it is received (requires --forward-to).
 
+# --interface (-I)
+  Listen on a specific interface.
+
 # --log (-l)
-  Writes log information on standard error (if open) and syslog (if not disabled).
+  Writes log information on standard error and syslog.
 
 # --log-time (-L)
   Adds a timestamp to the logging output.
@@ -84,13 +92,16 @@ where <switch> is:
   Enables authentication of remote clients, using the given secrets file.
 
 # --spool-dir (-s)
-  Specifies the spool directory (default is "/usr/local/var/spool/emailrelay").
+  Specifies the spool directory (default is "/var/spool/emailrelay").
 
 # --user (-u)
   Names the effective user to switch to when started as root (default is "daemon").
 
 # --verbose (-v)
-  Generates more verbose logging (if compiled-in and logging enabled and stderr open).
+  Generates more verbose output (works with --help and --log).
+
+# --verifier (-Z)
+  Defines an external address verifier program.
 
 # --version (-V)
   Displays version information and exits.
@@ -181,6 +192,29 @@ SMTP issues
   re-encode 8-bit messages into 7-bit messages if the next-hop server
   does not.
 
+Address validation
+------------------
+An address supplied to the SMTP commands "RCPT" and "VRFY" is normally accepted
+if it contains an at sign, or if it is some sort of local "postmaster" address
+(as described above). However, this behaviour can be modified by using an external
+verifier program, using the "--verifier" command-line switch.
+
+The verifier program is passed a command-line containing the full address, the
+user-name part of the address, the host-name part, the local host's fully
+qualified domain name, and the current "MAIL" command's "FROM:" address or the
+empty string for the "VRFY" command.
+
+For valid local mailbox addresses the verifier is expected to write two lines to
+the standard output -- the full name associated with the mailbox, and the
+canonical mailbox name -- and then exit with a value of zero. For valid non-local
+addresses the first line of output should be empty, the second line should be
+copied from the first command-line argument, and the exit value should be one.
+For invalid addresses the exit value should be greater than one, and anything
+written to the standard output is taken as the failure reason.
+
+(Only the few few thousand characters are read from the verifier's standard
+output stream; any more is thrown away.)
+
 Administration interface
 ------------------------
 If enabled, the server will provide a network interface for performing
@@ -198,31 +232,31 @@ functionality of storage daemon and forwarding client. This might be useful
 in systems which are low on memory: the memory footprint of "telnet" or
 "emailrelay-poke" will be much smaller than "emailrelay --as-client".
 
-Mail pre-processing
--------------------
-The "--filter" command-line switch allows you to specify a pre-processor program
+Mail processing
+---------------
+The "--filter" command-line switch allows you to specify a mail processor program
 which operates on mail messages as they pass through the E-MailRelay system. The
-pre-processor program is run as soon as the mail message has been stored in the
+mail processor program is run as soon as the mail message has been stored in the
 spool directory, with the full path of the content file specified on the command
 line.
 
 This can be combined with the "--immediate" (or "--as-proxy") switch to implement
-personal mail pre-processing, without replacing or reconfiguring the system's
+personal mail processing, without replacing or reconfiguring the system's
 default MTA.
 
-For example, the following command will start a proxy server on port 10025
-which pre-processes mail using the specified filter program, and then
-forwards the mail on to the system's default MTA (on port 25):
+For example, the following command will start a proxy server on port 10025 which
+processes mail using the specified filter program, and then forwards the mail on
+to the system's default MTA (on port 25):
 
 	emailrelay --as-proxy localhost:smtp --port 10025 --no-syslog \
 	  --filter ${HOME}/.emailrelay/filter \
 	  --spool-dir ${HOME}/.emailrelay/spool
 
-The pre-processor program should terminate with an exit code of zero to indicate
+The mail processor program should terminate with an exit code of zero to indicate
 success. An exit code of 100 can be used to cancel all further processing of the
 message, and any other non-zero exit code is used to indicate an error.
 
-For example, the following pre-processor shell script examines the client's
+For example, the following mail processor shell script examines the client's
 IP address and conditionally dumps the message into "sendmail" (using the
 sendmail command-line interface rather than SMTP):
 
@@ -239,14 +273,14 @@ sendmail command-line interface rather than SMTP):
 	fi
 	exit 0
 
-An example pre-processor script which does simple rot-13 masking of messages is
+An example mail processor script which does simple rot-13 masking of messages is
 also provided in the distribution ("share/emailrelay/emailrelay-process.sh").
 This could be used as a template for a more sophisticated message encryption
 system.
 
 Security issues
 ---------------
-A major security concern is the use of an external mail pre-processor (using the
+A major security concern is the use of an external mail processor (using the
 "--filter" switch), and so the following precautions are taken:
 
 # effective userid
@@ -261,13 +295,13 @@ A major security concern is the use of an external mail pre-processor (using the
 
 # execution environment
 
-  The pre-processor runs with an almost empty set of environment variables ("PATH"
+  The mail processor runs with an almost empty set of environment variables ("PATH"
   and "IFS"), and with no open file descriptors other than "stdin"/"stdout"/"stderr"
   open onto "/dev/null".
 
 # configuration
 
-  The pre-processor filename has to be configured using a full path, so there is
+  The mail processor filename has to be configured using a full path, so there is
   no dependence on the current working directory or the PATH environment variable.
 
 Security issues which relate to the SMTP protocol itself are beyond the scope of
@@ -284,7 +318,7 @@ Some other points are:
 * Strings are dynamically allocated, so buffer overflow/truncation issues are avoided.
 * By default connections to the SMTP and administrative ports will be rejected if they come from remote machines.
 * No configuration parameters can be changed through the administrative interface.
-* No exec(), system() or popen() calls are used other than execve() to spawn the mail pre-processor.
+* No exec(), system() or popen() calls are used other than execve() to spawn the mail processor.
 * The submit utility is installed as set-group-id with group ownership of "daemon".
 
 Authentication
@@ -339,7 +373,7 @@ least make sure that the secrets file has tight permissions, and that the
 passwords in it are not also used for anything important (such as root access).
 
 On the server side authentication is advertised in the response to the SMTP
-"EHLO" command if the "--auth-server" command line switch is used, but
+"EHLO" command if the "--auth-server" command-line switch is used, but
 authentication by the client is optional. If the client does authenticate then
 the authenticated user-id is stored with the message and then passed on to a
 next-hop server using an "AUTH=userid" parameter on the SMTP "MAIL FROM"
@@ -362,80 +396,99 @@ from a particular IP address is allowed. This type of POP-before-SMTP
 authentication can be done outside the E-MailRelay system by POP/IMAP utilities
 such as "fetchmail".
 
-Installation directories
-------------------------
+Application notes
+-----------------
+# *Mutt* [http://www.mutt.org]
+
+  Mutt can be configured to use the E-MailRelay 'submit' program rather than
+  "sendmail" with an entry in the ".muttrc" file like this:
+
+	set sendmail="/usr/local/libexec/emailrelay-submit"
+
+# *Spam Assassin* [http://spamassassin.taint.org]
+
+  The E-MailRelay server can use Spam Assasin to mark potential spam by having
+  a small shell script which calls spamassassin's "spamc" program installed
+  as the E-MailRelay mail processor (using the "--filter" command-line switch).
+
+  The shell script would look something like this:
+
+	#!/bin/sh
+	tmp="`basename $0`.$$.tmp"
+	cat ${1} | spamc > ${tmp} && mv ${tmp} ${1}
+
+Files and directories
+---------------------
 By default "make install" installs files in the following locations:
-* /usr/local/libexec/emailrelay-poke
-* /usr/local/libexec/emailrelay-notify.sh
-* /usr/local/libexec/emailrelay-deliver.sh
-* /usr/local/libexec/emailrelay-resubmit.sh
 * /usr/local/libexec/emailrelay
+* /usr/local/libexec/emailrelay-deliver.sh
+* /usr/local/libexec/emailrelay-notify.sh
+* /usr/local/libexec/emailrelay-poke
 * /usr/local/libexec/emailrelay-process.sh
-* /usr/local/sbin/emailrelay
-* /usr/local/sbin/emailrelay-passwd
-* /usr/local/sbin/emailrelay-submit
-* /usr/local/var/spool/emailrelay/*
-* /usr/local/share/emailrelay/doc/developer.txt
-* /usr/local/share/emailrelay/doc/reference.txt
-* /usr/local/share/emailrelay/doc/userguide.txt
-* /usr/local/share/emailrelay/doc/windows.txt
-* /usr/local/share/emailrelay/doc/readme.html
-* /usr/local/share/emailrelay/doc/developer.html
-* /usr/local/share/emailrelay/doc/reference.html
-* /usr/local/share/emailrelay/doc/userguide.html
-* /usr/local/share/emailrelay/doc/windows.html
-* /usr/local/share/emailrelay/doc/emailrelay-man.html
-* /usr/local/share/emailrelay/doc/index.html
-* /usr/local/share/emailrelay/doc/changelog.html
-* /usr/local/share/emailrelay/doc/emailrelay.css
-* /usr/local/share/emailrelay/doc/NEWS
-* /usr/local/share/emailrelay/doc/README
-* /usr/local/share/emailrelay/doc/changelog.gz
-* /usr/local/share/emailrelay/doc/doxygen/*
-* /usr/local/man/man1/emailrelay.1.gz
+* /usr/local/libexec/emailrelay-resubmit.sh
 * /usr/local/man/man1/emailrelay-passwd.1.gz
 * /usr/local/man/man1/emailrelay-poke.1.gz
 * /usr/local/man/man1/emailrelay-submit.1.gz
+* /usr/local/man/man1/emailrelay.1.gz
+* /usr/local/sbin/emailrelay
+* /usr/local/sbin/emailrelay-passwd
+* /usr/local/sbin/emailrelay-submit
+* /usr/local/share/emailrelay/doc/NEWS
+* /usr/local/share/emailrelay/doc/README
+* /usr/local/share/emailrelay/doc/changelog.gz
+* /usr/local/share/emailrelay/doc/changelog.html
+* /usr/local/share/emailrelay/doc/developer.html
+* /usr/local/share/emailrelay/doc/developer.txt
+* /usr/local/share/emailrelay/doc/emailrelay.css
+* /usr/local/share/emailrelay/doc/index.html
+* /usr/local/share/emailrelay/doc/readme.html
+* /usr/local/share/emailrelay/doc/reference.html
+* /usr/local/share/emailrelay/doc/reference.txt
+* /usr/local/share/emailrelay/doc/userguide.html
+* /usr/local/share/emailrelay/doc/userguide.txt
+* /usr/local/share/emailrelay/doc/windows.html
+* /usr/local/share/emailrelay/doc/windows.txt
+* /usr/local/var/spool/emailrelay/emailrelay.*.content
+* /usr/local/var/spool/emailrelay/emailrelay.*.envelope
 
 This directory structure is constrained by the GNU/"autoconf" conventions rather
 than the Filesystem Hierarchy Standard (FHS).
 
 To force FHS compliance you can use the "--enable-fhs" switch when running
 "configure". This results in the following file locations:
+* /etc/init.d/emailrelay
 * /usr/lib/emailrelay/emailrelay-poke
 * /usr/sbin/emailrelay
 * /usr/sbin/emailrelay-passwd
 * /usr/sbin/emailrelay-submit
-* /usr/share/doc/emailrelay/examples/emailrelay-notify.sh
-* /usr/share/doc/emailrelay/examples/emailrelay-deliver.sh
-* /usr/share/doc/emailrelay/examples/emailrelay-resubmit.sh
-* /usr/share/doc/emailrelay/examples/emailrelay-process.sh
-* /usr/share/doc/emailrelay/developer.txt
-* /usr/share/doc/emailrelay/reference.txt
-* /usr/share/doc/emailrelay/userguide.txt
-* /usr/share/doc/emailrelay/windows.txt
-* /usr/share/doc/emailrelay/readme.html
-* /usr/share/doc/emailrelay/developer.html
-* /usr/share/doc/emailrelay/reference.html
-* /usr/share/doc/emailrelay/userguide.html
-* /usr/share/doc/emailrelay/windows.html
-* /usr/share/doc/emailrelay/emailrelay-man.html
-* /usr/share/doc/emailrelay/index.html
-* /usr/share/doc/emailrelay/changelog.html
-* /usr/share/doc/emailrelay/emailrelay.css
 * /usr/share/doc/emailrelay/NEWS
 * /usr/share/doc/emailrelay/README
 * /usr/share/doc/emailrelay/changelog.gz
-* /usr/share/doc/emailrelay/doxygen/*
-* /usr/share/man/man1/emailrelay.1.gz
+* /usr/share/doc/emailrelay/changelog.html
+* /usr/share/doc/emailrelay/developer.html
+* /usr/share/doc/emailrelay/developer.txt
+* /usr/share/doc/emailrelay/emailrelay.css
+* /usr/share/doc/emailrelay/examples/emailrelay-deliver.sh
+* /usr/share/doc/emailrelay/examples/emailrelay-notify.sh
+* /usr/share/doc/emailrelay/examples/emailrelay-process.sh
+* /usr/share/doc/emailrelay/examples/emailrelay-resubmit.sh
+* /usr/share/doc/emailrelay/index.html
+* /usr/share/doc/emailrelay/readme.html
+* /usr/share/doc/emailrelay/reference.html
+* /usr/share/doc/emailrelay/reference.txt
+* /usr/share/doc/emailrelay/userguide.html
+* /usr/share/doc/emailrelay/userguide.txt
+* /usr/share/doc/emailrelay/windows.html
+* /usr/share/doc/emailrelay/windows.txt
 * /usr/share/man/man1/emailrelay-passwd.1.gz
 * /usr/share/man/man1/emailrelay-poke.1.gz
 * /usr/share/man/man1/emailrelay-submit.1.gz
-* /var/spool/emailrelay/*
-* /etc/init.d/emailrelay
+* /usr/share/man/man1/emailrelay.1.gz
+* /var/spool/emailrelay/emailrelay.*.content
+* /var/spool/emailrelay/emailrelay.*.envelope
 
 For finer control of the directory structure the following variables
-can be specified on the "configure" command line (but note that the
+can be specified on the "configure" command-line (but note that the
 "--enable-fhs" will override them):
 * e_sbindir
 * e_libexecdir
@@ -451,12 +504,26 @@ and create the E-MailRelay spool directory as "/tmp/spool" rather than
 "/usr/local/var/spool/emailrelay".
 
 The default spool directory path which is built into the executables and scripts
-comes from "configure", via the makefiles. So if you re-run "configure" with a
-different spool directory you should also do a "make clean" in at least
-"src/main" and "bin".
+comes from "configure", via the makefiles. So after running "configure" with a
+different spool directory do a "make clean" in at least "src/main" and "bin".
+
+Even though the "--enable-fhs" switch overrides all other directory specifiers
+during the build process, it is still possible to change the installation
+root directory using "make install DESTDIR=<root>" or "DESTDIR=<root> make -e install".
+However this will not affect the default spool directory path built into the
+scripts and executables; the spool directory path will have to be explicitly
+defined at run-time.
+
+For example, building with "configure --enable-fhs ; make ; make install DESTDIR=/root"
+would create a spool directory "/root/var/spool/emailrelay", but the server
+run as "/root/usr/sbin/emailrelay --as-server" would use a expect a spool directory
+of "/var/spool/emailrelay". This could be fixed by either adding
+"--spool-dir /root/var/spool/emailrelay" to the server command-line, or by
+creating the "/var/spool/emailrelay" directory manually.
 
 The "emailrelay" script in "init.d" creates a pid file in "/var/run" if the
 directory exists, or in "/tmp" otherwise.
 
 
+
 Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved.
diff --git a/doc/userguide.txt b/doc/userguide.txt
index 34123e0..b165ec0 100644
--- a/doc/userguide.txt
+++ b/doc/userguide.txt
@@ -94,7 +94,7 @@ The standard installation of E-MailRelay (using "make install") puts most of
 the files into the right places, but it does not set things up so that the
 daemon starts at boot time, or that e-mail gets forwarded automatically when
 you connect to the Internet. You have to do those bits yourself because of the
-differences between the various GNU/Linux distributions.
+differences between the various operating systems and distributions.
 
 Many systems, including the most popular GNU/Linux distributions, use the
 System-V mechanism for starting daemons at boot time. The directory
@@ -106,6 +106,10 @@ links point back into the start/stop script in the parent directory, using a
 numeric part of the link name determines the order in which the links are
 called.
 
+If you cannot use a GUI front-end as provided by GNOME and KDE, or a
+command-line utility like "insserv", "chkconfig" or "/usr/lib/lsb/install_initd",
+then you can follow the steps below to set up the necessary symbolic links.
+
 Before you start you will need to know where your "init.d" directory can be
 found and what your default run level is:
 
@@ -137,8 +141,6 @@ daemons compete for the standard SMTP listening port):
 	$ cd /etc/init.d/rc5.d
 	$ rm *sendmail
 
-(There are also KDE and GNOME GUIs which you can use to do the latter steps.)
-
 Triggering onward delivery
 --------------------------
 This section assumes that you are using "pppd" to establish your dial-up
@@ -160,7 +162,7 @@ If you find "sendmail -q" then it should be sufficient to replace it with this:
 where you substitute your ISP's SMTP server address for <myisp>.
 
 Or if your "ip-up" calls out to "ip-up.local" then create a two-line
-"ip-up.local" script:
+"ip-up.local" script like this:
 
 	$ cd /etc/ppp
 	$ cat << EOF > ip-up.local
diff --git a/doc/windows.txt b/doc/windows.txt
index 3ff05c1..3fec16b 100644
--- a/doc/windows.txt
+++ b/doc/windows.txt
@@ -18,6 +18,7 @@ In summary, the Windows installation process is as follows:
 * Create a spool directory under "<windir>\spool", eg.  "c:\win98\spool\emailrelay".
 * Configure your e-mail client (eg. Outlook) to use SMTP on the local machine for outgoing e-mail.
 * Run the forwarding client from the taskbar/desktop shortcut once connected to the Internet.
+* Optionally register the server as a COM component using the "-regserver" command-line switch.
 
 These steps are explained in more detail below.
 
@@ -68,29 +69,37 @@ Once the server is configured the next step is to create an icon on the desktop
 you are connected to the Internet.
 
 You can do this by simply dragging the E-MailRelay executable file from the
-"Program Files\emailrelay" folder onto the desktop. Then right click on the
-new icon and select "Properties" from the pop-up menu.
+"Program Files\emailrelay" folder onto the desktop. Then right click on the new
+icon and select "Properties" from the pop-up menu.
 
 Again the "Target" box should contain the path of the E-MailRelay executable,
-and you should add configuration options at the end, separated by a space.
-As a minumum you will need to add "--as-client myisp:smtp", where "myisp"
-is replaced with the hostname of your ISP's SMTP server.
+and you should add configuration options at the end, separated by a space. As a
+minumum you will need to add "--as-client myisp:smtp", where "myisp" is replaced
+with the hostname of your ISP's SMTP server.
 
 Preparation
 -----------
-To complete the installation you should create a spool directory to hold
-your e-mail messages while you are off-line. By default E-MailRelay will
-look for a directory "<windir>\spool\emailrelay", where "<windir>" is the
-path of your main windows directory, typically "c:\win98" for Windows 98.
+To complete the installation you should create a spool directory to hold your
+e-mail messages while you are off-line. By default E-MailRelay will look for a
+directory "<windir>\spool\emailrelay", where "<windir>" is the path of your main
+windows directory, typically "c:\win98" for Windows 98.
 
-Finally you will need to configure your e-mail client program to use
-the local E-MailRelay server for outgoing mail. Where it asks for the
-name of the SMTP server for outgoing mail you should tell it to use
-"localhost" or "127.0.0.1".
+Finally you will need to configure your e-mail client program to use the local
+E-MailRelay server for outgoing mail. Where it asks for the name of the SMTP
+server for outgoing mail you should tell it to use "localhost" or "127.0.0.1".
+
+COM registration
+----------------
+The server can be optionally registered as a COM component by running the
+executable with the "-regserver" command line switch. The COM interface may
+allow stored messages to be forwarded to any remote server, so consider the
+security implications before doing the COM registration. Refer to the reference
+guide for more details.
 
 Uninstall
 ---------
-There are no DLLs or registry entries to clean up: just delete the files under
+If you have ever registered the executable as a COM component, then deregister it
+using the "-unregserver" command-line switch. Then just delete the files under
 "Program Files\emailrelay" and "<windir>\spool\emailrelay", and remove any
 taskbar, desktop or "Start->Programs->StartUp" shortcuts.
 
diff --git a/emailrelay.spec b/emailrelay.spec
index c4162b5..35d6c46 100644
--- a/emailrelay.spec
+++ b/emailrelay.spec
@@ -1,12 +1,14 @@
 Summary: Simple e-mail message transfer agent using SMTP
 Name: emailrelay
-Version: 0.9.9
+Version: 1.0.0
 Release: 1
 Copyright: GPL
 Group: System Environment/Daemons
-Source: http://emailrelay.sourceforge.net/.../emailrelay-src-0.9.9.tar.gz
+Source: http://emailrelay.sourceforge.net/.../emailrelay-src-1.0.0.tar.gz
 BuildRoot: /tmp/emailrelay-install
 
+%define prefix /usr
+
 %description
 E-MailRelay is a simple SMTP store-and-forward message transfer agent (MTA).
 It runs as an SMTP server, storing e-mail in a local spool directory, and
@@ -17,8 +19,8 @@ than to a local postmaster. Because of this functional simplicity it is
 extremely easy to configure, typically only requiring the address of the 
 next-hop SMTP server to be put on the command line.
 
-C++ source code is available for Linux, FreeBSD and Windows. Distribution is
-under the GNU General Public License.
+C++ source code is available for Linux, FreeBSD (etc) and Windows. 
+Distribution is under the GNU General Public License.
 
 %prep
 %setup
@@ -30,43 +32,49 @@ make HAVE_DOXYGEN=no HAVE_MAN2HTML=no
 %install
 make install destdir=$RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT HAVE_DOXYGEN=no HAVE_MAN2HTML=no
 
+%post
+test -f /usr/lib/lsb/install_initd && cd /etc/init.d && /usr/lib/lsb/install_initd emailrelay
+
+%preun
+test $1 -eq 0 && test -f /usr/lib/lsb/remove_initd && cd /etc/init.d && /usr/lib/lsb/remove_initd emailrelay
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 
-/usr/lib/emailrelay/emailrelay-poke
-/usr/sbin/emailrelay
-/usr/sbin/emailrelay-passwd
-/usr/sbin/emailrelay-submit
-/usr/share/doc/emailrelay/examples/emailrelay-process.sh
-/usr/share/doc/emailrelay/examples/emailrelay-notify.sh
-/usr/share/doc/emailrelay/examples/emailrelay-deliver.sh
-/usr/share/doc/emailrelay/examples/emailrelay-resubmit.sh
-/usr/share/doc/emailrelay/developer.txt
-/usr/share/doc/emailrelay/reference.txt
-/usr/share/doc/emailrelay/userguide.txt
-/usr/share/doc/emailrelay/windows.txt
-/usr/share/doc/emailrelay/readme.html
-/usr/share/doc/emailrelay/developer.html
-/usr/share/doc/emailrelay/reference.html
-/usr/share/doc/emailrelay/userguide.html
-/usr/share/doc/emailrelay/windows.html
-/usr/share/doc/emailrelay/index.html
-/usr/share/doc/emailrelay/changelog.html
-/usr/share/doc/emailrelay/emailrelay.css
-/usr/share/doc/emailrelay/NEWS
-/usr/share/doc/emailrelay/README
-/usr/share/doc/emailrelay/changelog.gz
-/usr/share/doc/emailrelay/doxygen
-/usr/share/man/man1/emailrelay.1.gz
-/usr/share/man/man1/emailrelay-passwd.1.gz
-/usr/share/man/man1/emailrelay-poke.1.gz
-/usr/share/man/man1/emailrelay-submit.1.gz
 /etc/init.d/emailrelay
+%{prefix}/lib/emailrelay/emailrelay-poke
+%{prefix}/sbin/emailrelay
+%{prefix}/sbin/emailrelay-passwd
+%{prefix}/sbin/emailrelay-submit
+%{prefix}/share/doc/emailrelay/NEWS
+%{prefix}/share/doc/emailrelay/README
+%{prefix}/share/doc/emailrelay/changelog.gz
+%{prefix}/share/doc/emailrelay/changelog.html
+%{prefix}/share/doc/emailrelay/developer.html
+%{prefix}/share/doc/emailrelay/developer.txt
+%{prefix}/share/doc/emailrelay/emailrelay.css
+%{prefix}/share/doc/emailrelay/examples/emailrelay-deliver.sh
+%{prefix}/share/doc/emailrelay/examples/emailrelay-notify.sh
+%{prefix}/share/doc/emailrelay/examples/emailrelay-process.sh
+%{prefix}/share/doc/emailrelay/examples/emailrelay-resubmit.sh
+%{prefix}/share/doc/emailrelay/index.html
+%{prefix}/share/doc/emailrelay/readme.html
+%{prefix}/share/doc/emailrelay/reference.html
+%{prefix}/share/doc/emailrelay/reference.txt
+%{prefix}/share/doc/emailrelay/userguide.html
+%{prefix}/share/doc/emailrelay/userguide.txt
+%{prefix}/share/doc/emailrelay/windows.html
+%{prefix}/share/doc/emailrelay/windows.txt
+%{prefix}/share/man/man1/emailrelay-passwd.1.gz
+%{prefix}/share/man/man1/emailrelay-poke.1.gz
+%{prefix}/share/man/man1/emailrelay-submit.1.gz
+%{prefix}/share/man/man1/emailrelay.1.gz
+/var/spool/emailrelay/
 
 %changelog
 
-* Mon Sep 24 2001 Graeme Walker <graeme_walker@users.sourceforge.net>
+* Wed Jul 3 2002 Graeme Walker <graeme_walker@users.sourceforge.net>
 - Initial version.
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index ef655e3..3f1d606 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -79,6 +79,7 @@ POST_UNINSTALL = :
 AR = @AR@
 AWK = @AWK@
 CC = @CC@
+COMPILER_VERSION = @COMPILER_VERSION@
 CXX = @CXX@
 GZIP = @GZIP@
 HAVE_DOXYGEN = @HAVE_DOXYGEN@
diff --git a/lib/gcc2.95/Makefile.in b/lib/gcc2.95/Makefile.in
index 9896126..8777357 100644
--- a/lib/gcc2.95/Makefile.in
+++ b/lib/gcc2.95/Makefile.in
@@ -79,6 +79,7 @@ POST_UNINSTALL = :
 AR = @AR@
 AWK = @AWK@
 CC = @CC@
+COMPILER_VERSION = @COMPILER_VERSION@
 CXX = @CXX@
 GZIP = @GZIP@
 HAVE_DOXYGEN = @HAVE_DOXYGEN@
diff --git a/lib/gcc2.95/sstream b/lib/gcc2.95/sstream
index a24f7aa..51cda98 100644
--- a/lib/gcc2.95/sstream
+++ b/lib/gcc2.95/sstream
@@ -20,7 +20,7 @@
 //
 // sstream
 //
-// Forwards compatibility from ostrstream to std::stringstream.
+// Forwards compatibility from ostrstream to std::ostringstream.
 //
 
 #ifndef G_STD_SSTREAM_H
@@ -31,30 +31,31 @@
 
 namespace std
 {
-	class stringstream : public ostrstream
+	class ostringstream : public ostrstream
 	{
 	public:
-		stringstream() ;
-		stringstream( char * , size_t ) ;
+		ostringstream() ;
+		ostringstream( char * , size_t ) ;
 		std::string str() const ;
 	} ;
+	typedef ostringstream stringstream ;
 } ;
 
 inline
-std::stringstream::stringstream()
+std::ostringstream::ostringstream()
 {
 }
 
 inline
-std::stringstream::stringstream( char * p , size_t n ) :
+std::ostringstream::ostringstream( char * p , size_t n ) :
 	ostrstream(p,static_cast<int>(n))
 {
 }
 
 inline
-std::string std::stringstream::str() const
+std::string std::ostringstream::str() const
 {
-	std::stringstream * This = const_cast<std::stringstream*>(this) ;
+	std::ostringstream * This = const_cast<std::ostringstream*>(this) ;
 	ostrstream * base = This ;
 	(*base) << '\0' ;
 	char * p = base->str() ;
diff --git a/lib/msvc6.0/Makefile.in b/lib/msvc6.0/Makefile.in
index 311dad7..f364cb0 100644
--- a/lib/msvc6.0/Makefile.in
+++ b/lib/msvc6.0/Makefile.in
@@ -79,6 +79,7 @@ POST_UNINSTALL = :
 AR = @AR@
 AWK = @AWK@
 CC = @CC@
+COMPILER_VERSION = @COMPILER_VERSION@
 CXX = @CXX@
 GZIP = @GZIP@
 HAVE_DOXYGEN = @HAVE_DOXYGEN@
diff --git a/lib/msvc6.0/cstdlib b/lib/msvc6.0/cstdlib
index a6a2c43..0dda25b 100644
--- a/lib/msvc6.0/cstdlib
+++ b/lib/msvc6.0/cstdlib
@@ -30,6 +30,8 @@ namespace std
 	using ::rand ;
 	using ::srand ;
 	using ::getenv ;
+	using ::free ;
+	using ::malloc ;
 } ;
 
 #endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 939d134..ed3e6c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,4 +16,4 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
-SUBDIRS = glib gnet main win32
+SUBDIRS = glib gnet gsmtp main win32
diff --git a/src/Makefile.in b/src/Makefile.in
index d6a302b..9946127 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -79,6 +79,7 @@ POST_UNINSTALL = :
 AR = @AR@
 AWK = @AWK@
 CC = @CC@
+COMPILER_VERSION = @COMPILER_VERSION@
 CXX = @CXX@
 GZIP = @GZIP@
 HAVE_DOXYGEN = @HAVE_DOXYGEN@
@@ -96,7 +97,7 @@ e_man1dir = @e_man1dir@
 e_sbindir = @e_sbindir@
 e_spooldir = @e_spooldir@
 
-SUBDIRS = glib gnet main win32
+SUBDIRS = glib gnet gsmtp main win32
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
diff --git a/src/glib/Makefile.am b/src/glib/Makefile.am
index 1a19211..1a95fdd 100644
--- a/src/glib/Makefile.am
+++ b/src/glib/Makefile.am
@@ -16,7 +16,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
-EXTRA_DIST=garg_win32.cpp \
+EXTRA_DIST=\
+	garg_win32.cpp \
+	gcleanup_win32.cpp \
 	gdaemon_win32.cpp \
 	gdatetime_win32.cpp \
 	gdirectory_win32.cpp \
@@ -24,9 +26,11 @@ EXTRA_DIST=garg_win32.cpp \
 	glogoutput_win32.cpp \
 	gprocess_win32.cpp \
 	gfile_win32.cpp \
+	gregistry_win32.cpp \
+	gregistry.h \
 	md5c.c \
 	md5.h
-INCLUDES = -I$(top_srcdir)/lib/gcc2.95
+INCLUDES = -I$(top_srcdir)/lib/$(COMPILER_VERSION)
 noinst_LIBRARIES = libglib.a
 libglib_a_SOURCES = \
 	garg.cpp \
@@ -34,9 +38,9 @@ libglib_a_SOURCES = \
 	garg_unix.cpp \
 	gassert.h \
 	gconvert.h \
-	gcredentials.h \
+	gcleanup.h \
+	gcleanup_unix.cpp \
 	gdaemon.h \
-	gdaemon.cpp \
 	gdaemon_unix.cpp \
 	gdate.cpp \
 	gdate.h \
@@ -68,10 +72,13 @@ libglib_a_SOURCES = \
 	gnoncopyable.h \
 	gpath.cpp \
 	gpath.h \
+	gpidfile.cpp \
+	gpidfile.h \
 	gprocess.h \
 	gprocess_unix.cpp \
 	groot.cpp \
 	groot.h \
+	gsetter.h \
 	gstatemachine.h \
 	gstr.cpp \
 	gstr.h \
diff --git a/src/glib/Makefile.in b/src/glib/Makefile.in
index 06b46f2..fc79b8d 100644
--- a/src/glib/Makefile.in
+++ b/src/glib/Makefile.in
@@ -79,6 +79,7 @@ POST_UNINSTALL = :
 AR = @AR@
 AWK = @AWK@
 CC = @CC@
+COMPILER_VERSION = @COMPILER_VERSION@
 CXX = @CXX@
 GZIP = @GZIP@
 HAVE_DOXYGEN = @HAVE_DOXYGEN@
@@ -96,11 +97,11 @@ e_man1dir = @e_man1dir@
 e_sbindir = @e_sbindir@
 e_spooldir = @e_spooldir@
 
-EXTRA_DIST = garg_win32.cpp 	gdaemon_win32.cpp 	gdatetime_win32.cpp 	gdirectory_win32.cpp 	gfs_win32.cpp 	glogoutput_win32.cpp 	gprocess_win32.cpp 	gfile_win32.cpp 	md5c.c 	md5.h
+EXTRA_DIST =  	garg_win32.cpp 	gcleanup_win32.cpp 	gdaemon_win32.cpp 	gdatetime_win32.cpp 	gdirectory_win32.cpp 	gfs_win32.cpp 	glogoutput_win32.cpp 	gprocess_win32.cpp 	gfile_win32.cpp 	gregistry_win32.cpp 	gregistry.h 	md5c.c 	md5.h
 
-INCLUDES = -I$(top_srcdir)/lib/gcc2.95
+INCLUDES = -I$(top_srcdir)/lib/$(COMPILER_VERSION)
 noinst_LIBRARIES = libglib.a
-libglib_a_SOURCES =  	garg.cpp 	garg.h 	garg_unix.cpp 	gassert.h 	gconvert.h 	gcredentials.h 	gdaemon.h 	gdaemon.cpp 	gdaemon_unix.cpp 	gdate.cpp 	gdate.h 	gdatetime.cpp 	gdatetime.h 	gdatetime_unix.cpp 	gdebug.h 	gdef.h 	gdirectory.cpp 	gdirectory.h 	gdirectory_unix.cpp 	gexception.cpp 	gexception.h 	gfile.cpp 	gfile.h 	gfile_unix.cpp 	gfs.h 	gfs_unix.cpp 	ggetopt.cpp 	ggetopt.h 	glog.cpp 	glog.h 	glogoutput.cpp 	glogoutput.h 	glogoutput_unix.cpp 	gmd5.cpp 	gmd5.h 	gmemory.h 	gnoncopyable.h 	gpath.cpp 	gpath.h 	gprocess.h 	gprocess_unix.cpp 	groot.cpp 	groot.h 	gstatemachine.h 	gstr.cpp 	gstr.h 	gstrings.h 	gtime.cpp 	gtime.h
+libglib_a_SOURCES =  	garg.cpp 	garg.h 	garg_unix.cpp 	gassert.h 	gconvert.h 	gcleanup.h 	gcleanup_unix.cpp 	gdaemon.h 	gdaemon_unix.cpp 	gdate.cpp 	gdate.h 	gdatetime.cpp 	gdatetime.h 	gdatetime_unix.cpp 	gdebug.h 	gdef.h 	gdirectory.cpp 	gdirectory.h 	gdirectory_unix.cpp 	gexception.cpp 	gexception.h 	gfile.cpp 	gfile.h 	gfile_unix.cpp 	gfs.h 	gfs_unix.cpp 	ggetopt.cpp 	ggetopt.h 	glog.cpp 	glog.h 	glogoutput.cpp 	glogoutput.h 	glogoutput_unix.cpp 	gmd5.cpp 	gmd5.h 	gmemory.h 	gnoncopyable.h 	gpath.cpp 	gpath.h 	gpidfile.cpp 	gpidfile.h 	gprocess.h 	gprocess_unix.cpp 	groot.cpp 	groot.h 	gsetter.h 	gstatemachine.h 	gstr.cpp 	gstr.h 	gstrings.h 	gtime.cpp 	gtime.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
@@ -113,11 +114,11 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libglib_a_LIBADD = 
-libglib_a_OBJECTS =  garg.o garg_unix.o gdaemon.o gdaemon_unix.o gdate.o \
-gdatetime.o gdatetime_unix.o gdirectory.o gdirectory_unix.o \
+libglib_a_OBJECTS =  garg.o garg_unix.o gcleanup_unix.o gdaemon_unix.o \
+gdate.o gdatetime.o gdatetime_unix.o gdirectory.o gdirectory_unix.o \
 gexception.o gfile.o gfile_unix.o gfs_unix.o ggetopt.o glog.o \
-glogoutput.o glogoutput_unix.o gmd5.o gpath.o gprocess_unix.o groot.o \
-gstr.o gtime.o
+glogoutput.o glogoutput_unix.o gmd5.o gpath.o gpidfile.o \
+gprocess_unix.o groot.o gstr.o gtime.o
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@@ -227,97 +228,93 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 garg.o: garg.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits garg.h gpath.h gstrings.h gstr.h \
-	gexception.h gdebug.h glogoutput.h glog.h gassert.h
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits garg.h \
+	gpath.h gstrings.h gstr.h gexception.h gdebug.h glogoutput.h \
+	glog.h gassert.h
 garg_unix.o: garg_unix.cpp gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits garg.h \
-	gdebug.h glogoutput.h glog.h gassert.h
-gdaemon.o: gdaemon.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gdaemon.h gexception.h gpath.h \
-	gstrings.h groot.h gprocess.h gnoncopyable.h
+	../../lib/gcc2.95/limits garg.h gdebug.h glogoutput.h glog.h \
+	gassert.h
+gcleanup_unix.o: gcleanup_unix.cpp gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits gcleanup.h gpath.h gstrings.h \
+	gexception.h gprocess.h groot.h gnoncopyable.h glog.h
 gdaemon_unix.o: gdaemon_unix.cpp gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gdaemon.h \
-	gexception.h gpath.h gstrings.h gprocess.h
+	../../lib/gcc2.95/limits gdaemon.h gexception.h gpidfile.h \
+	gpath.h gstrings.h gprocess.h
 gdate.o: gdate.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gdate.h gdatetime.h gexception.h \
-	gdebug.h glogoutput.h glog.h gassert.h
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gdate.h \
+	gdatetime.h gexception.h gdebug.h glogoutput.h glog.h gassert.h
 gdatetime.o: gdatetime.cpp gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gdatetime.h \
-	gexception.h gstr.h gstrings.h gassert.h glogoutput.h glog.h
+	../../lib/gcc2.95/limits gdatetime.h gexception.h gstr.h \
+	gstrings.h gassert.h glogoutput.h glog.h
 gdatetime_unix.o: gdatetime_unix.cpp gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gdatetime.h \
-	gexception.h
+	../../lib/gcc2.95/limits gdatetime.h gexception.h
 gdirectory.o: gdirectory.cpp gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gdirectory.h \
-	gpath.h gstrings.h gexception.h gfs.h glog.h
+	../../lib/gcc2.95/limits gdirectory.h gpath.h gstrings.h \
+	gexception.h gfs.h glog.h
 gdirectory_unix.o: gdirectory_unix.cpp gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gdirectory.h \
-	gpath.h gstrings.h gexception.h gfs.h gfile.h gdebug.h \
-	glogoutput.h glog.h gassert.h
+	../../lib/gcc2.95/limits gdirectory.h gpath.h gstrings.h \
+	gexception.h gfs.h gfile.h gdebug.h glogoutput.h glog.h \
+	gassert.h
 gexception.o: gexception.cpp gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gexception.h
+	../../lib/gcc2.95/limits gexception.h
 gfile.o: gfile.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gfile.h gpath.h gstrings.h \
-	gexception.h gprocess.h glog.h
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gfile.h \
+	gpath.h gstrings.h gexception.h gprocess.h glog.h
 gfile_unix.o: gfile_unix.cpp gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gfile.h \
-	gpath.h gstrings.h gexception.h gprocess.h
+	../../lib/gcc2.95/limits gfile.h gpath.h gstrings.h \
+	gexception.h gprocess.h
 gfs_unix.o: gfs_unix.cpp gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gfs.h
+	../../lib/gcc2.95/limits gfs.h
 ggetopt.o: ggetopt.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits glog.h gstrings.h gstr.h gexception.h \
-	ggetopt.h garg.h gassert.h glogoutput.h gdebug.h
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits glog.h \
+	gstrings.h gstr.h gexception.h ggetopt.h garg.h gassert.h \
+	glogoutput.h gdebug.h
 glog.o: glog.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits glog.h glogoutput.h
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits glog.h \
+	glogoutput.h
 glogoutput.o: glogoutput.cpp gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits glogoutput.h \
-	glog.h
+	../../lib/gcc2.95/limits glogoutput.h glog.h
 glogoutput_unix.o: glogoutput_unix.cpp gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits glogoutput.h \
-	glog.h
+	../../lib/gcc2.95/limits glogoutput.h glog.h
 gmd5.o: gmd5.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gmd5.h gexception.h gstr.h gstrings.h \
-	gassert.h glogoutput.h glog.h md5.h md5c.c
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gmd5.h \
+	gexception.h gstr.h gstrings.h gassert.h glogoutput.h glog.h \
+	md5.h md5c.c
 gpath.o: gpath.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gpath.h gstrings.h gfs.h gstr.h \
-	gexception.h gdebug.h glogoutput.h glog.h gassert.h
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gpath.h \
+	gstrings.h gfs.h gstr.h gexception.h gdebug.h glogoutput.h \
+	glog.h gassert.h
+gpidfile.o: gpidfile.cpp gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits gpidfile.h gexception.h gpath.h \
+	gstrings.h gprocess.h gcleanup.h gfile.h gdebug.h glogoutput.h \
+	glog.h gassert.h
 gprocess_unix.o: gprocess_unix.cpp gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gprocess.h \
-	gexception.h gpath.h gstrings.h gassert.h glogoutput.h glog.h \
-	gfs.h
+	../../lib/gcc2.95/limits gprocess.h gexception.h gpath.h \
+	gstrings.h gassert.h glogoutput.h glog.h gfs.h
 groot.o: groot.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits groot.h gprocess.h gexception.h \
-	gpath.h gstrings.h gnoncopyable.h gdebug.h glogoutput.h glog.h \
-	gassert.h
-gstr.o: gstr.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gstr.h gexception.h gstrings.h \
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits groot.h \
+	gprocess.h gexception.h gpath.h gstrings.h gnoncopyable.h \
 	gdebug.h glogoutput.h glog.h gassert.h
+gstr.o: gstr.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gstr.h \
+	gexception.h gstrings.h gdebug.h glogoutput.h glog.h gassert.h
 gtime.o: gtime.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gtime.h gexception.h gdatetime.h \
-	gassert.h glogoutput.h glog.h
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gtime.h \
+	gexception.h gdatetime.h gassert.h glogoutput.h glog.h
 
 info-am:
 info: info-am
diff --git a/src/glib/garg.cpp b/src/glib/garg.cpp
index 00e0e8e..07bb7f2 100644
--- a/src/glib/garg.cpp
+++ b/src/glib/garg.cpp
@@ -77,16 +77,24 @@ void G::Arg::parse( HINSTANCE hinstance , const std::string & command_line )
 	setPrefix() ;
 }
 
-bool G::Arg::contains( const std::string & sw , size_t sw_args ) const
+void G::Arg::reparse( const std::string & command_line )
 {
-	return find( sw , sw_args , NULL ) ;
+	while( m_array.size() > 1U )
+		m_array.pop_back() ;
+	G::Str::splitIntoTokens( command_line , m_array , " \t" ) ;
 }
 
-bool G::Arg::find( const std::string & sw , size_t sw_args , size_t * index_p ) const
+bool G::Arg::contains( const std::string & sw , size_t sw_args , bool cs ) const
+{
+	return find( cs , sw , sw_args , NULL ) ;
+}
+
+bool G::Arg::find( bool cs , const std::string & sw , size_t sw_args ,
+	size_t * index_p ) const
 {
 	for( size_t i = 1 ; i < m_array.size() ; i++ ) // start from v[1]
 	{
-		if( sw == m_array[i] && (i+sw_args) < m_array.size() )
+		if( match(cs,sw,m_array[i]) && (i+sw_args) < m_array.size() )
 		{
 			if( index_p != NULL )
 				*index_p = i ;
@@ -96,10 +104,19 @@ bool G::Arg::find( const std::string & sw , size_t sw_args , size_t * index_p )
 	return false ;
 }
 
+//static
+bool G::Arg::match( bool cs , const std::string & s1 , const std::string & s2 )
+{
+	return
+		cs ?
+			s1 == s2 :
+			Str::upper(s1) == Str::upper(s2) ;
+}
+
 void G::Arg::remove( const std::string & sw , size_t sw_args )
 {
 	size_t i = 0U ;
-	const bool found = find( sw , sw_args , &i ) ;
+	const bool found = find( true , sw , sw_args , &i ) ;
 	if( found )
 		removeAt( i , sw_args ) ;
 }
@@ -119,7 +136,7 @@ void G::Arg::removeAt( size_t sw_index , size_t sw_args )
 size_t G::Arg::index( const std::string & sw , size_t sw_args ) const
 {
 	size_t i = 0U ;
-	const bool found = find( sw , sw_args , &i ) ;
+	const bool found = find( true , sw , sw_args , &i ) ;
 	return found ? i : 0U ;
 }
 
diff --git a/src/glib/garg.h b/src/glib/garg.h
index bf1bfa5..315564a 100644
--- a/src/glib/garg.h
+++ b/src/glib/garg.h
@@ -31,7 +31,7 @@
 namespace G
 {
 	class Arg ;
-} ;
+}
 
 // Class: G::Arg
 // Description: A class which holds a represention of the
@@ -57,8 +57,14 @@ public:
 		//
 		// Parses the given command line, splitting
 		// it up into an array of tokens.
-		// The program name is automatically
+		// The full exe name is automatically
 		// added as the first token (cf. argv[0]).
+
+	void reparse( const std::string & command_line ) ;
+		// Reinitialises the object with the given
+		// command-line. The command-line should not
+		// contain the program name: the v(0) value
+		// and prefix() are unchanged.
 		
 	~Arg() ;
 		// Destructor.
@@ -81,11 +87,12 @@ public:
 		// be used in main() outside of the outermost try
 		// block.
 
-	bool contains( const std::string & sw , size_t sw_args = 0U ) const ;
-		// Returns true if the command line
-		// contains the given switch with enough
-		// command line arguments left to satisfy
-		// the given number of switch arguments.
+	bool contains( const std::string & sw ,
+		size_t sw_args = 0U , bool case_sensitive = true ) const ;
+			// Returns true if the command line
+			// contains the given switch with enough
+			// command line arguments left to satisfy
+			// the given number of switch arguments.
 
 	size_t index( const std::string & sw , size_t sw_args = 0U ) const ;
 		// Returns the index of the given switch.
@@ -109,8 +116,9 @@ public:
 
 private:
 	static std::string moduleName( HINSTANCE h ) ;
-	bool find( const std::string & sw , size_t sw_args , size_t *index_p ) const ;
+	bool find( bool , const std::string & , size_t , size_t * ) const ;
 	void setPrefix() ;
+	static bool match( bool , const std::string & , const std::string & ) ;
 
 private:
 	typedef std::vector<std::string GAllocator(std::string) > Array ;
diff --git a/src/glib/gcleanup.h b/src/glib/gcleanup.h
new file mode 100644
index 0000000..5d82c07
--- /dev/null
+++ b/src/glib/gcleanup.h
@@ -0,0 +1,57 @@
+//
+// Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// ===
+//
+// gcleanup.h
+//
+
+#ifndef G_CLEANUP_H
+#define G_CLEANUP_H
+
+#include "gdef.h"
+#include "gpath.h"
+#include "gexception.h"
+
+namespace G
+{
+	class Cleanup ;
+}
+
+// Class: G::Cleanup
+// Description: An interface for registering cleanup functions
+// which are called when the process terminates abnormally.
+//
+class G::Cleanup
+{
+public:
+	G_EXCEPTION( Error , "cleanup error" ) ;
+
+	static void add( void (*fn)(const char*) , const char * arg ) ;
+		// Adds the given handler to the list which
+		// are to be called when the process
+		// terminates abnormally. The handler
+		// function must be fully reentrant.
+		// The 'arg' pointer is kept.
+
+private:
+	Cleanup() ; // not implemeneted
+} ;
+
+#endif
+
diff --git a/src/glib/gcleanup_unix.cpp b/src/glib/gcleanup_unix.cpp
new file mode 100644
index 0000000..ec0b570
--- /dev/null
+++ b/src/glib/gcleanup_unix.cpp
@@ -0,0 +1,154 @@
+//
+// Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// ===
+//
+// gcleanup_unix.cpp
+//
+
+#include "gdef.h"
+#include "gcleanup.h"
+#include "gprocess.h"
+#include "groot.h"
+#include "glog.h"
+#include <signal.h>
+
+namespace G
+{
+	class CleanupImp ;
+}
+
+// Class: G::CleanupImp
+// Description: A private implementation class used by G::Cleanup.
+//
+class G::CleanupImp
+{
+public:
+	static void add( void (*fn)(const char*) , const char * ) ;
+
+private:
+	static void init() ;
+	static void install( int , void (*fn)(int) ) ;
+	static void installHandler( int ) ;
+	static void installDefault( int ) ;
+	static void callHandlers() ;
+	static void handler_( int ) ;
+	static bool ignored( int ) ;
+
+private:
+	typedef Cleanup::Error Error ;
+	struct Link // A private linked-list structure used by G::CleanupImp.
+	{
+		void (*fn)(const char*) ;
+		const char * arg ;
+		Link * next ;
+	} ;
+	static Link * m_head ;
+	static Link * m_tail ;
+} ;
+
+G::CleanupImp::Link * G::CleanupImp::m_head = NULL ;
+G::CleanupImp::Link * G::CleanupImp::m_tail = NULL ;
+
+// ===
+
+void G::Cleanup::add( void (*fn)(const char*) , const char * arg )
+{
+	CleanupImp::add( fn , arg ) ;
+}
+
+// ===
+
+void G::CleanupImp::init()
+{
+	installHandler( SIGTERM ) ;
+	installHandler( SIGINT ) ;
+	installHandler( SIGHUP ) ;
+	installHandler( SIGPIPE ) ;
+	installHandler( SIGQUIT ) ;
+	//installHandler( SIGUSR1 ) ;
+	//installHandler( SIGUSR2 ) ;
+}
+
+void G::CleanupImp::add( void (*fn)(const char*) , const char * arg )
+{
+	Link * p = new Link ;
+	p->fn = fn ;
+	p->arg = arg ;
+	p->next = NULL ;
+
+	// (this bit should be protected from signals)
+	if( m_head == NULL ) init() ;
+	if( m_tail != NULL ) m_tail->next = p ;
+	m_tail = p ;
+	if( m_head == NULL ) m_head = p ;
+}
+
+void G::CleanupImp::installHandler( int signum )
+{
+	if( ignored(signum) )
+		G_DEBUG( "G::CleanupImp::installHandler: signal " << signum << " is ignored" ) ;
+	else
+		install( signum , handler_ ) ;
+}
+
+void G::CleanupImp::installDefault( int signum )
+{
+	install( signum , NULL ) ;
+}
+
+bool G::CleanupImp::ignored( int signum )
+{
+	static struct ::sigaction zero_action ;
+	struct ::sigaction action( zero_action ) ;
+	if( ::sigaction( signum , NULL , &action ) )
+		throw Error( "sigaction" ) ;
+	return action.sa_handler == SIG_IGN ;
+}
+
+void G::CleanupImp::install( int signum , void (*fn)(int) )
+{
+	static struct ::sigaction zero_action ;
+	struct ::sigaction action( zero_action ) ;
+	action.sa_handler = fn ? fn : SIG_DFL ;
+	if( ::sigaction( signum , &action , NULL ) && fn != NULL )
+		throw Error( "sigaction" ) ;
+}
+
+void G::CleanupImp::callHandlers()
+{
+	G::Root claim_root ;
+	for( const Link * p = m_head ; p != NULL ; p = p->next )
+	{
+		(*(p->fn))(p->arg) ;
+	}
+}
+
+void G::CleanupImp::handler_( int signum )
+{
+	try
+	{
+		callHandlers() ;
+		installDefault( signum ) ;
+		::raise( signum ) ;
+	}
+	catch(...)
+	{
+	}
+}
+
diff --git a/src/gnet/gevent_unix.cpp b/src/glib/gcleanup_win32.cpp
similarity index 84%
rename from src/gnet/gevent_unix.cpp
rename to src/glib/gcleanup_win32.cpp
index ab22d3a..5a489b3 100644
--- a/src/gnet/gevent_unix.cpp
+++ b/src/glib/gcleanup_win32.cpp
@@ -18,16 +18,14 @@
 //
 // ===
 //
-// gevent_unix.cpp
+// gcleanup_win32.cpp
 //
 
 #include "gdef.h"
-#include "gnet.h"
-#include "geventloop.h"
-#include "gselect.h"
+#include "gcleanup.h"
 
-GNet::EventLoop * GNet::EventLoop::create()
+void G::Cleanup::add( void (*)(const char*) , const char * )
 {
-	return new Select ;
+	// not implemented
 }
 
diff --git a/src/glib/gconvert.h b/src/glib/gconvert.h
index 2f616e8..c2726a3 100644
--- a/src/glib/gconvert.h
+++ b/src/glib/gconvert.h
@@ -44,11 +44,11 @@ Tout Convert( const Tin & in )
 	Tout out = in ;
 	Tin copy = out ;
 	if( in != copy )
-		throw ConvertOverflow( std::stringstream() << in ) ;
+		throw ConvertOverflow( std::ostringstream() << in ) ;
 	return out ;
 }
 
-} ;
+}
 
 #endif
 
diff --git a/src/glib/gcredentials.h b/src/glib/gcredentials.h
deleted file mode 100644
index 70a04de..0000000
--- a/src/glib/gcredentials.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later
-// version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-// ===
-//
-// gcredentials.h
-//
-
-#ifndef G_CREDENTIALS_H
-#define G_CREDENTIALS_H
-
-#include "gdef.h"
-
-namespace G
-{
-
-// Class: credentials
-// Description: A class template which can be used to provide
-// controlled access to public methods in a class. Note that
-// all the constructors are private, but the template-parameter
-// class is declared as a friend. (Because all the methods
-// are private you will not see much in the doxygen output;
-// have a look at the header.)
-//
-// Usage:
-/// struct Foo
-/// {
-///    void methodForBar( const credentials<Bar> & ) ;
-/// } ;
-///
-/// void Bar::fn()
-/// {
-///    Foo foo ;
-///    foo.methodForBar( "" ) ;
-/// }
-//
-template <class T>
-class credentials
-{
-	friend T ;
-
-	credentials() ;
-		// Private default constructor.
-
-	credentials( const char * ) ;
-		// Implicit private constructor.
-} ;
-
-template <class T>
-inline
-credentials<T>::credentials()
-{
-}
-
-template <class T>
-inline
-credentials<T>::credentials( const char * )
-{
-}
-
-} ;
-
-#endif
-
diff --git a/src/glib/gdaemon.cpp b/src/glib/gdaemon.cpp
deleted file mode 100644
index d342b7f..0000000
--- a/src/glib/gdaemon.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later
-// version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-// ===
-//
-// gdaemon.cpp
-//
-
-#include "gdef.h"
-#include "gdaemon.h"
-#include "groot.h"
-#include "gprocess.h"
-
-//static
-void G::Daemon::PidFile::check( const G::Path & pid_file )
-{
-	if( pid_file != G::Path() && !pid_file.isAbsolute() )
-		throw G::Daemon::BadPidFile(std::string("must be an absolute path: ")+pid_file.str()) ;
-}
-
-//static
-void G::Daemon::PidFile::test( const G::Path & pid_file )
-{
-	if( pid_file != G::Path() )
-	{
-		std::ofstream tester( pid_file.str().c_str() ) ;
-		if( !tester.good() )
-			throw G::Daemon::BadPidFile(std::string("cannot create file: ")+pid_file.str()) ;
-	}
-}
-
-//static
-void G::Daemon::PidFile::create( const G::Path & pid_file )
-{
-	if( pid_file != G::Path() )
-	{
-		std::ofstream file( pid_file.str().c_str() ) ;
-		file << G::Process::Id() << std::endl ;
-		if( !file.good() )
-			throw G::Daemon::BadPidFile(std::string("cannot create file: ")+pid_file.str()) ;
-	}
-}
-
-G::Daemon::PidFile::PidFile() :
-	m_valid(false)
-{
-}
-
-G::Daemon::PidFile::PidFile( const G::Path & path ) :
-	m_path(path) ,
-	m_valid(true)
-{
-}
-
-void G::Daemon::PidFile::commit()
-{
-	if( m_valid )
-		create( m_path ) ;
-}
-
diff --git a/src/glib/gdaemon.h b/src/glib/gdaemon.h
index c677258..de49579 100644
--- a/src/glib/gdaemon.h
+++ b/src/glib/gdaemon.h
@@ -26,6 +26,7 @@
 
 #include "gdef.h"
 #include "gexception.h"
+#include "gpidfile.h"
 #include "gpath.h"
 #include <sys/types.h>
 #include <string>
@@ -33,7 +34,7 @@
 namespace G
 {
 	class Daemon ;
-} ;
+}
 
 // Class: G::Daemon
 // Description: A class for deamonising the calling process.
@@ -46,19 +47,6 @@ class G::Daemon
 {
 public:
 	G_EXCEPTION( CannotFork , "cannot fork" ) ;
-	G_EXCEPTION( BadPidFile , "invalid pid file" ) ;
-	class PidFile // Used by G::Daemon::detach().
-	{
-		public: explicit PidFile( const Path & pid_file ) ;
-		public: PidFile() ;
-		public: void commit() ;
-		private: Path m_path ;
-		private: bool m_valid ;
-		friend class Daemon ;
-		private: static void check( const Path & ) ;
-		private: static void test( const Path & ) ;
-		private: static void create( const Path & ) ;
-	} ;
 
 	static void detach() ;
 		// Detaches from the parent environment.
@@ -66,24 +54,19 @@ public:
 		// _exit()ing the parent, and calling
 		// setsid() in the child.
 
-	static void detach( const Path & pid_file ) ;
-		// An overload which writes the new process-id
-		// to a file. The path must be absolute.
-		// Throws BadPidFile on error.
-
 	static void detach( PidFile & pid_file ) ;
 		// An overload which allows for a delayed write
-		// of the new process-id to a file. The path
-		// must be absolute.
+		// of the new process-id to a file.
 		//
 		// A delayed write is useful for network daemons
-		// which open a listening port. You do not want
-		// a second instance, which will fail on startup,
-		// to overwrite the pid file of the running
-		// server. In this situation call PidFile::commit()
-		// just before entering the event loop.
+		// which open a listening port. A second instance
+		// of the process will fail on startup, and should
+		// not overwrite the pid file of the running
+		// server. In this situation PidFile::commit()
+		// should be called just before entering the event
+		// loop.
 		//
-		// Throws BadPidFile on error.
+		// Throws PidFile::Error on error.
 
 private:
 	Daemon() ;
diff --git a/src/glib/gdaemon_unix.cpp b/src/glib/gdaemon_unix.cpp
index 836c4ca..ac1fa23 100644
--- a/src/glib/gdaemon_unix.cpp
+++ b/src/glib/gdaemon_unix.cpp
@@ -25,21 +25,10 @@
 #include "gdaemon.h"
 #include "gprocess.h"
 
-//static
-void G::Daemon::detach( const Path & pid_file )
-{
-	PidFile::check( pid_file ) ;
-	PidFile::test( pid_file ) ;
-
-	detach() ;
-
-	PidFile::create( pid_file ) ;
-}
-
 //static
 void G::Daemon::detach( PidFile & pid_file )
 {
-	PidFile::check( pid_file.m_path ) ;
+	pid_file.check() ; // absolute path
 	detach() ;
 }
 
diff --git a/src/glib/gdaemon_win32.cpp b/src/glib/gdaemon_win32.cpp
index ecd8906..46f8f21 100644
--- a/src/glib/gdaemon_win32.cpp
+++ b/src/glib/gdaemon_win32.cpp
@@ -25,12 +25,6 @@
 #include "gdaemon.h"
 #include "gprocess.h"
 
-//static
-void G::Daemon::detach( const Path & )
-{
-	detach() ;
-}
-
 //static
 void G::Daemon::detach( PidFile & )
 {
diff --git a/src/glib/gdate.cpp b/src/glib/gdate.cpp
index c556fcb..08d79ab 100644
--- a/src/glib/gdate.cpp
+++ b/src/glib/gdate.cpp
@@ -86,7 +86,7 @@ void G::Date::init( const G::DateTime::BrokenDownTime & tm )
 
 std::string G::Date::string( Format format ) const
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	if( format == yyyy_mm_dd_slash )
 		ss << m_year << "/" << m_month << "/" << m_day ;
 	else
@@ -104,7 +104,7 @@ int G::Date::monthday() const
 
 std::string G::Date::monthdayString() const
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << m_day ;
 	return ss.str() ;
 }
@@ -173,7 +173,7 @@ int G::Date::year() const
 
 std::string G::Date::yearString() const
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << m_year ;
 	return ss.str() ;
 }
diff --git a/src/glib/gdate.h b/src/glib/gdate.h
index 461485e..befe20e 100644
--- a/src/glib/gdate.h
+++ b/src/glib/gdate.h
@@ -34,7 +34,7 @@
 namespace G
 {
 	class Date ;
-} ;
+}
 
 // Class: G::Date
 // Description: A date (dd/mm/yyyy) class.
diff --git a/src/glib/gdatetime.cpp b/src/glib/gdatetime.cpp
index ac64202..0f59aad 100644
--- a/src/glib/gdatetime.cpp
+++ b/src/glib/gdatetime.cpp
@@ -81,7 +81,7 @@ std::string G::DateTime::offsetString( Offset offset )
 	unsigned int hh = offset.second / 3600U ;
 	unsigned int mm = (offset.second / 60U) % 60 ;
 
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	char sign = (offset.first || (hh==0&&mm==0)) ? '+' : '-' ;
 	ss << sign << (hh/10U) << (hh%10U) << (mm/10) << (mm%10) ;
 	return ss.str() ;
diff --git a/src/glib/gdatetime.h b/src/glib/gdatetime.h
index 60d34ff..c5fdba1 100644
--- a/src/glib/gdatetime.h
+++ b/src/glib/gdatetime.h
@@ -32,7 +32,7 @@
 namespace G
 {
 	class DateTime ;
-} ;
+}
 
 // Class: G::DateTime
 // Description: A low-level static class used by Date and Time.
diff --git a/src/glib/gdatetime_unix.cpp b/src/glib/gdatetime_unix.cpp
index 1729ad8..2fc8ca6 100644
--- a/src/glib/gdatetime_unix.cpp
+++ b/src/glib/gdatetime_unix.cpp
@@ -26,11 +26,11 @@
 
 std::tm * G::DateTime::gmtime_r( const std::time_t * t , std::tm * p )
 {
-	return std::gmtime_r(t,p) ;
+	return ::gmtime_r(t,p) ;
 }
 
 std::tm * G::DateTime::localtime_r( const std::time_t * t , std::tm * p )
 {
-	return std::localtime_r(t,p) ;
+	return ::localtime_r(t,p) ;
 }
 
diff --git a/src/glib/gdef.h b/src/glib/gdef.h
index 6769e99..adfbfa0 100644
--- a/src/glib/gdef.h
+++ b/src/glib/gdef.h
@@ -40,26 +40,24 @@
 
 		#if ! HAVE_GMTIME_R
 			#include <ctime>
-			namespace std
+			inline struct tm * gmtime_r( const time_t * tp , struct tm * tm_p )
 			{
-				inline struct tm * gmtime_r( const time_t * tp , struct tm * tm_p )
-				{
-					* tm_p = * gmtime( tp ) ;
-					return tm_p ;
-				}
-			} ;
+				* tm_p = * gmtime( tp ) ;
+				return tm_p ;
+			}
 		#endif
 
 		#if ! HAVE_LOCALTIME_R
 			#include <ctime>
-			namespace std
+			inline struct tm * localtime_r( const time_t * tp , struct tm * tm_p )
 			{
-				inline struct tm * localtime_r( const time_t * tp , struct tm * tm_p )
-				{
-					* tm_p = * localtime( tp ) ;
-					return tm_p ;
-				}
-			} ;
+				* tm_p = * localtime( tp ) ;
+				return tm_p ;
+			}
+		#endif
+
+		#if ! HAVE_SOCKLEN_T
+			typedef int socklen_t ;
 		#endif
 
 		#if ! defined( G_UNIX )
@@ -119,7 +117,7 @@
 	#include <fstream>
 	#include <sstream>
 	#include <string>
-	#include <xlocale>
+	//#include <xlocale>
 	#include <limits>
 	#include <memory>
 	#include <exception>
@@ -141,6 +139,7 @@
 		typedef int ssize_t ;
 		typedef int uid_t ;
 		typedef int gid_t ;
+		typedef unsigned int pid_t ;
 	#endif
 
 	// STL portability macros (no longer necessary)
@@ -155,7 +154,7 @@
 
 	// Modify compiler error handling
 	//
-	#if G_COMPILER_IS_MICROSOFT
+	#ifdef G_COMPILER_IS_MICROSOFT
 		#pragma warning( disable : 4100 ) // unused formal parameter
 		#pragma warning( disable : 4355 ) // 'this' in initialiser list
 		#pragma warning( disable : 4511 ) // cannot create default copy ctor
diff --git a/src/glib/gdirectory.h b/src/glib/gdirectory.h
index 4486059..4fadd7d 100644
--- a/src/glib/gdirectory.h
+++ b/src/glib/gdirectory.h
@@ -35,7 +35,7 @@ namespace G
 	class DirectoryIteratorImp ;
 	class Directory ;
 	class DirectoryIterator ;
-} ;
+}
 
 // Class: G::Directory
 // Description: An encapsulation of a file system directory
diff --git a/src/glib/gdirectory_unix.cpp b/src/glib/gdirectory_unix.cpp
index a7af20f..7553265 100644
--- a/src/glib/gdirectory_unix.cpp
+++ b/src/glib/gdirectory_unix.cpp
@@ -34,7 +34,7 @@
 namespace G
 {
 	class DirectoryIteratorImp ;
-} ;
+}
 
 bool G::Directory::valid( bool for_creation ) const
 {
@@ -96,7 +96,7 @@ public:
 private:
 	void operator=( const DirectoryIteratorImp & ) ;
 	DirectoryIteratorImp( const DirectoryIteratorImp & ) ;
-	static int onError( const char * path , int errno ) ;
+	static int onError( const char * path , int errno_ ) ;
 } ;
 
 // ===
@@ -172,14 +172,13 @@ G::DirectoryIteratorImp::DirectoryIteratorImp( const Directory &dir ,
 
 	int flags = 0 | GLOB_ERR ;
 	int error  = ::glob( wild_path.pathCstr() , flags , onError , &m_glob ) ;
-	if( error )
+	if( error || m_glob.gl_pathv == NULL )
 	{
 		G_DEBUG( "G::DirectoryIteratorImp::ctor: glob() error: " << error ) ;
 		m_error = true ;
 	}
 	else
 	{
-		G_ASSERT( m_glob.gl_pathv != NULL ) ;
 		G_ASSERT( m_glob.gl_pathc == 0 || m_glob.gl_pathv[0] != NULL ) ;
 	}
 }
diff --git a/src/glib/gdirectory_win32.cpp b/src/glib/gdirectory_win32.cpp
index c5df7e3..3d889de 100644
--- a/src/glib/gdirectory_win32.cpp
+++ b/src/glib/gdirectory_win32.cpp
@@ -281,7 +281,7 @@ std::string G::DirectoryIteratorImp::modificationTimeString() const
 	const DWORD & hi = m_context.ftLastWriteTime.dwHighDateTime ;
 	const DWORD & lo = m_context.ftLastWriteTime.dwLowDateTime ;
 
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << hi << std::setw(8) << std::setfill('0') << lo ;
 	return ss.str() ;
 }
diff --git a/src/glib/gexception.cpp b/src/glib/gexception.cpp
index 1f87572..2eacb2a 100644
--- a/src/glib/gexception.cpp
+++ b/src/glib/gexception.cpp
@@ -38,11 +38,11 @@ G::Exception::Exception( const std::string & what ) :
 {
 }
 
-G::Exception::~Exception()
+G::Exception::~Exception() throw()
 {
 }
 
-const char * G::Exception::what() const
+const char * G::Exception::what() const throw()
 {
 	return m_what.c_str() ;
 }
diff --git a/src/glib/gexception.h b/src/glib/gexception.h
index 54ab7fd..88a3f96 100644
--- a/src/glib/gexception.h
+++ b/src/glib/gexception.h
@@ -31,7 +31,7 @@
 namespace G
 {
 	class Exception ;
-} ;
+}
 
 // Class: G::Exception
 // Description: A general-purpose exception class derived from std::exception
@@ -52,10 +52,10 @@ public:
 	explicit Exception( const std::string & what ) ;
 		// Constructor.
 
-	virtual ~Exception() ;
+	virtual ~Exception() throw() ;
 		// Destructor.
 
-	virtual const char * what() const ;
+	virtual const char * what() const throw() ;
 		// Override from std::exception.
 
 	void prepend( const char * context ) ;
@@ -79,7 +79,7 @@ public:
 		// This method allows a derived-class exception
 		// to be constructed and thrown on one
 		// line using iostream formatting.
-		// Eg. throw Error( std::stringstream() << a << b ) ;
+		// Eg. throw Error( std::ostringstream() << a << b ) ;
 } ;
 
 #define G_EXCEPTION( class_name , description ) class class_name : public G::Exception { public: class_name() { m_what = description ; } public: explicit class_name ( std::ostream & stream ) { m_what = description ; append(stream) ; } public: explicit class_name( const char * more ) { m_what = description ; append(more) ; } public: explicit class_name( const std::string & more ) { m_what = description ; append(more) ; } }
diff --git a/src/glib/gfile.h b/src/glib/gfile.h
index f58b2f1..ab6c1b7 100644
--- a/src/glib/gfile.h
+++ b/src/glib/gfile.h
@@ -33,7 +33,7 @@ namespace G
 {
 	class File ;
 	class DirectoryIteratorImp ;
-} ;
+}
 
 // Class: G::File
 // Description: A simple static class for dealing with files.
diff --git a/src/glib/gfile_unix.cpp b/src/glib/gfile_unix.cpp
index 7a9fd8b..2425e82 100644
--- a/src/glib/gfile_unix.cpp
+++ b/src/glib/gfile_unix.cpp
@@ -54,7 +54,7 @@ std::string G::File::sizeString( const Path & path )
 	if( 0 != ::stat( path.pathCstr() , &statbuf ) )
 		return std::string() ;
 
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << statbuf.st_size ;
 	return ss.str() ;
 }
diff --git a/src/glib/gfs.h b/src/glib/gfs.h
index e68b33f..c14a470 100644
--- a/src/glib/gfs.h
+++ b/src/glib/gfs.h
@@ -29,7 +29,7 @@
 namespace G
 {
 	class FileSystem ;
-} ;
+}
 
 // Class: G::FileSystem
 // Description: Provides information about the
diff --git a/src/glib/ggetopt.cpp b/src/glib/ggetopt.cpp
index d9bc1a5..ad40654 100644
--- a/src/glib/ggetopt.cpp
+++ b/src/glib/ggetopt.cpp
@@ -28,6 +28,7 @@
 #include "ggetopt.h"
 #include "gassert.h"
 #include "gdebug.h"
+#include <sstream>
 
 G::GetOpt::GetOpt( const Arg & args_in , const std::string & spec ,
 	char sep_major , char sep_minor , char escape ) :
@@ -46,18 +47,25 @@ void G::GetOpt::parseSpec( const std::string & spec , char sep_major , char sep_
 
 	for( Strings::iterator p = outer.begin() ; p != outer.end() ; ++p )
 	{
+		if( (*p).empty() ) continue ;
 		StringArray inner ;
 		std::string ws_minor( 1U , sep_minor ) ;
 		G::Str::splitIntoFields( *p , inner , ws_minor , escape ) ;
-		if( inner.size() != 5U )
-			throw InvalidSpecification(std::stringstream() << "\"" << *p << "\" (" << ws_minor << ")") ;
+		if( inner.size() != 6U )
+		{
+			std::ostringstream ss ;
+			ss << "\"" << *p << "\" (" << ws_minor << ")" ;
+			throw InvalidSpecification( ss.str() ) ;
+		}
 		bool valued = G::Str::toUInt( inner[3U] ) != 0U ;
-		addSpec( inner[1U] , inner[0U].at(0U) , inner[1U] , inner[2U] , valued , inner[4U] ) ;
+		unsigned int level = G::Str::toUInt( inner[5U] ) ;
+		addSpec( inner[1U] , inner[0U].at(0U) , inner[1U] , inner[2U] , valued , inner[4U] , level ) ;
 	}
 }
 
 void G::GetOpt::addSpec( const std::string & sort_key , char c , const std::string & name ,
-	const std::string & description , bool valued , const std::string & value_description )
+	const std::string & description , bool valued , const std::string & value_description ,
+	unsigned int level )
 {
 	if( c == '\0' )
 		throw InvalidSpecification() ;
@@ -65,17 +73,22 @@ void G::GetOpt::addSpec( const std::string & sort_key , char c , const std::stri
 	const bool debug = true ;
 	if( debug )
 	{
-		G_DEBUG( "G::GetOpt::addSpec: "
+		std::ostringstream ss ;
+		ss
+			<< "G::GetOpt::addSpec: "
 			<< "sort-key=" << sort_key << ": "
 			<< "char=" << c << ": "
 			<< "name=" << name << ": "
 			<< "description=" << description << ": "
 			<< "valued=" << (valued?"true":"false") << ": "
-			<< "value-description=" << value_description ) ;
+			<< "value-description=" << value_description << ": "
+			<< "level=" << level ;
+		G_DEBUG( ss.str() ) ;
 	}
 
 	std::pair<SwitchSpecMap::iterator,bool> rc =
-		m_spec_map.insert( std::make_pair(sort_key,SwitchSpec(c,name,description,valued,value_description)) ) ;
+		m_spec_map.insert( std::make_pair( sort_key ,
+			SwitchSpec(c,name,description,valued,value_description,level) ) ) ;
 
 	if( ! rc.second )
 		throw InvalidSpecification("duplication") ;
@@ -115,28 +128,41 @@ size_t G::GetOpt::wrapDefault()
 	return 79U ;
 }
 
+//static
+size_t G::GetOpt::tabDefault()
+{
+	return 30U ;
+}
+
+//static
+G::GetOpt::Level G::GetOpt::levelDefault()
+{
+	return Level(99U) ;
+}
+
 //static
 size_t G::GetOpt::widthLimit( size_t w )
 {
 	return (w != 0U && w < 50U) ? 50U : w ;
 }
 
-void G::GetOpt::showUsage( std::ostream & stream , const std::string & args ) const
+void G::GetOpt::showUsage( std::ostream & stream , const std::string & args , bool verbose ) const
 {
-	showUsage( stream , m_args.prefix() , args ) ;
+	showUsage( stream , m_args.prefix() , args , verbose ? levelDefault() : Level(1U) ) ;
 }
 
 void G::GetOpt::showUsage( std::ostream & stream , const std::string & exe , const std::string & args ,
-	size_t tab_stop , size_t width ) const
+	Level level , size_t tab_stop , size_t width ) const
 {
 	stream
-		<< usageSummary(exe,args,width) << std::endl
-		<< usageHelp(tab_stop,width) ;
+		<< usageSummary(exe,args,level,width) << std::endl
+		<< usageHelp(level,tab_stop,width,false) ;
 }
 
-std::string G::GetOpt::usageSummary( const std::string & exe , const std::string & args , size_t width ) const
+std::string G::GetOpt::usageSummary( const std::string & exe , const std::string & args ,
+	Level level , size_t width ) const
 {
-	std::string s = std::string("usage: ") + exe + " " + usageSummarySwitches() + args ;
+	std::string s = std::string("usage: ") + exe + " " + usageSummarySwitches(level) + args ;
 	if( width != 0U )
 	{
 		return G::Str::wrap( s , "" , "  " , widthLimit(width) ) ;
@@ -147,19 +173,28 @@ std::string G::GetOpt::usageSummary( const std::string & exe , const std::string
 	}
 }
 
-std::string G::GetOpt::usageSummarySwitches() const
+std::string G::GetOpt::usageSummarySwitches( Level level ) const
 {
-	return usageSummaryPartOne() + usageSummaryPartTwo() ;
+	return usageSummaryPartOne(level) + usageSummaryPartTwo(level) ;
 }
 
-std::string G::GetOpt::usageSummaryPartOne() const
+//static
+bool G::GetOpt::visible( SwitchSpecMap::const_iterator p , Level level , bool exact )
+{
+	return
+		exact ?
+			( !(*p).second.hidden && (*p).second.level == level.level ) :
+			( !(*p).second.hidden && (*p).second.level <= level.level ) ;
+}
+
+std::string G::GetOpt::usageSummaryPartOne( Level level ) const
 {
 	// summarise the single-character switches, excluding those which take a value
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	bool first = true ;
 	for( SwitchSpecMap::const_iterator p = m_spec_map.begin() ; p != m_spec_map.end() ; ++p )
 	{
-		if( !(*p).second.valued && !(*p).second.hidden )
+		if( !(*p).second.valued && visible(p,level,false) )
 		{
 			if( first )
 				ss << "[-" ;
@@ -173,13 +208,13 @@ std::string G::GetOpt::usageSummaryPartOne() const
 	return s ;
 }
 
-std::string G::GetOpt::usageSummaryPartTwo() const
+std::string G::GetOpt::usageSummaryPartTwo( Level level ) const
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	const char * sep = "" ;
 	for( SwitchSpecMap::const_iterator p = m_spec_map.begin() ; p != m_spec_map.end() ; ++p )
 	{
-		if( !(*p).second.hidden )
+		if( visible(p,level,false) )
 		{
 			ss << sep << "[" ;
 			if( (*p).second.name.length() )
@@ -203,17 +238,18 @@ std::string G::GetOpt::usageSummaryPartTwo() const
 	return ss.str() ;
 }
 
-std::string G::GetOpt::usageHelp( size_t tab_stop , size_t width ) const
+std::string G::GetOpt::usageHelp( Level level , size_t tab_stop , size_t width , bool exact ) const
 {
-	return usageHelpCore( "  " , tab_stop , widthLimit(width) ) ;
+	return usageHelpCore( "  " , level , tab_stop , widthLimit(width) , exact ) ;
 }
 
-std::string G::GetOpt::usageHelpCore( const std::string & prefix , size_t tab_stop , size_t width ) const
+std::string G::GetOpt::usageHelpCore( const std::string & prefix , Level level ,
+	size_t tab_stop , size_t width , bool exact ) const
 {
 	std::string result ;
 	for( SwitchSpecMap::const_iterator p = m_spec_map.begin() ; p != m_spec_map.end() ; ++p )
 	{
-		if( !(*p).second.hidden )
+		if( visible(p,level,exact) )
 		{
 			std::string line( prefix ) ;
 			line.append( "-" ) ;
diff --git a/src/glib/ggetopt.h b/src/glib/ggetopt.h
index 94fa063..91c5397 100644
--- a/src/glib/ggetopt.h
+++ b/src/glib/ggetopt.h
@@ -35,7 +35,7 @@
 namespace G
 {
 	class GetOpt ;
-} ;
+}
 
 // Class: G::GetOpt
 // Description: A command line switch parser.
@@ -45,6 +45,8 @@ class G::GetOpt
 {
 public:
 	typedef std::vector<std::string GAllocator(std::string) > StringArray ;
+	struct Level // Used by G::GetOpt for extra type safety.
+		{ unsigned int level ; explicit Level(unsigned int l) : level(l) {} } ;
 	G_EXCEPTION( InvalidSpecification , "invalid options specification string" ) ;
 
 	GetOpt( const Arg & arg , const std::string & spec ,
@@ -58,9 +60,12 @@ public:
 			//    <switch-description>
 			//    <value-type> -- 0 is none, and 1 is a string
 			//    <value-description>
+			//    <level>
 			//
-			// If the switch-description field is empty
-			// then the switch is hidden.
+			// If the switch-description field is empty or
+			// if the level is zero then the switch is hidden.
+			// By convention main-stream switches should have
+			// a level of 1, and obscure ones level 2 and above.
 
 	Arg args() const ;
 		// Returns all the non-switch command-line arguments.
@@ -71,28 +76,39 @@ public:
 	static size_t wrapDefault() ;
 		// Returns a default word-wrapping width.
 
+	static size_t tabDefault() ;
+		// Returns a default tab-stop.
+
+	static Level levelDefault() ;
+		// Returns the default level.
+
 	std::string usageSummary( const std::string & exe , const std::string & args ,
-		size_t wrap_width = wrapDefault() ) const ;
+		Level level = levelDefault() , size_t wrap_width = wrapDefault() ) const ;
 			// Returns a one-line usage summary, as
 			// "usage: <exe> <usageSummarySwitches()> <args>"
 
-	std::string usageSummarySwitches() const ;
+	std::string usageSummarySwitches( Level level = levelDefault() ) const ;
 		// Returns the one-line summary of switches. Does _not_
 		// include the usual "usage: <exe>" prefix
 		// or non-switch arguments.
 
-	std::string usageHelp( size_t tab_stop = 30U , size_t wrap_width = wrapDefault() ) const ;
-		// Returns a multi-line string giving help on each switch.
+	std::string usageHelp( Level level = levelDefault() ,
+		size_t tab_stop = tabDefault() , size_t wrap_width = wrapDefault() ,
+		bool level_exact = false ) const ;
+			// Returns a multi-line string giving help on each switch.
 
 	void showUsage( std::ostream & stream , const std::string & exe ,
-		const std::string & args , size_t tab_stop = 30U ,
+		const std::string & args , Level level = levelDefault() ,
+		size_t tab_stop = tabDefault() ,
 		size_t wrap_width = wrapDefault() ) const ;
 			// Streams out multi-line usage text using
 			// usageSummary() and usageHelp().
 
-	void showUsage( std::ostream & stream , const std::string & args ) const ;
+	void showUsage( std::ostream & stream , const std::string & args , bool verbose ) const ;
 		// Streams out multi-line usage text using
-		// usageSummary() and usageHelp().
+		// usageSummary() and usageHelp(). Shows
+		// only level one switches if 'verbose'
+		// is false.
 
 	bool hasErrors() const ;
 		// Returns true if there are errors.
@@ -126,7 +142,7 @@ public:
 		// value-based switch.
 
 private:
-	struct SwitchSpec
+	struct SwitchSpec // A private implementation structure used by G::GetOpt.
 	{
 		char c ;
 		std::string name ;
@@ -134,11 +150,12 @@ private:
 		bool valued ;
 		bool hidden ;
 		std::string value_description ;
+		unsigned int level ;
 		SwitchSpec(char c_,const std::string &name_,const std::string &description_,
-			bool v_,const std::string &vd_) :
+			bool v_,const std::string &vd_,unsigned int level_) :
 				c(c_) , name(name_) , description(description_) ,
-				valued(v_) , hidden(description_.empty()) ,
-				value_description(vd_) {}
+				valued(v_) , hidden(description_.empty()||level_==0U) ,
+				value_description(vd_) , level(level_) {}
 	} ;
 	typedef std::map<std::string,SwitchSpec GLessAllocator(char,SwitchSpec) > SwitchSpecMap ;
 	typedef std::pair<bool,std::string> Value ;
@@ -147,7 +164,8 @@ private:
 	void operator=( const GetOpt & ) ;
 	GetOpt( const GetOpt & ) ;
 	void parseSpec( const std::string & spec , char , char , char ) ;
-	void addSpec( const std::string & sort_key , char c , const std::string & name , const std::string & , bool valued , const std::string & ) ;
+	void addSpec( const std::string & , char c , const std::string & ,
+		const std::string & , bool , const std::string & , unsigned int ) ;
 	size_t parseArgs( const Arg & args_in ) ;
 	bool isOldSwitch( const std::string & arg ) const ;
 	bool isNewSwitch( const std::string & arg ) const ;
@@ -166,10 +184,11 @@ private:
 	void remove( size_t n ) ;
 	bool valid( const std::string & ) const ;
 	bool valid( char c ) const ;
-	std::string usageSummaryPartOne() const ;
-	std::string usageSummaryPartTwo() const ;
-	std::string usageHelpCore( const std::string & , size_t , size_t ) const ;
+	std::string usageSummaryPartOne( Level ) const ;
+	std::string usageSummaryPartTwo( Level ) const ;
+	std::string usageHelpCore( const std::string & , Level , size_t , size_t , bool ) const ;
 	static size_t widthLimit( size_t ) ;
+	static bool visible( SwitchSpecMap::const_iterator , Level , bool ) ;
 
 private:
 	SwitchSpecMap m_spec_map ;
diff --git a/src/glib/glog.cpp b/src/glib/glog.cpp
index e8f92f2..0c7ee58 100644
--- a/src/glib/glog.cpp
+++ b/src/glib/glog.cpp
@@ -28,7 +28,7 @@
 namespace G
 {
 	class LogImp ;
-} ;
+}
 
 // Class: LogImp
 // Description: An implementation class used by Log.
@@ -36,22 +36,22 @@ namespace G
 class G::LogImp
 {
 public:
-	static std::stringstream &s() ;
+	static std::ostringstream &s() ;
 	static bool active() ;
 	static void empty() ;
 	static const char *m_file ;
 	static int m_line ;
-	static std::stringstream *m_ss ;
+	static std::ostringstream *m_ss ;
 } ;
 
 const char *G::LogImp::m_file = NULL ;
-std::stringstream *G::LogImp::m_ss = NULL ;
+std::ostringstream *G::LogImp::m_ss = NULL ;
 int G::LogImp::m_line = 0 ;
 
-std::stringstream &G::LogImp::s()
+std::ostringstream & G::LogImp::s()
 {
 	if( m_ss == NULL )
-		m_ss = new std::stringstream ;
+		m_ss = new std::ostringstream ;
 	return *m_ss ;
 }
 
@@ -59,7 +59,7 @@ void G::LogImp::empty()
 {
 	delete m_ss ;
 	m_ss = NULL ;
-	m_ss = new std::stringstream ;
+	m_ss = new std::ostringstream ;
 }
 
 bool G::LogImp::active()
@@ -86,16 +86,7 @@ G::Log::End G::Log::end( G::Log::Severity severity )
 
 G::Log::Stream & G::Log::stream()
 {
-	if( G::LogImp::active() )
-	{
-		return G::LogImp::s() ;
-	}
-	else
-	{
-		static char buffer[3] ;
-		static std::stringstream dummy( buffer , sizeof(buffer) ) ;
-		return dummy ;
-	}
+	return G::LogImp::s() ;
 }
 
 void G::Log::onEnd( G::Log::Severity severity )
@@ -104,10 +95,9 @@ void G::Log::onEnd( G::Log::Severity severity )
 	{
 		G::LogOutput::output( severity , G::LogImp::m_file , G::LogImp::m_line ,
 			G::LogImp::s().str().c_str() ) ;
-
-		// empty the stream
-		G::LogImp::empty() ;
 	}
+
+	G::LogImp::empty() ; // empty the stream
 	G::LogImp::m_file = NULL ;
 	G::LogImp::m_line = 0 ;
 }
diff --git a/src/glib/glog.h b/src/glib/glog.h
index a113be1..00df431 100644
--- a/src/glib/glog.h
+++ b/src/glib/glog.h
@@ -29,7 +29,7 @@
 namespace G
 {
 	class Log ;
-} ;
+}
 
 // Class: G::Log
 // Description: A static class for doing iostream-based logging.
@@ -82,7 +82,7 @@ namespace G
 	{
 		return stream ;
 	}
-} ;
+}
 
 namespace G
 {
@@ -93,7 +93,7 @@ namespace G
 			G::Log::onEnd( end.m_s ) ;
 		return stream ;
 	}
-} ;
+}
 
 namespace G
 {
@@ -103,7 +103,7 @@ namespace G
 		G::Log::setFile( file ) ;
 		G::Log::setLine( line ) ;
 	}
-} ;
+}
 
 // Macros: G_LOG, G_LOG_S, G_DEBUG, G_WARNING, G_ERROR
 // The debug macro is for debugging during development. The log macro
@@ -113,7 +113,7 @@ namespace G
 // then warning/error messages should also get raised by some another
 // independent means.
 //
-#define G_LOG_OUTPUT( expr , severity ) { G::Log::stream() << G::Log::Line(__FILE__,__LINE__) << expr << G::Log::end(severity) ; }
+#define G_LOG_OUTPUT( expr , severity ) do { G::Log::stream() << G::Log::Line(__FILE__,__LINE__) << expr << G::Log::end(severity) ; } while(0)
 #if defined(_DEBUG) && ! defined(G_NO_DEBUG)
 #define G_DEBUG( expr ) G_LOG_OUTPUT( expr , G::Log::s_Debug )
 #else
diff --git a/src/glib/glogoutput.h b/src/glib/glogoutput.h
index 9120653..07fdd97 100644
--- a/src/glib/glogoutput.h
+++ b/src/glib/glogoutput.h
@@ -30,7 +30,7 @@
 namespace G
 {
 	class LogOutput ;
-} ;
+}
 
 // Class: G::LogOutput
 // Description: Controls and implements low-level logging output, as used by the Log interface.
diff --git a/src/glib/glogoutput_unix.cpp b/src/glib/glogoutput_unix.cpp
index f59a143..d404a04 100644
--- a/src/glib/glogoutput_unix.cpp
+++ b/src/glib/glogoutput_unix.cpp
@@ -46,7 +46,7 @@ namespace
 	
 		return m ;
 	}
-} ;
+}
 
 void G::LogOutput::rawOutput( G::Log::Severity severity , const char *message )
 {
diff --git a/src/glib/glogoutput_win32.cpp b/src/glib/glogoutput_win32.cpp
index bb8a7b7..c1acbff 100644
--- a/src/glib/glogoutput_win32.cpp
+++ b/src/glib/glogoutput_win32.cpp
@@ -27,12 +27,6 @@
 #include <cstdlib> // getenv
 
 static HANDLE source() ;
-#if ! defined(RegisterEventSource)
-static void RegisterEventSource( const char * , const char * ) {}
-static void DeregisterEventSource( HANDLE ) {}
-static void ReportEvent( HANDLE , DWORD , int , DWORD , const char * ,
-	size_t , int , const char ** , const char * ) {}
-#endif
 
 void G::LogOutput::cleanup()
 {
@@ -90,9 +84,7 @@ void G::LogOutput::rawOutput( G::Log::Severity severity , const char *message )
 
 void G::LogOutput::init()
 {
-  #if defined(RegisterEventSource)
 	m_handle = ::source() ;
-  #endif
 }
 
 static HANDLE source()
diff --git a/src/glib/gmd5.h b/src/glib/gmd5.h
index 5cc12e1..7c28f94 100644
--- a/src/glib/gmd5.h
+++ b/src/glib/gmd5.h
@@ -31,7 +31,7 @@
 namespace G
 {
 	class Md5 ;
-} ;
+}
 
 // Class: G::Md5
 // Description: MD5 class.
diff --git a/src/glib/gnoncopyable.h b/src/glib/gnoncopyable.h
index b51b6c1..8516c8a 100644
--- a/src/glib/gnoncopyable.h
+++ b/src/glib/gnoncopyable.h
@@ -29,7 +29,7 @@
 namespace G
 {
 	class noncopyable ;
-} ;
+}
 
 // Class: G::noncopyable
 // Description: A noncopyable base class (a la boost).
diff --git a/src/glib/gpath.h b/src/glib/gpath.h
index a41d276..5637c48 100644
--- a/src/glib/gpath.h
+++ b/src/glib/gpath.h
@@ -32,7 +32,7 @@
 namespace G
 {
 	class Path ;
-} ;
+}
 
 // Class: G::Path
 // Description: A Path object represents a file system
@@ -86,7 +86,7 @@ public:
 		// eg. c:foo\bar.exe -> c:foo
 		// eg. c:\foo\bar.exe -> c:\foo
 		// eg. c:bar.exe -> c:
-		// eg. c:\file -> c:\
+		// eg. c:\file -> c:\                              .
 		// eg. c:\ -> <empty>
 		// eg. c: -> <empty>
 		// eg. \foo\bar.exe -> \foo
@@ -105,8 +105,8 @@ public:
 	
 	void removeExtension() ;
 		// Modifies the path by removing any extension.
-		// However, the extension returned by extension()
-		// is unchanged.
+		// However, the extension returned by extension() is
+		// unchanged.
 		
 	void setExtension( const std::string & extension ) ;
 		// Replaces the extension. Any leading dot in the
@@ -177,6 +177,6 @@ namespace G
 		path.streamOut( stream ) ;
 		return stream ;
 	}
-} ;
+}
 
 #endif
diff --git a/src/glib/gpidfile.cpp b/src/glib/gpidfile.cpp
new file mode 100644
index 0000000..f3ea673
--- /dev/null
+++ b/src/glib/gpidfile.cpp
@@ -0,0 +1,128 @@
+//
+// Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// ===
+//
+// gpidfile.cpp
+//
+
+#include "gdef.h"
+#include "gpidfile.h"
+#include "gprocess.h"
+#include "gcleanup.h"
+#include "gfile.h"
+#include "gdebug.h"
+#include <cstdlib> // std::malloc()
+#include <cstring> // std::strdup()
+#include <fstream>
+#include <fcntl.h>
+
+namespace
+{
+	// strdup() not in std:: ?
+	char * strdup_( const char * p )
+	{
+		p = p ? p : "" ;
+		char * buffer = static_cast<char*>( std::malloc( std::strlen(p) + 1U ) ) ;
+		std::strcpy( buffer , p ) ;
+		return buffer ;
+	}
+}
+
+//static
+void G::PidFile::create( const Path & pid_file )
+{
+	if( pid_file != Path() )
+	{
+		G_DEBUG( "G::PidFile::create: \"" << pid_file << "\"" ) ;
+		Process::Umask readable(Process::Umask::Readable) ;
+		std::ofstream file( pid_file.str().c_str() ) ;
+		file << Process::Id() << std::endl ;
+		if( !file.good() )
+			throw Error(std::string("cannot create file: ")+pid_file.str()) ;
+		Cleanup::add( cleanup , strdup_(pid_file.str().c_str()) ) ; // (leaks)
+	}
+}
+
+//static
+bool G::PidFile::mine( const char * path )
+{
+	// reentrant implementation...
+	Process::Id this_pid ;
+	Process::Id file_pid( path ) ;
+	return this_pid == file_pid ;
+}
+
+//static
+void G::PidFile::cleanup( const char * path )
+{
+	// reentrant implementation...
+	try
+	{
+		if( path && *path && mine(path) )
+			std::remove( path ) ;
+	}
+	catch(...)
+	{
+	}
+}
+
+// ===
+
+G::PidFile::PidFile()
+{
+}
+
+G::PidFile::~PidFile()
+{
+	if( valid() )
+		cleanup( m_path.pathCstr() ) ;
+}
+
+G::PidFile::PidFile( const Path & path ) :
+	m_path(path)
+{
+}
+
+void G::PidFile::init( const Path & path )
+{
+	m_path = path ;
+}
+
+void G::PidFile::check()
+{
+	if( valid() && ! m_path.isAbsolute() )
+		throw Error(std::string("must be an absolute path: ")+m_path.str()) ;
+}
+
+void G::PidFile::commit()
+{
+	if( valid() )
+		create( m_path ) ;
+}
+
+G::Path G::PidFile::path() const
+{
+	return m_path ;
+}
+
+bool G::PidFile::valid() const
+{
+	return m_path != Path() ;
+}
+
diff --git a/src/glib/gpidfile.h b/src/glib/gpidfile.h
new file mode 100644
index 0000000..44b04e1
--- /dev/null
+++ b/src/glib/gpidfile.h
@@ -0,0 +1,93 @@
+//
+// Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// ===
+//
+// gpidfile.h
+//
+
+#ifndef G_PIDFILE_H
+#define G_PIDFILE_H
+
+#include "gdef.h"
+#include "gexception.h"
+#include "gpath.h"
+#include <sys/types.h>
+#include <string>
+
+namespace G
+{
+	class PidFile ;
+	class Daemon ;
+}
+
+// Class: G::PidFile
+// Description: A class for creating pid files.
+// See also: G::Daemon
+//
+class G::PidFile
+{
+public:
+	G_EXCEPTION( Error , "invalid pid file" ) ;
+
+	static void cleanup( const char * path ) ;
+		// Deletes the specified pid file if it
+		// contains this process's id.
+		//
+		// Reentrant implementation.
+
+	explicit PidFile( const Path & pid_file_path ) ;
+		// Constructor. The path should normally be
+		// an absolute path. Use commit() to actually
+		// create the file.
+
+	PidFile() ;
+		// Default constructor. Constructs a
+		// do-nothing object. Initialise with init().
+
+	void init( const Path & pid_file_path ) ;
+		// Used after default construction.
+
+	~PidFile() ;
+		// Destructor. Calls cleanup() to delete
+		// the file.
+
+	void commit() ;
+		// Creates the file.
+
+	void check() ;
+		// Throws an exception if the path is not
+		// absolute.
+
+	Path path() const ;
+		// Returns the path as supplied to the constructor
+		// or init().
+
+private:
+	Path m_path ;
+
+private:
+	PidFile( const PidFile & ) ; // not implemented
+	void operator=( const PidFile & ) ; // not implemented
+	static bool mine( const char * path ) ; // reentrant
+	static void create( const Path & pid_file ) ;
+	bool valid() const ;
+} ;
+
+#endif
+
diff --git a/src/glib/gprocess.h b/src/glib/gprocess.h
index e8472a0..385228e 100644
--- a/src/glib/gprocess.h
+++ b/src/glib/gprocess.h
@@ -27,6 +27,7 @@
 #include "gdef.h"
 #include "gexception.h"
 #include "gpath.h"
+#include "gstrings.h"
 #include <iostream>
 #include <sys/types.h>
 #include <string>
@@ -34,7 +35,7 @@
 namespace G
 {
 	class Process ;
-} ;
+}
 
 // Class: G::Process
 // Description: A static interface for doing things with processes.
@@ -52,18 +53,19 @@ public:
 	G_EXCEPTION( UidError , "cannot set uid" ) ;
 	G_EXCEPTION( GidError , "cannot set gid" ) ;
 	G_EXCEPTION( Insecure , "refusing to exec() while the user-id is zero" ) ;
+	G_EXCEPTION( InvalidId , "invalid process-id string" ) ;
+	G_EXCEPTION( PipeError , "pipe error" ) ;
 
 	enum Who { Parent , Child } ;
 	class IdImp ;
 	class Id // Process-id class.
 	{
 		public: Id() ;
-		public: ~Id() ;
-		public: Id( const Id & other ) ;
-		public: Id & operator=( const Id & rhs ) ;
-		public: bool operator==( const Id & other ) const ;
+		public: explicit Id( std::istream & ) ;
+		public: explicit Id( const char * pid_file_path ) ; // (re-entrant ctor)
 		public: std::string str() const ;
-		private: IdImp * m_imp ;
+		public: bool operator==( const Id & ) const ;
+		private: pid_t m_pid ;
 		friend class Process ;
 	} ;
 	struct Identity // Used by G::Process::beSpecial().
@@ -74,6 +76,17 @@ public:
 		explicit Identity( const std::string & login_name ) ;
 		std::string str() const ;
 	} ;
+	class Umask // Used to temporarily modify the process umask.
+	{
+		public: enum Mode { Readable , Tighter , Tightest } ;
+		public: explicit Umask( Mode ) ;
+		public: ~Umask() ;
+		public: static void set( Mode ) ;
+		private: Umask( const Umask & ) ; // not implemented
+		private: void operator=( const Umask & ) ; // not implemented
+		private: class UmaskImp ;
+		private: UmaskImp * m_imp ;
+	} ;
 	class NoThrow // An overload discriminator for Process.
 		{} ;
 
@@ -83,9 +96,6 @@ public:
 	static void closeStderr() ;
 		// Closes stderr.
 
-	static void setUmask( bool tightest = true ) ;
-		// Sets a tight umask.
-
 	static void cd( const Path & dir ) ;
 		// Changes directory.
 
@@ -98,12 +108,15 @@ public:
 
 	static Who fork( Id & child ) ;
 		// Forks a child process. Returns the child
-		// pid to the parent.
+		// pid by reference to the parent.
 
-	static int spawn( Identity nobody , const Path & exe , const std::string & arg , int error_return = 127 ) ;
-		// Runs a command in an unprivileged child process. Returns the
-		// child process's exit code, or 'error_return' on error.
-		// The identity should have come from beOrdinary().
+	static int spawn( Identity nobody , const Path & exe , const Strings & args ,
+		std::string * pipe_result_p = NULL , int error_return = 127 ) ;
+			// Runs a command in an unprivileged child process. Returns the
+			// child process's exit code, or 'error_return' on error.
+			// If the 'pipe_result_p' pointer is supplied then a pipe
+			// is used to read the first bit of whatever the child process
+			// writes to stdout. The identity should have come from beOrdinary().
 
 	static int errno_() ;
 		// Returns the process's current 'errno' value.
@@ -112,6 +125,8 @@ public:
 		// Aquires special privileges (either root
 		// or suid). The parameter must have come from
 		// a previous call to beOrdinary().
+		//
+		// See also class G::Root.
 
 	static Identity beOrdinary( Identity nobody , bool change_group = true ) ;
 		// Revokes special privileges (root or suid).
@@ -122,13 +137,16 @@ public:
 		// parameter is ignored. Returns the old
 		// identity, which can be passed to
 		// beSpecial().
+		//
+		// See also class G::Root.
 
 private:
 	Process() ;
 	static int wait( const Id & child ) ;
 	static int wait( const Id & child , int error_return ) ;
-	static void execCore( const Path & , const std::string & ) ;
+	static void execCore( const Path & , const Strings & ) ;
 	static void beNobody( Identity ) ;
+	static void closeFiles( int ) ;
 } ;
 
 namespace G
@@ -139,12 +157,19 @@ namespace G
 		return stream << id.str() ;
 	}
 
+	inline
+	std::istream & operator>>( std::istream & stream , G::Process::Id & id )
+	{
+		id = G::Process::Id( stream ) ;
+		return stream ;
+	}
+
 	inline
 	std::ostream & operator<<( std::ostream & stream , const G::Process::Identity & identity )
 	{
 		return stream << identity.str() ;
 	}
-} ;
+}
 
 #endif
 
diff --git a/src/glib/gprocess_unix.cpp b/src/glib/gprocess_unix.cpp
index 8e5cc67..c6bc081 100644
--- a/src/glib/gprocess_unix.cpp
+++ b/src/glib/gprocess_unix.cpp
@@ -34,6 +34,38 @@
 #include <pwd.h> // getpwnam()
 #include <unistd.h> // setuid() etc
 
+namespace
+{
+	void noCloseOnExec( int fd )
+	{
+		::fcntl( fd , F_SETFD , 0 ) ;
+	}
+}
+
+namespace G
+{
+	class Pipe ;
+}
+
+// Class: G::Pipe
+// Description: A private implementation class used by G::Process.
+//
+class G::Pipe
+{
+public:
+	explicit Pipe( bool active ) ;
+	~Pipe() ;
+	void inChild() ; // writer
+	void inParent() ; // reader
+	int fd() const ;
+	void dup() ; // onto stdout
+	std::string read() ; // size-limited
+private:
+	G_EXCEPTION( Error , "pipe error" ) ;
+	int m_fds[2] ;
+	int m_fd ;
+} ;
+
 // Class: G::Process::IdImp
 // Description: A private implementation class used by G::Process.
 //
@@ -58,24 +90,25 @@ bool G::Process::cd( const Path & dir , NoThrow )
 	return 0 == ::chdir( dir.str().c_str() ) ;
 }
 
-//static
-void G::Process::setUmask( bool tightest )
-{
-	mode_t new_mode = tightest ? 0177 : 0117 ; // tightest => -rw-------
-	(void) ::umask( new_mode ) ;
-}
-
 //static
 void G::Process::closeStderr()
 {
 	::close( STDERR_FILENO ) ;
 	::open( G::FileSystem::nullDevice() , O_WRONLY ) ;
-	::fcntl( STDERR_FILENO , F_SETFD , 0 ) ; // close-on-exec false
+	noCloseOnExec( STDERR_FILENO ) ;
 }
 
 //static
 void G::Process::closeFiles( bool keep_stderr )
 {
+	closeFiles( keep_stderr ? STDERR_FILENO : -1 ) ;
+}
+
+//static
+void G::Process::closeFiles( int keep )
+{
+	G_ASSERT( keep == -1 || keep >= STDERR_FILENO ) ;
+
 	int n = 256U ;
 	long rc = ::sysconf( _SC_OPEN_MAX ) ;
 	if( rc > 0L )
@@ -83,10 +116,8 @@ void G::Process::closeFiles( bool keep_stderr )
 
 	for( int fd = 0 ; fd < n ; fd++ )
 	{
-		if( !keep_stderr || fd != STDERR_FILENO )
-		{
+		if( fd != keep )
 			::close( fd ) ;
-		}
 	}
 
 	// reopen standard fds to prevent accidental use
@@ -95,13 +126,13 @@ void G::Process::closeFiles( bool keep_stderr )
 	//
 	::open( G::FileSystem::nullDevice() , O_RDONLY ) ;
 	::open( G::FileSystem::nullDevice() , O_WRONLY ) ;
-	if( !keep_stderr )
+	if( keep != STDERR_FILENO )
 	{
 		::open( G::FileSystem::nullDevice() , O_WRONLY ) ;
-		::fcntl( STDERR_FILENO , F_SETFD , 0 ) ; // close-on-exec false
 	}
-	::fcntl( STDIN_FILENO , F_SETFD , 0 ) ; // close-on-exec false
-	::fcntl( STDOUT_FILENO , F_SETFD , 0 ) ; // close-on-exec false
+	noCloseOnExec( STDIN_FILENO ) ;
+	noCloseOnExec( STDOUT_FILENO ) ;
+	noCloseOnExec( STDERR_FILENO ) ;
 }
 
 G::Process::Who G::Process::fork()
@@ -117,7 +148,7 @@ G::Process::Who G::Process::fork( Id & child_pid )
 	if( ok )
 	{
 		if( rc != 0 )
-			child_pid.m_imp->m_pid = rc ;
+			child_pid.m_pid = rc ;
 	}
 	else
 	{
@@ -132,7 +163,7 @@ int G::Process::wait( const Id & child_pid )
 	for(;;)
 	{
 		G_DEBUG( "G::Process::wait: waiting" ) ;
-		int rc = ::waitpid( child_pid.m_imp->m_pid , &status , 0 ) ;
+		int rc = ::waitpid( child_pid.m_pid , &status , 0 ) ;
 		if( rc == -1 && errno_() == EINTR )
 		{
 			; // signal in parent -- keep waiting
@@ -140,7 +171,9 @@ int G::Process::wait( const Id & child_pid )
 		else if( rc == -1 )
 		{
 			int error = errno_() ;
-			throw WaitError( std::stringstream() << "errno=" << error ) ;
+			std::ostringstream ss ;
+			ss << "errno=" << error ;
+			throw WaitError( ss.str() ) ;
 		}
 		else
 		{
@@ -152,7 +185,9 @@ int G::Process::wait( const Id & child_pid )
 	if( ! WIFEXITED(status) )
 	{
 		// uncaught signal or stopped
-		throw ChildError( std::stringstream() << "status=" << status ) ;
+		std::ostringstream ss ;
+		ss << "status=" << status ;
+		throw ChildError( ss.str() ) ;
 	}
 
 	const int exit_status = WEXITSTATUS(status) ;
@@ -177,7 +212,8 @@ int G::Process::errno_()
 	return errno ; // not ::errno or std::errno for gcc2.95
 }
 
-int G::Process::spawn( Identity nobody , const G::Path & exe , const std::string & arg , int error_return )
+int G::Process::spawn( Identity nobody , const Path & exe , const Strings & args ,
+	std::string * pipe_result_p , int error_return )
 {
 	if( exe.isRelative() )
 		throw InvalidPath( exe.str() ) ;
@@ -185,28 +221,36 @@ int G::Process::spawn( Identity nobody , const G::Path & exe , const std::string
 	if( ::geteuid() == 0U || nobody.uid == 0U )
 		throw Insecure() ;
 
+	Pipe pipe( pipe_result_p != NULL ) ;
 	Id child_pid ;
 	if( fork(child_pid) == Child )
 	{
-		beNobody( nobody ) ;
-		G_ASSERT( ::getuid() != 0U && ::geteuid() != 0U ) ;
-		closeFiles() ;
-		execCore( exe , arg ) ;
+		try
+		{
+			beNobody( nobody ) ;
+			G_ASSERT( ::getuid() != 0U && ::geteuid() != 0U ) ;
+			pipe.inChild() ;
+			closeFiles( pipe.fd() ) ;
+			pipe.dup() ; // dup() onto stdout
+			execCore( exe , args ) ;
+		}
+		catch(...)
+		{
+		}
 		::_exit( error_return ) ;
+		return error_return ; // pacify the compiler
 	}
 	else
 	{
-		return wait( child_pid , error_return ) ;
+		pipe.inParent() ;
+		int exit_status = wait( child_pid , error_return ) ;
+		if( pipe_result_p != NULL ) *pipe_result_p = pipe.read() ;
+		return exit_status ;
 	}
 }
 
-void G::Process::execCore( const G::Path & exe , const std::string & arg )
+void G::Process::execCore( const G::Path & exe , const Strings & args )
 {
-	char * argv[3U] ;
-	argv[0U] = const_cast<char*>( exe.pathCstr() ) ;
-	argv[1U] = arg.empty() ? static_cast<char*>(NULL) : const_cast<char*>(arg.c_str()) ;
-	argv[2U] = NULL ;
-
 	char * env[3U] ;
 	std::string path( "PATH=/usr/bin:/bin" ) ; // no "."
 	std::string ifs( "IFS= \t\n" ) ;
@@ -214,9 +258,17 @@ void G::Process::execCore( const G::Path & exe , const std::string & arg )
 	env[1U] = const_cast<char*>( ifs.c_str() ) ;
 	env[2U] = NULL ;
 
-	::execve( exe.str().c_str() , argv , env ) ;
+	char ** argv = new char* [ args.size() + 2U ] ;
+	argv[0U] = const_cast<char*>( exe.pathCstr() ) ;
+	unsigned int argc = 1U ;
+	for( Strings::const_iterator arg_p = args.begin() ; arg_p != args.end() ; ++arg_p , argc++ )
+		argv[argc] = const_cast<char*>(arg_p->c_str()) ;
+	argv[argc] = NULL ;
 
+	::execve( exe.str().c_str() , argv , env ) ;
 	const int error = errno_() ;
+	delete [] argv ;
+
 	G_WARNING( "G::Process::exec: execve() returned: errno=" << error << ": " << exe ) ;
 }
 
@@ -232,8 +284,8 @@ void G::Process::beSpecial( Identity identity , bool change_group )
 	Identity old_identity ;
 	(void) ::seteuid( identity.uid ) ;
 	if( change_group) (void) ::setegid( identity.gid ) ;
-	(void) old_identity.str() ; // pacify the compiler
-	G_DEBUG( "G::Process::beSpecial: " << old_identity << " -> " << Identity() ) ;
+	//G_DEBUG( "G::Process::beSpecial: " << old_identity << " -> " << Identity() ) ;
+	old_identity.uid = 0 ; // pacify the compiler
 }
 
 G::Process::Identity G::Process::beOrdinary( Identity nobody , bool change_group )
@@ -252,7 +304,7 @@ G::Process::Identity G::Process::beOrdinary( Identity nobody , bool change_group
 		if( ::seteuid( ::getuid() ) ) throw UidError() ;
 		if( change_group && ::setegid( ::getgid() ) ) throw GidError() ;
 	}
-	G_DEBUG( "G::Process::beOrdinary: " << special_identity << " -> " << Identity() ) ;
+	//G_DEBUG( "G::Process::beOrdinary: " << special_identity << " -> " << Identity() ) ;
 	return special_identity ;
 }
 
@@ -269,40 +321,42 @@ void G::Process::beNobody( Identity nobody )
 
 // ===
 
-G::Process::Id::Id() : m_imp(NULL)
+G::Process::Id::Id()
 {
-	m_imp = new IdImp ;
-	m_imp->m_pid = ::getpid() ;
+	m_pid = ::getpid() ;
 }
 
-G::Process::Id::~Id()
+G::Process::Id::Id( const char * path ) :
+	m_pid(0)
 {
-	delete m_imp ;
+	// reentrant implementation suitable for a signal handler...
+	int fd = ::open( path ? path : "" , O_RDONLY ) ;
+	char buffer[10] ;
+	ssize_t rc = ::read( fd , buffer , sizeof(buffer) ) ;
+	for( const char * p = buffer ; rc > 0 && *p >= '0' && *p <= '9' ; p++ , rc-- )
+	{
+		m_pid *= 10 ;
+		m_pid += ( *p - '0' ) ;
+	}
 }
 
-G::Process::Id::Id( const Id & other ) :
-	m_imp(NULL)
+G::Process::Id::Id( std::istream & stream )
 {
-	m_imp = new IdImp ;
-	m_imp->m_pid = other.m_imp->m_pid ;
-}
-
-G::Process::Id & G::Process::Id::operator=( const Id & rhs )
-{
-	m_imp->m_pid = rhs.m_imp->m_pid ;
-	return *this ;
+	stream >> m_pid ;
+	if( !stream.good() )
+		throw Process::InvalidId() ;
 }
 
 std::string G::Process::Id::str() const
 {
-	std::stringstream ss ;
-	ss << m_imp->m_pid ;
+	std::ostringstream ss ;
+	ss << m_pid ;
 	return ss.str() ;
 }
 
-bool G::Process::Id::operator==( const Id & rhs ) const
+bool G::Process::Id::operator==( const Id & other ) const
 {
-	return m_imp->m_pid == rhs.m_imp->m_pid ;
+	return m_pid == other.m_pid ;
 }
 
 // ===
@@ -322,7 +376,7 @@ G::Process::Identity::Identity( const std::string & name ) :
 		::passwd * pw = ::getpwnam( name.c_str() ) ;
 		if( pw == NULL )
 			throw Process::NoSuchUser(name) ;
-		G_DEBUG( "G::Process::Identity: " << name << "=" << pw->pw_uid << "/" << pw->pw_gid ) ;
+		//G_DEBUG( "G::Process::Identity: " << name << "=" << pw->pw_uid << "/" << pw->pw_gid ) ;
 		uid = pw->pw_uid ;
 		gid = pw->pw_gid ;
 	}
@@ -330,8 +384,95 @@ G::Process::Identity::Identity( const std::string & name ) :
 
 std::string G::Process::Identity::str() const
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << uid << "/" << gid ;
 	return ss.str() ;
 }
 
+// ===
+
+class G::Process::Umask::UmaskImp
+{
+public:
+	mode_t m_old_mode ;
+} ;
+
+G::Process::Umask::Umask( Mode mode ) :
+	m_imp(new UmaskImp)
+{
+	m_imp->m_old_mode =
+		::umask( mode==Readable?0133:(mode==Tighter?0117:0177) ) ;
+}
+
+G::Process::Umask::~Umask()
+{
+	(void) ::umask( m_imp->m_old_mode ) ;
+	delete m_imp ;
+}
+
+//static
+void G::Process::Umask::set( Mode mode )
+{
+	// Tightest: -rw-------
+	// Tighter:  -rw-rw----
+	// Readable: -rw-r--r--
+	::umask( mode==Readable?0133:(mode==Tighter?0117:0177) ) ;
+}
+
+// ===
+
+G::Pipe::Pipe( bool active ) :
+	m_fd(-1)
+{
+	m_fds[0] = m_fds[1] = -1 ;
+	if( active && ::pipe( m_fds ) < 0 )
+		throw Error() ;
+	G_DEBUG( "G::Pipe::ctor: " << m_fds[0] << " " << m_fds[1] ) ;
+}
+
+G::Pipe::~Pipe()
+{
+	if( m_fds[0] >= 0 ) ::close( m_fds[0] ) ;
+	if( m_fds[1] >= 0 ) ::close( m_fds[1] ) ;
+}
+
+void G::Pipe::inChild()
+{
+	::close( m_fds[0] ) ;
+	m_fds[0] = -1 ;
+	m_fd = m_fds[1] ; // writer
+}
+
+void G::Pipe::inParent()
+{
+	::close( m_fds[1] ) ;
+	m_fds[1] = -1 ;
+	m_fd = m_fds[0] ; // reader
+}
+
+int G::Pipe::fd() const
+{
+	return m_fd ;
+}
+
+void G::Pipe::dup()
+{
+	if( m_fd != -1 && m_fd != STDOUT_FILENO )
+	{
+		if( ::dup2(m_fd,STDOUT_FILENO) != STDOUT_FILENO )
+			throw Error() ;
+		::close( m_fd ) ;
+		m_fd = -1 ;
+		m_fds[1] = -1 ;
+		noCloseOnExec( STDOUT_FILENO ) ;
+	}
+}
+
+std::string G::Pipe::read()
+{
+	char buffer[4096] ;
+	int rc = m_fd == -1 ? 0 : ::read( m_fd , buffer , sizeof(buffer) ) ;
+	if( rc < 0 ) throw Error("read") ;
+	return std::string(buffer,rc) ;
+}
+
diff --git a/src/glib/gprocess_win32.cpp b/src/glib/gprocess_win32.cpp
index a68662c..0dcba1e 100644
--- a/src/glib/gprocess_win32.cpp
+++ b/src/glib/gprocess_win32.cpp
@@ -23,20 +23,36 @@
 
 #include "gdef.h"
 #include "gprocess.h"
+#include "gexception.h"
+#include "gstr.h"
 #include "glog.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <process.h>
 #include <direct.h>
 #include <io.h>
+#include <fcntl.h>
 
 namespace G
 {
 	const int STDERR_FILENO = 2 ;
 	const int SC_OPEN_MAX = 256 ; // 32 in limits.h !?
+	class Pipe ;
 } ;
 
-// ===
+class G::Pipe
+{
+public:
+	G_EXCEPTION( Error , "pipe error" ) ;
+	explicit Pipe( bool active ) ;
+	~Pipe() ;
+	int fd() const ;
+	std::string read() ;
+private:
+	bool m_active ;
+	int m_fds[2] ;
+	int m_fd_writer ;
+} ;
 
 class G::Process::IdImp
 {
@@ -46,42 +62,86 @@ public:
 
 // ===
 
-G::Process::Id::Id() : m_imp(NULL)
+G::Pipe::Pipe( bool active ) :
+	m_active(active) ,
+	m_fd_writer(-1)
 {
-	m_imp = new IdImp ;
-	m_imp->m_pid = static_cast<unsigned int>(::_getpid()) ; // or ::GetCurrentProcessId()
+	m_fds[0] = m_fds[1] = -1 ;
+	if( m_active )
+	{
+		int rc = ::_pipe( m_fds , 256 , _O_BINARY | _O_NOINHERIT ) ;
+		if( rc < 0 ) throw Error() ;
+		m_fd_writer = ::_dup( m_fds[1] ) ; // inherited
+		::_close( m_fds[1] ) ;
+		m_fds[1] = -1 ;
+	}
 }
 
-G::Process::Id::~Id()
+G::Pipe::~Pipe()
 {
-	delete m_imp ;
+	if( m_active )
+	{
+		::_close( m_fds[0] ) ;
+		::_close( m_fds[1] ) ;
+		::_close( m_fd_writer ) ;
+	}
 }
 
-G::Process::Id::Id( const Id & other ) :
-	m_imp(NULL)
+int G::Pipe::fd() const
 {
-	m_imp = new IdImp ;
-	m_imp->m_pid = other.m_imp->m_pid ;
+	return m_fd_writer ;
 }
 
-G::Process::Id & G::Process::Id::operator=( const Id & rhs )
+std::string G::Pipe::read()
 {
-	m_imp->m_pid = rhs.m_imp->m_pid ;
-	return *this ;
+	if( ! m_active ) return std::string() ;
+	::_close( m_fd_writer ) ;
+	char buffer[4096] ;
+	int rc = m_fds[0] == -1 ? 0 : ::_read( m_fds[0] , buffer , sizeof(buffer) ) ;
+	if( rc < 0 ) throw Error() ;
+	return std::string( buffer , rc ) ;
+}
+
+// ===
+
+G::Process::Id::Id()
+{
+	m_pid = static_cast<unsigned int>(::_getpid()) ; // or ::GetCurrentProcessId()
+}
+
+G::Process::Id::Id( const char * path ) :
+	m_pid(0)
+{
+	std::ifstream file( path ? path : "" ) ;
+	file >> m_pid ;
+	if( !file.good() )
+		m_pid = 0 ;
+}
+
+G::Process::Id::Id( std::istream & stream )
+{
+	stream >> m_pid ;
+	if( !stream.good() )
+		throw Process::InvalidId() ;
 }
 
 std::string G::Process::Id::str() const
 {
-	std::stringstream ss ;
-	ss << m_imp->m_pid ;
+	std::ostringstream ss ;
+	ss << m_pid ;
 	return ss.str() ;
 }
 
 bool G::Process::Id::operator==( const Id & rhs ) const
 {
-	return m_imp->m_pid == rhs.m_imp->m_pid ;
+	return m_pid == rhs.m_pid ;
 }
 
+// not implemented...
+//G::Process::Id::Id( const char * pid_file_path ) {}
+
+// ===
+
 void G::Process::closeFiles( bool keep_stderr )
 {
 	const int n = SC_OPEN_MAX ;
@@ -92,12 +152,6 @@ void G::Process::closeFiles( bool keep_stderr )
 	}
 }
 
-void G::Process::setUmask( bool )
-{
-	// _umask() is available but not very useful
-	; // no-op
-}
-
 void G::Process::closeStderr()
 {
 	int fd = STDERR_FILENO ;
@@ -115,21 +169,33 @@ bool G::Process::cd( const Path & dir , NoThrow )
 	return 0 == ::_chdir( dir.str().c_str() ) ;
 }
 
-int G::Process::spawn( Identity , const Path & exe , const std::string & arg ,
-	int error_return )
+int G::Process::spawn( Identity , const Path & exe , const Strings & args_ ,
+	std::string * pipe_result_p , int error_return )
 {
 	// open file descriptors are inherited across ::_spawn() --
 	// no fcntl() is available to set close-on-exec -- but see
 	// also ::CreateProcess()
 
-	const char * argv [3U] ;
-	argv[0U] = exe.pathCstr() ;
-	argv[1U] = arg.c_str() ;
-	argv[2U] = NULL ;
+	Strings args( args_ ) ; // non-const copy
+	Pipe pipe( pipe_result_p != NULL ) ;
+	if( pipe_result_p != NULL )
+		args.push_front( Str::fromInt(pipe.fd()) ) ; // kludge -- child must write on specific fd passed as argv[1]
+
+	char ** argv = new char* [ args.size() + 2U ] ;
+	argv[0U] = const_cast<char*>( exe.pathCstr() ) ;
+	unsigned int argc = 1U ;
+	for( Strings::const_iterator arg_p = args.begin() ; arg_p != args.end() ; ++arg_p , argc++ )
+		argv[argc] = const_cast<char*>(arg_p->c_str()) ;
+	argv[argc] = NULL ;
 
 	const int mode = _P_WAIT ;
 	::_flushall() ;
 	int rc = ::_spawnv( mode , exe.str().c_str() , argv ) ;
+	delete [] argv ;
+
+	if( pipe_result_p != NULL )
+		*pipe_result_p = pipe.read() ;
+
 	return rc < 0 ? error_return : rc ;
 }
 
@@ -171,3 +237,19 @@ std::string G::Process::Identity::str() const
 	return "0/0" ;
 }
 
+// ===
+
+G::Process::Umask::Umask( G::Process::Umask::Mode ) :
+	m_imp(0)
+{
+}
+
+G::Process::Umask::~Umask()
+{
+}
+
+void G::Process::Umask::set( G::Process::Umask::Mode )
+{
+	// not implemented
+}
+
diff --git a/src/glib/gregistry.h b/src/glib/gregistry.h
new file mode 100644
index 0000000..bf4fc12
--- /dev/null
+++ b/src/glib/gregistry.h
@@ -0,0 +1,168 @@
+//
+// Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// ===
+//
+// gregistry.h
+//
+
+#ifndef G_REGISTRY_H
+#define G_REGISTRY_H
+
+#include "gdef.h"
+#include "gexception.h"
+#include <string>
+
+namespace G
+{
+	class RegistryKey ;
+	class RegistryKeyImp ;
+	class RegistryValue ;
+}
+
+// Class: G::RegistryKey
+// Description: Used to navigate the system registry. Works with
+// the G::RegistryValue class to get and set values.
+// See also: G::RegistryValue
+//
+class G::RegistryKey
+{
+public:
+	G_EXCEPTION( InvalidHandle , "registry handle error" ) ;
+	G_EXCEPTION( RemoveError , "registry removal error" ) ;
+	G_EXCEPTION( Error , "registry error" ) ;
+	struct NoThrow // Overload discriminator for G::RegistryKey.
+		{} ;
+
+	static RegistryKey currentUser() ;
+		// Returns a key for the current-user "hive".
+
+	static RegistryKey localMachine() ;
+		// Returns a key for the local-machine "hive".
+
+	static RegistryKey classes() ;
+		// Returns a key for the classes-root "hive".
+
+	~RegistryKey() ;
+		// Destructor.
+
+	RegistryKey create( std::string sub_path , bool & created ) const ;
+		// Opens or creates a sub-key.
+
+	RegistryKey create( const std::string & sub_path ) const ;
+		// Opens or creates a sub-key.
+
+	RegistryKey open( const std::string & sub_path ) const ;
+		// Opens an existing sub-key. Throws if non-existant.
+
+	RegistryKey open( const std::string & sub_path , const NoThrow & ) const ;
+		// Opens an existing sub-key. Returns
+		// an invalid key on error (eg. if non-existant).
+
+	bool valid() const ;
+		// Returns true if a valid key.
+		// (Invalid keys are only created
+		// by the NoThrow overload of
+		// open().)
+
+	RegistryKey( const RegistryKey & ) ;
+		// Copy ctor.
+
+	void operator=( const RegistryKey & ) ;
+		// Assignment operator.
+
+	void remove( const std::string & sub_path ) const ;
+		// Removes the named sub-key.
+		// Throws on error.
+
+	void remove( const std::string & sub_path , const NoThrow & ) const ;
+		// Removes the named sub-key.
+		// Ignores errors.
+
+	const RegistryKeyImp & imp() const ;
+		// Used by RegistryValue.
+
+private:
+	typedef RegistryKeyImp Imp ;
+	RegistryKey( const Imp & , bool ) ;
+	void down() ;
+	RegistryKey open( std::string , bool ) const ;
+	void remove( const std::string & , bool ) const ;
+
+private:
+	Imp * m_imp ;
+	bool m_is_root ;
+} ;
+
+// Class: G::RegistryValue
+// Description: Works with G::RegistryKey to get and set
+// registry values.
+// See also: G::RegistryKey
+//
+class G::RegistryValue
+{
+public:
+	G_EXCEPTION( InvalidHandle , "registry handle error" ) ;
+	G_EXCEPTION( ValueError , "registry value error" ) ;
+	G_EXCEPTION( InvalidType , "registry type error" ) ;
+	G_EXCEPTION( MissingValue , "missing registry value" ) ;
+
+	explicit RegistryValue( const RegistryKey & hkey ,
+		const std::string & name = std::string() ) ;
+			// Constructor.
+
+	std::string getString() const ;
+		// Returns a string value. Throws if the value
+		// does not exist, or if it is not a string type.
+
+	std::string getString( const std::string & defolt ) const ;
+		// Returns a string. Returns the supplied default
+		// value if it does not exist.
+
+	bool getBool() const ;
+		// Returns a boolean value. Throws if the value
+		// does not exist.
+
+	g_uint32_t getDword() const ;
+		// Returns an unsigned 32-bit value. Throws if the value
+		// does not exist.
+
+	void set( const std::string & ) ;
+		// Stores a string value.
+
+	void set( const char * ) ;
+		// Stores a string value.
+
+	void set( bool ) ;
+		// Stores a boolean value.
+
+	void set( g_uint32_t ) ;
+		// Stores an unsigned 32-bit value.
+
+private:
+	std::string getString( const std::string & defolt , bool ) const ;
+	std::pair<g_uint32_t,size_t> getInfo() const ;
+	std::string getData( g_uint32_t & type , bool & ) const ;
+	size_t get( char * , size_t ) const ;
+
+private:
+	const RegistryKey & m_hkey ;
+	std::string m_key_name ;
+} ;
+
+#endif
diff --git a/src/glib/gregistry_win32.cpp b/src/glib/gregistry_win32.cpp
new file mode 100644
index 0000000..f0ad4b8
--- /dev/null
+++ b/src/glib/gregistry_win32.cpp
@@ -0,0 +1,347 @@
+//
+// Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// ===
+//
+// gregistry_win32.cpp
+//
+
+#include "gdef.h"
+#include "gregistry.h"
+#include "gstr.h"
+#include "gpath.h"
+#include "gdebug.h"
+#include "gassert.h"
+#include "glog.h"
+#include <sstream>
+
+class G::RegistryKeyImp
+{
+public:
+	HKEY m_key ;
+	unsigned long m_ref_count ;
+	explicit RegistryKeyImp( HKEY k ) : m_key(k) , m_ref_count(1UL) {}
+} ;
+
+// ===
+
+G::RegistryKey::RegistryKey( const Imp & imp , bool is_root ) :
+	m_imp( new Imp(imp) ) ,
+	m_is_root(is_root)
+{
+	m_imp->m_ref_count = 1UL ;
+}
+
+G::RegistryKey::RegistryKey( const RegistryKey & other ) :
+	m_imp( other.m_imp ) ,
+	m_is_root( other.m_is_root )
+{
+	m_imp->m_ref_count++ ;
+}
+
+bool G::RegistryKey::valid() const
+{
+	return m_imp->m_key != 0 ;
+}
+
+void G::RegistryKey::operator=( const RegistryKey & other )
+{
+	down() ;
+	m_imp = other.m_imp ;
+	m_imp->m_ref_count++ ;
+}
+
+const G::RegistryKeyImp & G::RegistryKey::imp() const
+{
+	return *m_imp ;
+}
+
+G::RegistryKey::~RegistryKey()
+{
+	down() ;
+}
+
+void G::RegistryKey::down()
+{
+	m_imp->m_ref_count-- ;
+	if( m_imp->m_ref_count == 0U && !m_is_root && m_imp->m_key != 0 )
+	{
+		G_DEBUG( "G::RegistryKey::down: closing " << m_imp->m_key ) ;
+		::RegCloseKey( m_imp->m_key ) ;
+		delete m_imp ;
+		m_imp = NULL ;
+	}
+}
+
+G::RegistryKey G::RegistryKey::create( const std::string & path ) const
+{
+	bool is_new = false ;
+	return create( path , is_new ) ;
+}
+
+G::RegistryKey G::RegistryKey::create( std::string path , bool & is_new ) const
+{
+	if( !valid() ) throw InvalidHandle() ;
+	G::Str::replaceAll( path , "/" , "\\" ) ;
+
+	is_new = false ;
+	HKEY new_key = 0 ;
+	DWORD disposition = 0 ;
+	LONG rc = ::RegCreateKeyEx( m_imp->m_key , path.c_str() , 0 ,
+		NULL , // ???
+		REG_OPTION_NON_VOLATILE ,
+		KEY_ALL_ACCESS , NULL ,
+		&new_key ,
+		&disposition ) ;
+
+	if( rc != ERROR_SUCCESS )
+	{
+		if( new_key != 0 )
+			::RegCloseKey(new_key) ;
+		G_DEBUG( "G::RegistryKey::create: failed to create \"" << path << "\"" ) ;
+		throw Error( path ) ;
+	}
+	is_new = disposition == REG_CREATED_NEW_KEY ;
+	G_DEBUG( "G::RegistryKey::create: " << new_key << ": \"" << path << "\"" << (is_new?" [created]":"") ) ;
+	return RegistryKey( Imp(new_key) , false ) ;
+}
+
+G::RegistryKey G::RegistryKey::open( const std::string & path , const NoThrow & ) const
+{
+	return open( path , false ) ;
+}
+
+G::RegistryKey G::RegistryKey::open( const std::string & path ) const
+{
+	return open( path , true ) ;
+}
+
+G::RegistryKey G::RegistryKey::open( std::string path , bool do_throw ) const
+{
+	if( !valid() )
+	{
+		if( do_throw )
+			throw InvalidHandle() ;
+		G_DEBUG( "G::RegistryKey::open: failed to open \"" << path << "\"" ) ;
+		return RegistryKey( Imp(0) , false ) ;
+	}
+	else
+	{
+		G::Str::replaceAll( path , "/" , "\\" ) ;
+
+		HKEY new_key = 0 ;
+		LONG rc = ::RegOpenKeyEx( m_imp->m_key , path.c_str() , 0 ,
+			KEY_ALL_ACCESS , &new_key ) ;
+
+		G_ASSERT( (rc == ERROR_SUCCESS) == (new_key != 0) ) ;
+		if( rc == ERROR_SUCCESS )
+		{
+			G_DEBUG( "G::RegistryKey::open: " << new_key << ": \"" << path << "\"" ) ;
+		}
+		else
+		{
+			if( new_key != 0 ) ::RegCloseKey(new_key) ;
+			if( do_throw ) throw Error( path ) ;
+			new_key = 0 ;
+			G_DEBUG( "G::RegistryKey::open: failed to open \"" << path << "\"" ) ;
+		}
+		return RegistryKey( Imp(new_key) , false ) ;
+	}
+}
+
+void G::RegistryKey::remove( const std::string & sub_key , const NoThrow & ) const
+{
+	remove( sub_key , false ) ;
+}
+
+void G::RegistryKey::remove( const std::string & sub_key ) const
+{
+	remove( sub_key , true ) ;
+}
+
+void G::RegistryKey::remove( const std::string & sub_key , bool do_throw ) const
+{
+	if( !valid() )
+	{
+		if( do_throw )
+			throw InvalidHandle() ;
+		G_DEBUG( "G::RegistryKey::remove: failed to remove \"" << sub_key << "\"" ) ;
+	}
+	else
+	{
+		LONG rc = ::RegDeleteKey( m_imp->m_key , sub_key.c_str() ) ;
+		if( rc == ERROR_SUCCESS )
+		{
+			G_DEBUG( "G::RegistryKey::remove: removed \"" << sub_key << "\"" ) ;
+		}
+		else
+		{
+			if( do_throw )
+				throw RemoveError( sub_key ) ;
+			G_DEBUG( "G::RegistryKey::remove: failed to remove \"" << sub_key << "\"" ) ;
+		}
+	}
+}
+
+G::RegistryKey G::RegistryKey::currentUser()
+{
+	return RegistryKey( Imp(HKEY_CURRENT_USER) , true ) ;
+}
+
+G::RegistryKey G::RegistryKey::localMachine()
+{
+	return RegistryKey( Imp(HKEY_LOCAL_MACHINE) , true ) ;
+}
+
+G::RegistryKey G::RegistryKey::classes()
+{
+	return RegistryKey( Imp(HKEY_CLASSES_ROOT) , true ) ;
+}
+
+// ===
+
+G::RegistryValue::RegistryValue( const RegistryKey & hkey ,
+	const std::string & key_name ) :
+		m_hkey(hkey) ,
+		m_key_name(key_name)
+{
+	if( ! hkey.valid() )
+		throw InvalidHandle( key_name ) ;
+}
+
+std::string G::RegistryValue::getString( const std::string & defolt ) const
+{
+	return getString( defolt , false ) ;
+}
+
+std::string G::RegistryValue::getString() const
+{
+	return getString( std::string() , true ) ;
+}
+
+std::string G::RegistryValue::getString( const std::string & defolt ,
+	bool do_throw ) const
+{
+	DWORD type = 0 ;
+	bool exists = true ;
+	std::string result = getData( type , exists ) ;
+	if( !exists && do_throw )
+	{
+		throw MissingValue( m_key_name ) ;
+	}
+	else if( !exists )
+	{
+		return defolt ;
+	}
+	else if( type != REG_SZ && type != REG_EXPAND_SZ )
+	{
+		throw InvalidType( m_key_name ) ;
+	}
+	else
+	{
+		G::Str::trimRight( result , std::string(1U,'\0') ) ;
+		return result ;
+	}
+}
+
+std::string G::RegistryValue::getData( g_uint32_t & type , bool & exists ) const
+{
+	exists = true ;
+	std::pair<DWORD,size_t> info = getInfo() ;
+	if( info.second == 0U )
+	{
+		exists = false ;
+		return std::string() ;
+	}
+
+	type = info.first ;
+	size_t buffer_size = info.second + 1U ;
+	char * buffer = new char [buffer_size] ;
+
+	try
+	{
+		buffer_size = get( buffer , buffer_size ) ;
+	}
+	catch(...)
+	{
+		delete [] buffer ;
+		throw ;
+	}
+
+	std::string result( buffer , buffer_size ) ;
+	delete [] buffer ;
+	return result ;
+}
+
+size_t G::RegistryValue::get( char * buffer , size_t buffer_size ) const
+{
+	DWORD type = 0 ;
+	unsigned long size = buffer_size ;
+	LONG rc = ::RegQueryValueEx( m_hkey.imp().m_key , m_key_name.c_str() , 0 ,
+		&type , reinterpret_cast<unsigned char*>(buffer) , &size ) ;
+
+	if( rc != ERROR_SUCCESS )
+	{
+		std::ostringstream ss ;
+		ss << "get: RegQueryValueEx(" << m_key_name << "): " << rc ;
+		throw ValueError( ss.str() ) ;
+	}
+
+	return static_cast<size_t>(size) ;
+}
+
+std::pair<g_uint32_t,size_t> G::RegistryValue::getInfo() const
+{
+	std::pair<DWORD,size_t> result( 0 , 0 ) ;
+
+	unsigned long size = 0 ;
+	LONG rc = ::RegQueryValueEx( m_hkey.imp().m_key , m_key_name.c_str() , 0 ,
+		&result.first , NULL , &size ) ;
+
+	if( rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND )
+	{
+		std::ostringstream ss ;
+		ss << "RegQueryValueEx(\"" << m_key_name << "\"): " << rc ;
+		throw ValueError( ss.str() ) ;
+	}
+
+	if( rc == ERROR_FILE_NOT_FOUND )
+		size = 0 ; // just in case
+
+	result.second = static_cast<size_t>(size) ;
+	return result ;
+}
+
+void G::RegistryValue::set( const char * p )
+{
+	set( std::string(p?p:"") ) ;
+}
+
+void G::RegistryValue::set( const std::string & s )
+{
+	DWORD type = REG_SZ ;
+
+	LONG rc = ::RegSetValueEx( m_hkey.imp().m_key , m_key_name.c_str() , 0 ,
+		type , reinterpret_cast<const BYTE*>(s.c_str()) ,
+		s.length() + 1U ) ;
+
+	if( rc != ERROR_SUCCESS )
+		throw ValueError( "RegSetValueEx" ) ;
+}
+
+
diff --git a/src/glib/groot.h b/src/glib/groot.h
index 3bd60f0..c34a9a8 100644
--- a/src/glib/groot.h
+++ b/src/glib/groot.h
@@ -31,7 +31,7 @@
 namespace G
 {
 	class Root ;
-} ;
+}
 
 // Class: G::Root
 // Description: A class which aquires special privileges.
diff --git a/src/gnet/gevent_win32.cpp b/src/glib/gsetter.h
similarity index 61%
rename from src/gnet/gevent_win32.cpp
rename to src/glib/gsetter.h
index 5e53b36..e0bf45b 100644
--- a/src/gnet/gevent_win32.cpp
+++ b/src/glib/gsetter.h
@@ -18,16 +18,49 @@
 //
 // ===
 //
-// gevent_win32.cpp
+// gsetter.h
 //
 
-#include "gdef.h"
-#include "gnet.h"
-#include "geventloop.h"
-#include "gwinsock.h"
+#ifndef G_SETTER_H
+#define G_SETTER_H
 
-GNet::EventLoop * GNet::EventLoop::create()
+#include "gdef.h"
+#include "gnoncopyable.h"
+
+namespace G
 {
-	return new Winsock ;
+	class Setter ;
 }
 
+// Class: G::Setter
+// Description: A class to Manage a boolean flag
+// while in scope.
+//
+class G::Setter : public G:: noncopyable
+{
+public:
+	explicit Setter( bool & b ) ;
+		// Constructor. Sets the flag.
+
+	~Setter() ;
+		// Destructor. Resets the flag.
+
+private:
+	bool & m_b ;
+} ;
+
+inline
+G::Setter::Setter( bool & b ) :
+	m_b(b)
+{
+	m_b = true ;
+}
+
+inline
+G::Setter::~Setter()
+{
+	m_b = false ;
+}
+
+#endif
+
diff --git a/src/glib/gstatemachine.h b/src/glib/gstatemachine.h
index 9666795..9d4f710 100644
--- a/src/glib/gstatemachine.h
+++ b/src/glib/gstatemachine.h
@@ -143,7 +143,7 @@ public:
 		// Sets the current state. Returns the old state.
 
 private:
-	struct Transition
+	struct Transition // A private structure used by G::StateMachine<>.
 	{
 		State from ;
 		State to ;
@@ -216,7 +216,7 @@ State StateMachine<T,State,Event,Arg>::apply( T & t , Event event , const Arg &
 	// look up in the multimap keyed on current-state + event
 	//
 	State state = m_state ;
-	Map::iterator p = m_map.find(event) ;
+	typename Map::iterator p = m_map.find(event) ;
 	for( ; p != m_map.end() && (*p).first == event ; ++p )
 	{
 		if( (*p).second.from == m_any || (*p).second.from == m_state )
@@ -248,7 +248,7 @@ State StateMachine<T,State,Event,Arg>::apply( T & t , Event event , const Arg &
 	return m_any ;
 }
 
-} ; // namespace
+} // namespace
 
 #endif
 
diff --git a/src/glib/gstr.cpp b/src/glib/gstr.cpp
index cbd90e4..e7ee1d7 100644
--- a/src/glib/gstr.cpp
+++ b/src/glib/gstr.cpp
@@ -30,7 +30,6 @@
 #include <climits>
 #include <string>
 #include <sstream>
-#include <xlocale>
 
 bool G::Str::replace( std::string &s , const std::string &from ,
 	const std::string &to , size_t *pos_p )
@@ -214,16 +213,23 @@ unsigned short G::Str::toUShort( const std::string &s , bool limited )
 	return ushort_val ;
 }
 
+std::string G::Str::fromInt( int i )
+{
+	std::ostringstream ss ;
+	ss << i ;
+	return ss.str() ;
+}
+
 std::string G::Str::fromUInt( unsigned int n )
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << n ;
 	return ss.str() ;
 }
 
 std::string G::Str::fromULong( unsigned long ul )
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << ul ;
 	return ss.str() ;
 }
@@ -236,6 +242,13 @@ void G::Str::toLower( std::string &s )
 	}
 }
 
+std::string G::Str::lower( const std::string &s )
+{
+	std::string result = s ;
+	toLower( result ) ;
+	return result ;
+}
+
 void G::Str::toUpper( std::string &s )
 {
 	for( std::string::iterator p = s.begin() ; p != s.end() ; ++p )
@@ -244,6 +257,13 @@ void G::Str::toUpper( std::string &s )
 	}
 }
 
+std::string G::Str::upper( const std::string &s )
+{
+	std::string result = s ;
+	toUpper( result ) ;
+	return result ;
+}
+
 std::string G::Str::toPrintableAscii( char c , char escape )
 {
 	if( c == escape )
@@ -334,7 +354,7 @@ std::string G::Str::wrap( std::string text , const std::string & prefix_1 ,
 	const std::string & prefix_2 , size_t width )
 {
 	std::string ws( " \t\n" ) ;
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	for( bool first_line = true ; text.length() ; first_line = false )
 	{
 		const size_t prefix_length =
diff --git a/src/glib/gstr.h b/src/glib/gstr.h
index 70df2d1..99111c0 100644
--- a/src/glib/gstr.h
+++ b/src/glib/gstr.h
@@ -119,6 +119,9 @@ public:
 		// Exception: Overflow
 		// Exception: InvalidFormat
 
+	static std::string fromInt( int i ) ;
+		// Converts int 'i' to a string.
+
 	static std::string fromUInt( unsigned int ) ;
 		// Converts from unsigned int to a decimal string.
 
@@ -133,6 +136,14 @@ public:
 		// Replaces all uppercase characters in string 's' by
 		// lowercase characters.
 		
+	static std::string upper( const std::string &s ) ;
+		// Returns a copy of 's' in which all lowercase characters
+		// have been replaced by uppercase characters.
+		
+	static std::string lower( const std::string &s ) ;
+		// Returns a copy of 's' in which all uppercase characters
+		// have been replaced by lowercase characters.
+
 	static std::string toPrintableAscii( char c , char escape = '\\' ) ;
 		// Returns a printable, 7-bit-ascii string representing the given
 		// character. Typical return values include "\\", "\n",
diff --git a/src/glib/gstrings.h b/src/glib/gstrings.h
index 04d73cd..f3434b7 100644
--- a/src/glib/gstrings.h
+++ b/src/glib/gstrings.h
@@ -36,7 +36,7 @@ namespace G
 //
 typedef std::list<std::string GAllocator(std::string) > Strings ;
 
-} ;
+}
 
 #endif
 
diff --git a/src/glib/gtime.cpp b/src/glib/gtime.cpp
index 679f4a3..d7ef490 100644
--- a/src/glib/gtime.cpp
+++ b/src/glib/gtime.cpp
@@ -83,7 +83,7 @@ unsigned int G::Time::seconds() const
 std::string G::Time::hhmmss( const char * sep )
 {
 	if( sep == NULL ) sep = "" ;
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << (m_hh/10U) << (m_hh%10U) << sep << (m_mm/10U) << (m_mm%10U) << sep << (m_ss/10U) << (m_ss%10U) ;
 	return ss.str() ;
 }
@@ -91,7 +91,7 @@ std::string G::Time::hhmmss( const char * sep )
 std::string G::Time::hhmm( const char * sep )
 {
 	if( sep == NULL ) sep = "" ;
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << (m_hh/10U) << (m_hh%10U) << sep << (m_mm/10U) << (m_mm%10U) ;
 	return ss.str() ;
 }
diff --git a/src/glib/gtime.h b/src/glib/gtime.h
index 7fc2511..f6503a8 100644
--- a/src/glib/gtime.h
+++ b/src/glib/gtime.h
@@ -32,7 +32,7 @@
 namespace G
 {
 	class Time ;
-} ;
+}
 
 // Class: G::Time
 // Description: A simple time-of-day (hh/mm/ss) class.
diff --git a/src/gnet/Makefile.am b/src/gnet/Makefile.am
index 1417962..c33d302 100644
--- a/src/gnet/Makefile.am
+++ b/src/gnet/Makefile.am
@@ -17,15 +17,15 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 
-EXTRA_DIST=gclient_win32.cpp \
+EXTRA_DIST=\
+	gclient_win32.cpp \
 	gdescriptor_win32.cpp \
-	gevent_win32.cpp \
+	geventloop_win32.cpp \
 	glocal_win32.cpp \
 	grequest.cpp \
 	gresolve_win32.cpp \
-	gsocket_win32.cpp \
-	gwinsock.cpp
-INCLUDES = -I$(top_srcdir)/lib/gcc2.95 -I$(top_srcdir)/src/glib 
+	gsocket_win32.cpp
+INCLUDES = -I$(top_srcdir)/lib/$(COMPILER_VERSION) -I$(top_srcdir)/src/glib 
 noinst_LIBRARIES = libgnet.a
 libgnet_a_SOURCES = gaddress_ipv4.cpp \
 	gclient.cpp \
@@ -33,8 +33,8 @@ libgnet_a_SOURCES = gaddress_ipv4.cpp \
 	gconnection.cpp \
 	gdescriptor_unix.cpp \
 	geventloop.cpp \
+	geventloop_unix.cpp \
 	geventhandler.cpp \
-	gevent_unix.cpp \
 	geventserver.cpp \
 	glinebuffer.cpp \
 	glocal_unix.cpp \
@@ -43,7 +43,6 @@ libgnet_a_SOURCES = gaddress_ipv4.cpp \
 	gresolve.cpp \
 	gresolve_ipv4.cpp \
 	gresolve_unix.cpp \
-	gselect.cpp \
 	gserver.cpp \
 	gsocket.cpp \
 	gsocket_unix.cpp \
@@ -62,8 +61,6 @@ libgnet_a_SOURCES = gaddress_ipv4.cpp \
 	gnet.h \
 	grequest.h \
 	gresolve.h \
-	gselect.h \
 	gserver.h \
 	gsocket.h \
-	gtimer.h \
-	gwinsock.h
+	gtimer.h
diff --git a/src/gnet/Makefile.in b/src/gnet/Makefile.in
index 9d98939..c9c6f01 100644
--- a/src/gnet/Makefile.in
+++ b/src/gnet/Makefile.in
@@ -79,6 +79,7 @@ POST_UNINSTALL = :
 AR = @AR@
 AWK = @AWK@
 CC = @CC@
+COMPILER_VERSION = @COMPILER_VERSION@
 CXX = @CXX@
 GZIP = @GZIP@
 HAVE_DOXYGEN = @HAVE_DOXYGEN@
@@ -96,11 +97,11 @@ e_man1dir = @e_man1dir@
 e_sbindir = @e_sbindir@
 e_spooldir = @e_spooldir@
 
-EXTRA_DIST = gclient_win32.cpp 	gdescriptor_win32.cpp 	gevent_win32.cpp 	glocal_win32.cpp 	grequest.cpp 	gresolve_win32.cpp 	gsocket_win32.cpp 	gwinsock.cpp
+EXTRA_DIST =  	gclient_win32.cpp 	gdescriptor_win32.cpp 	geventloop_win32.cpp 	glocal_win32.cpp 	grequest.cpp 	gresolve_win32.cpp 	gsocket_win32.cpp
 
-INCLUDES = -I$(top_srcdir)/lib/gcc2.95 -I$(top_srcdir)/src/glib 
+INCLUDES = -I$(top_srcdir)/lib/$(COMPILER_VERSION) -I$(top_srcdir)/src/glib 
 noinst_LIBRARIES = libgnet.a
-libgnet_a_SOURCES = gaddress_ipv4.cpp 	gclient.cpp 	gclient_unix.cpp 	gconnection.cpp 	gdescriptor_unix.cpp 	geventloop.cpp 	geventhandler.cpp 	gevent_unix.cpp 	geventserver.cpp 	glinebuffer.cpp 	glocal_unix.cpp 	glocal.cpp 	gmonitor.cpp 	gresolve.cpp 	gresolve_ipv4.cpp 	gresolve_unix.cpp 	gselect.cpp 	gserver.cpp 	gsocket.cpp 	gsocket_unix.cpp 	gtimer.cpp 	gaddress.h 	gclient.h 	gconnection.h 	gdescriptor.h 	gevent.h 	geventloop.h 	geventhandler.h 	geventserver.h 	glinebuffer.h 	glocal.h 	gmonitor.h 	gnet.h 	grequest.h 	gresolve.h 	gselect.h 	gserver.h 	gsocket.h 	gtimer.h 	gwinsock.h
+libgnet_a_SOURCES = gaddress_ipv4.cpp 	gclient.cpp 	gclient_unix.cpp 	gconnection.cpp 	gdescriptor_unix.cpp 	geventloop.cpp 	geventloop_unix.cpp 	geventhandler.cpp 	geventserver.cpp 	glinebuffer.cpp 	glocal_unix.cpp 	glocal.cpp 	gmonitor.cpp 	gresolve.cpp 	gresolve_ipv4.cpp 	gresolve_unix.cpp 	gserver.cpp 	gsocket.cpp 	gsocket_unix.cpp 	gtimer.cpp 	gaddress.h 	gclient.h 	gconnection.h 	gdescriptor.h 	gevent.h 	geventloop.h 	geventhandler.h 	geventserver.h 	glinebuffer.h 	glocal.h 	gmonitor.h 	gnet.h 	grequest.h 	gresolve.h 	gserver.h 	gsocket.h 	gtimer.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
@@ -114,10 +115,10 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libgnet_a_LIBADD = 
 libgnet_a_OBJECTS =  gaddress_ipv4.o gclient.o gclient_unix.o \
-gconnection.o gdescriptor_unix.o geventloop.o geventhandler.o \
-gevent_unix.o geventserver.o glinebuffer.o glocal_unix.o glocal.o \
-gmonitor.o gresolve.o gresolve_ipv4.o gresolve_unix.o gselect.o \
-gserver.o gsocket.o gsocket_unix.o gtimer.o
+gconnection.o gdescriptor_unix.o geventloop.o geventloop_unix.o \
+geventhandler.o geventserver.o glinebuffer.o glocal_unix.o glocal.o \
+gmonitor.o gresolve.o gresolve_ipv4.o gresolve_unix.o gserver.o \
+gsocket.o gsocket_unix.o gtimer.o
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@@ -228,160 +229,139 @@ distdir: $(DISTFILES)
 	done
 gaddress_ipv4.o: gaddress_ipv4.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	gaddress.h ../../src/glib/gexception.h \
-	../../src/glib/gconvert.h ../../src/glib/gstrings.h \
-	../../src/glib/gstr.h ../../src/glib/gassert.h \
-	../../src/glib/glogoutput.h ../../src/glib/glog.h \
-	../../src/glib/gdebug.h
+	../../lib/gcc2.95/limits gnet.h gaddress.h \
+	../../src/glib/gexception.h ../../src/glib/gconvert.h \
+	../../src/glib/gstrings.h ../../src/glib/gstr.h \
+	../../src/glib/gassert.h ../../src/glib/glogoutput.h \
+	../../src/glib/glog.h ../../src/glib/gdebug.h
 gclient.o: gclient.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	gaddress.h ../../src/glib/gexception.h gsocket.h gevent.h \
-	geventloop.h geventhandler.h ../../src/glib/gcredentials.h \
-	../../src/glib/gdatetime.h gdescriptor.h gresolve.h \
-	../../src/glib/groot.h ../../src/glib/gprocess.h \
+	../../lib/gcc2.95/limits gnet.h gaddress.h \
+	../../src/glib/gexception.h gsocket.h gevent.h geventloop.h \
+	geventhandler.h ../../src/glib/gdatetime.h gdescriptor.h \
+	gresolve.h ../../src/glib/groot.h ../../src/glib/gprocess.h \
 	../../src/glib/gpath.h ../../src/glib/gstrings.h \
 	../../src/glib/gnoncopyable.h gmonitor.h gclient.h \
-	gconnection.h gserver.h gselect.h ../../src/glib/gdebug.h \
+	gconnection.h gserver.h ../../src/glib/gdebug.h \
 	../../src/glib/glogoutput.h ../../src/glib/glog.h \
 	../../src/glib/gassert.h
 gclient_unix.o: gclient_unix.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	gclient.h gaddress.h ../../src/glib/gexception.h gconnection.h \
-	gsocket.h gevent.h geventloop.h geventhandler.h \
-	../../src/glib/gcredentials.h ../../src/glib/gdatetime.h \
+	../../lib/gcc2.95/limits gnet.h gclient.h gaddress.h \
+	../../src/glib/gexception.h gconnection.h gsocket.h gevent.h \
+	geventloop.h geventhandler.h ../../src/glib/gdatetime.h \
 	gdescriptor.h
 gconnection.o: gconnection.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	gconnection.h gaddress.h ../../src/glib/gexception.h
+	../../lib/gcc2.95/limits gnet.h gconnection.h gaddress.h \
+	../../src/glib/gexception.h
 gdescriptor_unix.o: gdescriptor_unix.cpp ../../src/glib/gdef.h \
 	../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gnet.h gdescriptor.h
-gevent_unix.o: gevent_unix.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	geventloop.h geventhandler.h ../../src/glib/gcredentials.h \
-	../../src/glib/gdatetime.h ../../src/glib/gexception.h \
-	gdescriptor.h gselect.h gevent.h
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gnet.h \
+	gdescriptor.h
 geventhandler.o: geventhandler.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	geventhandler.h ../../src/glib/gcredentials.h \
+	../../lib/gcc2.95/limits gnet.h geventhandler.h \
 	../../src/glib/gdatetime.h ../../src/glib/gexception.h \
 	gdescriptor.h geventloop.h ../../src/glib/gdebug.h \
 	../../src/glib/glogoutput.h ../../src/glib/glog.h \
 	../../src/glib/gassert.h
 geventloop.o: geventloop.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	geventloop.h geventhandler.h ../../src/glib/gcredentials.h \
+	../../lib/gcc2.95/limits gnet.h geventloop.h geventhandler.h \
 	../../src/glib/gdatetime.h ../../src/glib/gexception.h \
 	gdescriptor.h ../../src/glib/gdebug.h \
 	../../src/glib/glogoutput.h ../../src/glib/glog.h \
 	../../src/glib/gassert.h
+geventloop_unix.o: geventloop_unix.cpp ../../src/glib/gdef.h \
+	../../config.h ../../lib/gcc2.95/iostream \
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gnet.h \
+	../../src/glib/gnoncopyable.h gevent.h geventloop.h \
+	geventhandler.h ../../src/glib/gdatetime.h \
+	../../src/glib/gexception.h gdescriptor.h ../../src/glib/gstr.h \
+	../../src/glib/gstrings.h ../../src/glib/gsetter.h gtimer.h \
+	../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
+	../../src/glib/glog.h ../../src/glib/gassert.h
 geventserver.o: geventserver.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	geventserver.h gserver.h gsocket.h gaddress.h \
-	../../src/glib/gexception.h gevent.h geventloop.h \
-	geventhandler.h ../../src/glib/gcredentials.h \
-	../../src/glib/gdatetime.h gdescriptor.h gconnection.h \
-	gselect.h ../../src/glib/glog.h
+	../../lib/gcc2.95/limits gnet.h geventserver.h gserver.h \
+	gsocket.h gaddress.h ../../src/glib/gexception.h gevent.h \
+	geventloop.h geventhandler.h ../../src/glib/gdatetime.h \
+	gdescriptor.h gconnection.h ../../src/glib/glog.h
 glinebuffer.o: glinebuffer.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	glinebuffer.h ../../src/glib/gstrings.h ../../src/glib/gdebug.h \
+	../../lib/gcc2.95/limits gnet.h glinebuffer.h \
+	../../src/glib/gstrings.h ../../src/glib/gdebug.h \
 	../../src/glib/glogoutput.h ../../src/glib/glog.h \
 	../../src/glib/gassert.h
 glocal.o: glocal.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits glocal.h \
-	gnet.h gaddress.h ../../src/glib/gexception.h \
-	../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
-	../../src/glib/glog.h ../../src/glib/gassert.h
+	../../lib/gcc2.95/limits glocal.h gnet.h gaddress.h \
+	../../src/glib/gexception.h ../../src/glib/gdebug.h \
+	../../src/glib/glogoutput.h ../../src/glib/glog.h \
+	../../src/glib/gassert.h
 glocal_unix.o: glocal_unix.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits glocal.h \
-	gnet.h gaddress.h ../../src/glib/gexception.h gresolve.h \
-	../../src/glib/glog.h
+	../../lib/gcc2.95/limits glocal.h gnet.h gaddress.h \
+	../../src/glib/gexception.h gresolve.h ../../src/glib/glog.h
 gmonitor.o: gmonitor.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	gmonitor.h gclient.h gaddress.h ../../src/glib/gexception.h \
-	gconnection.h gsocket.h gevent.h geventloop.h geventhandler.h \
-	../../src/glib/gcredentials.h ../../src/glib/gdatetime.h \
-	gdescriptor.h gserver.h gselect.h ../../src/glib/gassert.h \
+	../../lib/gcc2.95/limits gnet.h gmonitor.h \
+	../../src/glib/gnoncopyable.h gclient.h gaddress.h \
+	../../src/glib/gexception.h gconnection.h gsocket.h gevent.h \
+	geventloop.h geventhandler.h ../../src/glib/gdatetime.h \
+	gdescriptor.h gserver.h ../../src/glib/gassert.h \
 	../../src/glib/glogoutput.h ../../src/glib/glog.h
 gresolve.o: gresolve.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gresolve.h \
-	gnet.h gaddress.h ../../src/glib/gexception.h gsocket.h \
-	gevent.h geventloop.h geventhandler.h \
-	../../src/glib/gcredentials.h ../../src/glib/gdatetime.h \
-	gdescriptor.h ../../src/glib/gstr.h ../../src/glib/gstrings.h \
+	../../lib/gcc2.95/limits gresolve.h gnet.h gaddress.h \
+	../../src/glib/gexception.h gsocket.h gevent.h geventloop.h \
+	geventhandler.h ../../src/glib/gdatetime.h gdescriptor.h \
+	../../src/glib/gstr.h ../../src/glib/gstrings.h \
 	../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
 	../../src/glib/glog.h ../../src/glib/gassert.h
 gresolve_ipv4.o: gresolve_ipv4.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gresolve.h \
-	gnet.h gaddress.h ../../src/glib/gexception.h
+	../../lib/gcc2.95/limits gresolve.h gnet.h gaddress.h \
+	../../src/glib/gexception.h
 gresolve_unix.o: gresolve_unix.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gresolve.h \
-	gnet.h gaddress.h ../../src/glib/gexception.h gsocket.h \
-	gevent.h geventloop.h geventhandler.h \
-	../../src/glib/gcredentials.h ../../src/glib/gdatetime.h \
-	gdescriptor.h ../../src/glib/gstr.h ../../src/glib/gstrings.h \
+	../../lib/gcc2.95/limits gresolve.h gnet.h gaddress.h \
+	../../src/glib/gexception.h gsocket.h gevent.h geventloop.h \
+	geventhandler.h ../../src/glib/gdatetime.h gdescriptor.h \
+	../../src/glib/gstr.h ../../src/glib/gstrings.h \
 	../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
 	../../src/glib/glog.h ../../src/glib/gassert.h
-gselect.o: gselect.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gselect.h \
-	gnet.h gevent.h geventloop.h geventhandler.h \
-	../../src/glib/gcredentials.h ../../src/glib/gdatetime.h \
-	../../src/glib/gexception.h gdescriptor.h ../../src/glib/gstr.h \
-	../../src/glib/gstrings.h gtimer.h ../../src/glib/gdebug.h \
-	../../src/glib/glogoutput.h ../../src/glib/glog.h \
-	../../src/glib/gassert.h
 gserver.o: gserver.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	gserver.h gsocket.h gaddress.h ../../src/glib/gexception.h \
-	gevent.h geventloop.h geventhandler.h \
-	../../src/glib/gcredentials.h ../../src/glib/gdatetime.h \
-	gdescriptor.h gconnection.h gselect.h ../../src/glib/groot.h \
-	../../src/glib/gprocess.h ../../src/glib/gpath.h \
-	../../src/glib/gstrings.h ../../src/glib/gnoncopyable.h \
-	gmonitor.h gclient.h ../../src/glib/gdebug.h \
-	../../src/glib/glogoutput.h ../../src/glib/glog.h \
-	../../src/glib/gassert.h ../../src/glib/gmemory.h
+	../../lib/gcc2.95/limits gnet.h gserver.h gsocket.h gaddress.h \
+	../../src/glib/gexception.h gevent.h geventloop.h \
+	geventhandler.h ../../src/glib/gdatetime.h gdescriptor.h \
+	gconnection.h ../../src/glib/groot.h ../../src/glib/gprocess.h \
+	../../src/glib/gpath.h ../../src/glib/gstrings.h \
+	../../src/glib/gnoncopyable.h gmonitor.h gclient.h \
+	../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
+	../../src/glib/glog.h ../../src/glib/gassert.h \
+	../../src/glib/gmemory.h
 gsocket.o: gsocket.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	../../src/glib/gassert.h ../../src/glib/glogoutput.h \
-	../../src/glib/glog.h gsocket.h gaddress.h \
-	../../src/glib/gexception.h gevent.h geventloop.h \
-	geventhandler.h ../../src/glib/gcredentials.h \
-	../../src/glib/gdatetime.h gdescriptor.h \
+	../../lib/gcc2.95/limits gnet.h ../../src/glib/gassert.h \
+	../../src/glib/glogoutput.h ../../src/glib/glog.h gsocket.h \
+	gaddress.h ../../src/glib/gexception.h gevent.h geventloop.h \
+	geventhandler.h ../../src/glib/gdatetime.h gdescriptor.h \
 	../../src/glib/gmemory.h ../../src/glib/gdebug.h
 gsocket_unix.o: gsocket_unix.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
-	gsocket.h gaddress.h ../../src/glib/gexception.h gevent.h \
-	geventloop.h geventhandler.h ../../src/glib/gcredentials.h \
-	../../src/glib/gdatetime.h gdescriptor.h \
+	../../lib/gcc2.95/limits gnet.h gsocket.h gaddress.h \
+	../../src/glib/gexception.h gevent.h geventloop.h \
+	geventhandler.h ../../src/glib/gdatetime.h gdescriptor.h \
 	../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
 	../../src/glib/glog.h ../../src/glib/gassert.h
 gtimer.o: gtimer.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gtimer.h \
-	gnet.h ../../src/glib/gdatetime.h ../../src/glib/gexception.h \
-	gevent.h geventloop.h geventhandler.h \
-	../../src/glib/gcredentials.h gdescriptor.h \
+	../../lib/gcc2.95/limits gtimer.h gnet.h \
+	../../src/glib/gdatetime.h ../../src/glib/gexception.h gevent.h \
+	geventloop.h geventhandler.h gdescriptor.h \
 	../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
 	../../src/glib/glog.h ../../src/glib/gassert.h
 
diff --git a/src/gnet/gaddress.h b/src/gnet/gaddress.h
index 6b70c38..0b107d9 100644
--- a/src/gnet/gaddress.h
+++ b/src/gnet/gaddress.h
@@ -34,7 +34,7 @@ namespace GNet
 {
 	class Address ;
 	class AddressImp ;
-} ;
+}
 
 // Class: GNet::Address
 //
@@ -100,6 +100,12 @@ public:
 		//
 		// See also validString().
 
+	Address( const std::string & host_or_ip , unsigned int port ) ;
+		// Constructor taking a host-name/ip-address and
+		// a port number.
+		//
+		// Throws an exception if an invalid string.
+
 	~Address() ;
 		// Destructor.
 
diff --git a/src/gnet/gaddress_ipv4.cpp b/src/gnet/gaddress_ipv4.cpp
index 8e5c0cf..93017ca 100644
--- a/src/gnet/gaddress_ipv4.cpp
+++ b/src/gnet/gaddress_ipv4.cpp
@@ -43,6 +43,7 @@ public:
 	explicit AddressImp( unsigned int port ) ; // (not in_port_t -- see validPort(), setPort() etc)
 	explicit AddressImp( const servent & s ) ;
 	explicit AddressImp( const std::string & s ) ;
+	AddressImp( const std::string & s , unsigned int port ) ;
 	AddressImp( unsigned int port , Address::Localhost ) ;
 	AddressImp( const hostent & h , unsigned int port ) ;
 	AddressImp( const hostent & h , const servent & s ) ;
@@ -79,6 +80,8 @@ private:
 	static char m_port_separator ;
 } ;
 
+// ===
+
 char GNet::AddressImp::m_port_separator = ':' ;
 
 void GNet::AddressImp::init()
@@ -141,12 +144,24 @@ GNet::AddressImp::AddressImp( const AddressImp & other )
 	m_inet = other.m_inet ;
 }
 
+GNet::AddressImp::AddressImp( const std::string & s , unsigned int port )
+{
+	init() ;
+
+	std::string reason ;
+	if( ! setAddress( s + m_port_separator + "0" , reason ) )
+		throw Address::BadString( reason + ": " + s ) ;
+
+	setPort( port ) ;
+}
+
 GNet::AddressImp::AddressImp( const std::string & s )
 {
 	init() ;
+
 	std::string reason ;
 	if( ! setAddress( s , reason ) )
-		throw Address::BadString( s ) ;
+		throw Address::BadString( reason + ": " + s ) ;
 }
 
 bool GNet::AddressImp::setAddress( const std::string & display_string , std::string & reason )
@@ -187,7 +202,7 @@ void GNet::AddressImp::setHost( const hostent & h )
 
 std::string GNet::AddressImp::displayString() const
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << hostString() ;
 	ss << m_port_separator << port() ;
 	return ss.str() ;
@@ -195,7 +210,7 @@ std::string GNet::AddressImp::displayString() const
 
 std::string GNet::AddressImp::hostString() const
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << ::inet_ntoa(m_inet.sin_addr) ;
 	return ss.str() ;
 }
@@ -347,7 +362,7 @@ GNet::Address::Address( const servent & s ) :
 {
 }
 
-GNet::Address::Address( const sockaddr *addr , int len ) :
+GNet::Address::Address( const sockaddr * addr , int len ) :
 	m_imp( new AddressImp(addr,len) )
 {
 }
@@ -362,6 +377,11 @@ GNet::Address::Address( const std::string & s ) :
 {
 }
 
+GNet::Address::Address( const std::string & s , unsigned int port ) :
+	m_imp( new AddressImp(s,port) )
+{
+}
+
 GNet::Address::~Address()
 {
 	delete m_imp ;
diff --git a/src/gnet/gclient.cpp b/src/gnet/gclient.cpp
index cffd257..8f7ae12 100644
--- a/src/gnet/gclient.cpp
+++ b/src/gnet/gclient.cpp
@@ -39,12 +39,12 @@ namespace
 	const int c_retries = 10 ; // number of retries when using a priviledged local port number
 	const int c_port_start = 512 ;
 	const int c_port_end = 1024 ;
-} ;
+}
 
 namespace GNet
 {
 	class ClientResolver ;
-} ;
+}
 
 // Class: GNet::ClientResolver
 // Description: A resolver class which calls ClientImp::resolveCon() when done.
diff --git a/src/gnet/gclient.h b/src/gnet/gclient.h
index bbb19a8..55fc257 100644
--- a/src/gnet/gclient.h
+++ b/src/gnet/gclient.h
@@ -36,7 +36,7 @@ namespace GNet
 {
 	class Client ;
 	class ClientImp ;
-} ;
+}
 
 // Class: GNet::Client
 // Description: An application-level class for making an outgoing connection
diff --git a/src/gnet/gconnection.h b/src/gnet/gconnection.h
index 9738928..5b37a18 100644
--- a/src/gnet/gconnection.h
+++ b/src/gnet/gconnection.h
@@ -31,7 +31,7 @@
 namespace GNet
 {
 	class Connection ;
-} ;
+}
 
 // Class: GNet::Connection
 // Description: An interface which provides address information
diff --git a/src/gnet/gdescriptor.h b/src/gnet/gdescriptor.h
index d700a30..1500f31 100644
--- a/src/gnet/gdescriptor.h
+++ b/src/gnet/gdescriptor.h
@@ -36,7 +36,7 @@ namespace GNet
 
 	Descriptor Descriptor__invalid() ;
 		// Returns an invalid network descriptor.
-} ;
+}
 
 #endif
 
diff --git a/src/gnet/geventhandler.cpp b/src/gnet/geventhandler.cpp
index 2d571ca..a1abbb9 100644
--- a/src/gnet/geventhandler.cpp
+++ b/src/gnet/geventhandler.cpp
@@ -81,7 +81,7 @@ std::string GNet::EventHandlerList::asString() const
 
 std::string GNet::EventHandlerList::asString( const EventHandlerListImp & list ) const
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	const char * sep = "" ;
 	for( List::const_iterator p = list.begin() ; p != list.end() ; ++p )
 	{
diff --git a/src/gnet/geventhandler.h b/src/gnet/geventhandler.h
index 03b86e4..6f6ed80 100644
--- a/src/gnet/geventhandler.h
+++ b/src/gnet/geventhandler.h
@@ -26,7 +26,6 @@
 
 #include "gdef.h"
 #include "gnet.h"
-#include "gcredentials.h"
 #include "gdatetime.h"
 #include "gdescriptor.h"
 #include <list>
@@ -38,7 +37,7 @@ namespace GNet
 	class EventHandlerListItem ;
 	class EventHandlerList ;
 	class TimerList ;
-} ;
+}
 
 // Class: GNet::EventHandler
 // Description: A pseudo-abstract base class for classes
@@ -99,7 +98,7 @@ namespace GNet
 {
 	typedef std::list< EventHandlerListItem GAllocator(EventHandlerListItem) >
 		EventHandlerListImp ;
-} ;
+}
 
 // Class: GNet::EventHandlerList
 // Description: A class which can be used in the implemention
diff --git a/src/gnet/geventloop.cpp b/src/gnet/geventloop.cpp
index 8153527..6802616 100644
--- a/src/gnet/geventloop.cpp
+++ b/src/gnet/geventloop.cpp
@@ -43,9 +43,18 @@ GNet::EventLoop::~EventLoop()
 		m_this = NULL ;
 }
 
+//static
 GNet::EventLoop & GNet::EventLoop::instance()
 {
+	if( m_this == NULL )
+		throw NoInstance() ;
 	G_ASSERT( m_this != NULL ) ;
 	return *m_this ;
 }
 
+//static
+bool GNet::EventLoop::exists()
+{
+	return m_this != NULL ;
+}
+
diff --git a/src/gnet/geventloop.h b/src/gnet/geventloop.h
index 32b82f4..7a1589d 100644
--- a/src/gnet/geventloop.h
+++ b/src/gnet/geventloop.h
@@ -27,7 +27,7 @@
 #include "gdef.h"
 #include "gnet.h"
 #include "geventhandler.h"
-#include "gcredentials.h"
+#include "gexception.h"
 #include "gdatetime.h"
 #include "gdescriptor.h"
 #include <list>
@@ -36,7 +36,7 @@
 namespace GNet
 {
 	class EventLoop ;
-} ;
+}
 
 // Class: GNet::EventLoop
 // Description: An abstract base class for a
@@ -56,6 +56,9 @@ namespace GNet
 //
 class GNet::EventLoop
 {
+public:
+	G_EXCEPTION( NoInstance , "no event loop instance" ) ;
+
 protected:
 	EventLoop() ;
 		// Constructor.
@@ -69,6 +72,10 @@ public:
 		// Returns a reference to an instance
 		// of the class, if any. Asserts if none.
 		// Does not do any instantiation itself.
+		// Precondition: exists()
+
+	static bool exists() ;
+		// Returns true if an instance exists.
 
 	virtual ~EventLoop() ;
 		// Destructor.
@@ -79,6 +86,9 @@ public:
 	virtual void run() = 0 ;
 		// Runs the main event loop.
 
+	virtual bool running() const = 0 ;
+		// Returns true if called from within run().
+
 	virtual void quit() = 0 ;
 		// Causes run() to return (once the call stack
 		// has unwound).
@@ -113,7 +123,7 @@ public:
 		// from the list of exception sources.
 		// See also Socket::dropExceptionHandler().
 
-	virtual void setTimeout( const G::credentials<TimerList> & , G::DateTime::EpochTime t ) = 0 ;
+	virtual void setTimeout( G::DateTime::EpochTime t ) = 0 ;
 		// Used by GNet::TimerList. Sets the time at which
 		// TimerList::doTimeouts() is to be called.
 		// A parameter of zero is used to cancel the
diff --git a/src/gnet/gselect.cpp b/src/gnet/geventloop_unix.cpp
similarity index 79%
rename from src/gnet/gselect.cpp
rename to src/gnet/geventloop_unix.cpp
index 8492d1e..eba757d 100644
--- a/src/gnet/gselect.cpp
+++ b/src/gnet/geventloop_unix.cpp
@@ -18,12 +18,16 @@
 //
 // ===
 //
-// gselect.cpp
+// geventloop_unix.cpp
 //
 
 #include "gdef.h"
-#include "gselect.h"
+#include "gnet.h"
+#include "gnoncopyable.h"
+#include "gevent.h"
+#include "gexception.h"
 #include "gstr.h"
+#include "gsetter.h"
 #include "gtimer.h"
 #include "gdebug.h"
 #include <sys/types.h>
@@ -33,8 +37,41 @@ typedef struct timeval Timeval ; // std:: ??
 
 namespace GNet
 {
+	class Select ;
 	class Lock ;
 	class FdSet ;
+}
+
+// Class: GNet::Select
+// Description: A concrete implementation of GNet::EventLoop using
+// ::select() in the implementation.
+//
+class GNet::Select : public GNet:: EventLoop , public G::noncopyable
+{
+public:
+	G_EXCEPTION( Error , "select() error" ) ;
+	Select() ;
+	virtual ~Select() ;
+	virtual bool init() ;
+	virtual void run() ;
+	virtual bool running() const ;
+	virtual void quit() ;
+	virtual void addRead( Descriptor fd , EventHandler &handler ) ;
+	virtual void addWrite( Descriptor fd , EventHandler &handler ) ;
+	virtual void addException( Descriptor fd , EventHandler &handler ) ;
+	virtual void dropRead( Descriptor fd ) ;
+	virtual void dropWrite( Descriptor fd ) ;
+	virtual void dropException( Descriptor fd ) ;
+private:
+	void runOnce() ;
+	virtual void setTimeout( G::DateTime::EpochTime t ) ;
+
+private:
+	bool m_quit ;
+	bool m_running ;
+	EventHandlerList m_read_list ;
+	EventHandlerList m_write_list ;
+	EventHandlerList m_exception_list ;
 } ;
 
 // Class: GNet::Lock
@@ -118,8 +155,16 @@ void GNet::FdSet::raiseEvents( fd_set * set , EventHandlerList & list ,
 
 // ===
 
+GNet::EventLoop * GNet::EventLoop::create()
+{
+	return new Select ;
+}
+
+// ===
+
 GNet::Select::Select() :
 	m_quit(false) ,
+	m_running(false) ,
 	m_read_list(std::string("read")) ,
 	m_write_list(std::string("write")) ,
 	m_exception_list(std::string("exception"))
@@ -137,6 +182,7 @@ bool GNet::Select::init()
 
 void GNet::Select::run()
 {
+	G::Setter setter( m_running ) ;
 	while( !m_quit )
 	{
 		runOnce() ;
@@ -144,6 +190,11 @@ void GNet::Select::run()
 	m_quit = false ;
 }
 
+bool GNet::Select::running() const
+{
+	return m_running ;
+}
+
 void GNet::Select::quit()
 {
 	m_quit = true ;
@@ -225,7 +276,7 @@ void GNet::Select::dropException( Descriptor fd )
 	m_exception_list.remove( fd ) ;
 }
 
-void GNet::Select::setTimeout( const G::credentials<TimerList> & , G::DateTime::EpochTime )
+void GNet::Select::setTimeout( G::DateTime::EpochTime )
 {
 	// not used -- interval() in runOnce() suffices
 }
diff --git a/src/gnet/gwinsock.cpp b/src/gnet/geventloop_win32.cpp
similarity index 65%
rename from src/gnet/gwinsock.cpp
rename to src/gnet/geventloop_win32.cpp
index 8d57e77..2e9837b 100644
--- a/src/gnet/gwinsock.cpp
+++ b/src/gnet/geventloop_win32.cpp
@@ -18,15 +18,17 @@
 //
 // ===
 //
-// gwinsock.cpp
+// geventloop_win32.cpp
 //
 
 #include "gdef.h"
 #include "gnet.h"
+#include "gevent.h"
 #include "gpump.h"
 #include "gappinst.h"
+#include "gwinbase.h"
 #include "gwinhid.h"
-#include "gwinsock.h"
+#include "gsetter.h"
 #include "gexception.h"
 #include "gtimer.h"
 #include "gassert.h"
@@ -35,9 +37,113 @@
 
 namespace GNet
 {
+	class Winsock ;
 	class WinsockWindow ;
 } ;
 
+// Class: GNet::Winsock
+// Description: A concrete implementation of GNet::EventLoop
+// using the WinSock system.
+//
+// Note that WinSock events are delivered as messages to the
+// application's main message queue, and these messages have
+// to be passed on the the WinSock layer.
+//
+class GNet::Winsock : public EventLoop
+{
+public:
+	Winsock() ;
+		// Default constructor. Initialise with load() (optional)
+		// and then either init() or attach().
+
+	bool load( const char * dllpath ) ;
+		// Loads the given WinSock DLL. Must be the first
+		// method called after construction.
+		// Returns false on error.
+
+	virtual bool init() ;
+		// Override from EventLoop. Initialses the
+		// WinSock library, passing it the handle
+		// of an internally-created hidden window.
+		// Returns false on error.
+		//
+		// Use either init() for an internally-created
+		// window, or attach().
+
+	bool attach( HWND hwnd , unsigned int msg , unsigned int timer_id = 0U ) ;
+		// Initialises the WinSock library, passing
+		// it the specified window handle and
+		// message number. WinSock events are sent
+		// to that window. Returns false on error.
+		//
+		// For simple, synchronous programs
+		// the window handle may be zero.
+		//
+		// Use either init() or attach().
+		//
+		// See also onMessage() and onTimer().
+
+	std::string reason() const ;
+		// Returns the reason for initialisation
+		// failure.
+
+	std::string id() const ;
+		// Returns the WinSock implementation's
+		// identification string. Returns the
+		// zero length string on error.
+
+	virtual ~Winsock() ;
+		// Destructor. Releases the WinSock resources
+		// if this is the last Winsock object.
+
+	void onMessage( WPARAM wparam , LPARAM lparam ) ;
+		// To be called when the attach()ed window
+		// receives a message with a message-id
+		// equal to attach() 'msg' parameter.
+
+	void onTimer() ;
+		// To be called when the attach()ed window
+		// receives a WM_TIMER message.
+
+	virtual void run() ;
+		// Override from EventLoop. Calls GGui::Pump::run().
+
+	virtual bool running() const ;
+		// Override from EventLoop. Returns true if in run().
+
+	virtual void quit() ;
+		// Override from EventLoop. Calls GGui::Pump::quit().
+
+protected:
+	virtual void addRead( Descriptor fd , EventHandler & handler ) ;
+	virtual void addWrite( Descriptor fd , EventHandler & handler ) ;
+	virtual void addException( Descriptor fd , EventHandler & handler ) ;
+	virtual void dropRead( Descriptor fd ) ;
+	virtual void dropWrite( Descriptor fd ) ;
+	virtual void dropException( Descriptor fd ) ;
+	virtual void setTimeout( G::DateTime::EpochTime ) ;
+
+private:
+	Winsock( const Winsock & other ) ;
+	void operator=( const Winsock & other ) ;
+	EventHandler *findHandler( EventHandlerList & list , Descriptor fd ) ;
+	void update( Descriptor fd ) ;
+	long desiredEvents( Descriptor fd ) ;
+
+private:
+	bool m_running ;
+	GGui::WindowBase * m_window ;
+	bool m_success ;
+	std::string m_reason ;
+	std::string m_id ;
+	HWND m_hwnd ;
+	unsigned m_msg ;
+	EventHandlerList m_read_list ;
+	EventHandlerList m_write_list ;
+	EventHandlerList m_exception_list ;
+	unsigned int m_timer_id ;
+} ;
+
 // Class: GNet::WinsockWindow
 // Description: An private implementation class used by GNet::Winsock
 // to hook into GGui::Window event processing.
@@ -52,6 +158,8 @@ private:
 	Winsock & m_ws ;
 } ;
 
+// ===
+
 GNet::WinsockWindow::WinsockWindow( Winsock & ws , HINSTANCE hinstance ) :
 	m_ws(ws) ,
 	GGui::WindowHidden(hinstance)
@@ -71,14 +179,22 @@ void GNet::WinsockWindow::onTimer( unsigned int timer_id )
 
 // ===
 
+GNet::EventLoop * GNet::EventLoop::create()
+{
+	return new Winsock ;
+}
+
+// ===
+
 GNet::Winsock::Winsock() :
+	m_running(false) ,
 	m_window(NULL) ,
-	m_read_list("read") ,
-	m_write_list("write") ,
-	m_exception_list("exception") ,
 	m_success(false) ,
 	m_hwnd(0) ,
 	m_msg(0) ,
+	m_read_list("read") ,
+	m_write_list("write") ,
+	m_exception_list("exception") ,
 	m_timer_id(1U)
 {
 }
@@ -264,7 +380,7 @@ void GNet::Winsock::onTimer()
 	TimerList::instance().doTimeouts() ;
 }
 
-void GNet::Winsock::setTimeout( const G::credentials<TimerList> & , G::DateTime::EpochTime t )
+void GNet::Winsock::setTimeout( G::DateTime::EpochTime t )
 {
 	G_DEBUG( "GNet::Winsock::setTimeout: " << t ) ;
 	if( t != 0U )
@@ -289,9 +405,15 @@ void GNet::Winsock::setTimeout( const G::credentials<TimerList> & , G::DateTime:
 
 void GNet::Winsock::run()
 {
+	G::Setter setter( m_running ) ;
 	GGui::Pump::run() ;
 }
 
+bool GNet::Winsock::running() const
+{
+	return m_running ;
+}
+
 void GNet::Winsock::quit()
 {
 	GGui::Pump::quit() ;
diff --git a/src/gnet/geventserver.h b/src/gnet/geventserver.h
index 7c50bbc..13f4c69 100644
--- a/src/gnet/geventserver.h
+++ b/src/gnet/geventserver.h
@@ -32,7 +32,7 @@ namespace GNet
 {
 	class EventServer ;
 	class EventServerImp ;
-} ;
+}
 
 // Class: GNet::EventServer
 // Description: A simple derivation from Server which
diff --git a/src/gnet/glinebuffer.h b/src/gnet/glinebuffer.h
index 5ca5d1b..dfed334 100644
--- a/src/gnet/glinebuffer.h
+++ b/src/gnet/glinebuffer.h
@@ -33,7 +33,7 @@
 namespace GNet
 {
 	class LineBuffer ;
-} ;
+}
 
 // Class: GNet::LineBuffer
 // Description: A class which does line buffering. Raw
diff --git a/src/gnet/glocal.h b/src/gnet/glocal.h
index 9ad988c..b77479a 100644
--- a/src/gnet/glocal.h
+++ b/src/gnet/glocal.h
@@ -32,7 +32,7 @@
 namespace GNet
 {
 	class Local ;
-} ;
+}
 
 // Class: GNet::Local
 // Description: A static class for getting information
diff --git a/src/gnet/glocal_unix.cpp b/src/gnet/glocal_unix.cpp
index cd8e0a1..7e14ef1 100644
--- a/src/gnet/glocal_unix.cpp
+++ b/src/gnet/glocal_unix.cpp
@@ -26,6 +26,7 @@
 #include "gresolve.h"
 #include "glog.h"
 #include <sys/utsname.h>
+#include <cstdlib> // getenv
 
 std::string GNet::Local::hostname()
 {
@@ -39,6 +40,17 @@ std::string GNet::Local::hostname()
 	if( pos != std::string::npos )
 		name = name.substr( 0U , pos ) ;
 
+	// pathalogically "uname -n" can be empty, so
+	// allow "export HOSTNAME=localhost" as a
+	// workround
+	//
+	if( name.empty() )
+	{
+		static const char * p = std::getenv( "HOSTNAME" ) ;
+		static std::string s( p ? p : "" ) ;
+		name = s ;
+	}
+
 	return name ;
 }
 
diff --git a/src/gnet/glocal_win32.cpp b/src/gnet/glocal_win32.cpp
index 43a1956..30da8ef 100644
--- a/src/gnet/glocal_win32.cpp
+++ b/src/gnet/glocal_win32.cpp
@@ -32,7 +32,7 @@ std::string GNet::Local::hostname()
 	if( 0 != ::gethostname( buffer , sizeof(buffer)-1U ) )
 	{
 		int error = ::WSAGetLastError() ;
-		throw Error( std::stringstream() << "gethostname() (" << error << ")" ) ;
+		throw Error( std::ostringstream() << "gethostname() (" << error << ")" ) ;
 	}
 	return std::string(buffer) ;
 }
@@ -49,7 +49,7 @@ GNet::Address GNet::Local::canonicalAddress()
 			Resolver::resolve( hostname() , "0" ) ;
 
 		if( rc.second.length() != 0U )
-			throw Error( std::stringstream() << "resolve: " << rc.second ) ;
+			throw Error( std::ostringstream() << "resolve: " << rc.second ) ;
 
 		result = rc.first.address ;
 	}
@@ -68,7 +68,7 @@ std::string GNet::Local::fqdnImp()
 			Resolver::resolve( hostname() , "0" ) ;
 
 		if( rc.second.length() != 0U )
-			throw Error( std::stringstream() << "resolve: " << rc.second ) ;
+			throw Error( std::ostringstream() << "resolve: " << rc.second ) ;
 
 		result = rc.first.canonical_name ;
 
diff --git a/src/gnet/gmonitor.cpp b/src/gnet/gmonitor.cpp
index 9b539b4..75b1a6b 100644
--- a/src/gnet/gmonitor.cpp
+++ b/src/gnet/gmonitor.cpp
@@ -33,11 +33,16 @@
 class GNet::MonitorImp
 {
 public:
-	MonitorImp() ;
 	typedef const Client * C_p ;
 	typedef const ServerPeer * S_p ;
 	typedef std::set<C_p GLessAllocator(C_p,C_p) > Clients ;
+	typedef std::pair<Clients::iterator,bool> ClientInsertion ;
 	typedef std::set<S_p GLessAllocator(S_p,S_p) > ServerPeers ;
+	typedef std::pair<ServerPeers::iterator,bool> ServerPeerInsertion ;
+
+	explicit MonitorImp( Monitor & monitor ) ;
+
+	Monitor & m_monitor ;
 	Clients m_clients ;
 	ServerPeers m_server_peers ;
 	unsigned long m_client_adds ;
@@ -46,7 +51,8 @@ public:
 	unsigned long m_server_peer_removes ;
 } ;
 
-GNet::MonitorImp::MonitorImp() :
+GNet::MonitorImp::MonitorImp( Monitor & monitor ) :
+	m_monitor(monitor) ,
 	m_client_adds(0UL) ,
 	m_client_removes(0UL) ,
 	m_server_peer_adds(0UL) ,
@@ -59,7 +65,7 @@ GNet::MonitorImp::MonitorImp() :
 GNet::Monitor * GNet::Monitor::m_this = NULL ;
 
 GNet::Monitor::Monitor() :
-	m_imp( new MonitorImp )
+	m_imp( new MonitorImp(*this) )
 {
 	G_ASSERT( m_this == NULL ) ;
 	m_this = this ;
@@ -78,55 +84,65 @@ GNet::Monitor * GNet::Monitor::instance()
 
 void GNet::Monitor::add( const Client & client )
 {
-	m_imp->m_clients.insert( &client ) ;
-	m_imp->m_client_adds++ ;
+	MonitorImp::ClientInsertion rc = m_imp->m_clients.insert( &client ) ;
+	if( rc.second )
+		m_imp->m_client_adds++ ;
+	onEvent( "out" , "start" ) ;
 }
 
 void GNet::Monitor::remove( const Client & client )
 {
-	m_imp->m_client_removes++ ;
-	m_imp->m_clients.erase( &client ) ;
+	if( m_imp->m_clients.erase( &client ) )
+		m_imp->m_client_removes++ ;
+	onEvent( "out" , "end" ) ;
 }
 
 void GNet::Monitor::add( const ServerPeer & peer )
 {
-	m_imp->m_server_peer_adds++ ;
-	m_imp->m_server_peers.insert( & peer ) ;
+	MonitorImp::ServerPeerInsertion rc = m_imp->m_server_peers.insert( & peer ) ;
+	if( rc.second )
+		m_imp->m_server_peer_adds++ ;
+	onEvent( "in" , "start" ) ;
 }
 
 void GNet::Monitor::remove( const ServerPeer & peer )
 {
-	m_imp->m_server_peer_removes++ ;
-	m_imp->m_server_peers.erase( & peer ) ;
+	if( m_imp->m_server_peers.erase( & peer ) )
+		m_imp->m_server_peer_removes++ ;
+	onEvent( "in" , "end" ) ;
 }
 
 void GNet::Monitor::report( std::ostream & s , const std::string & px , const std::string & eol )
 {
-	s << px << "clients created: " << m_imp->m_client_adds << eol ;
-	s << px << "clients destroyed: " << m_imp->m_client_removes << eol ;
+	s << px << "OUT started: " << m_imp->m_client_adds << eol ;
+	s << px << "OUT finished: " << m_imp->m_client_removes << eol ;
 	{
 		for( MonitorImp::Clients::const_iterator p = m_imp->m_clients.begin() ;
 			p != m_imp->m_clients.end() ; ++p )
 		{
 			s << px
-				<< "  client " << (const void *)(*p) << ": "
+				<< "OUT: "
 				<< (*p)->localAddress().second.displayString() << " -> "
 				<< (*p)->peerAddress().second.displayString() << eol ;
 		}
 	}
 
-	s << px << "servers created: " << m_imp->m_server_peer_adds << eol ;
-	s << px << "servers destroyed: " << m_imp->m_server_peer_removes << eol ;
-
+	s << px << "IN started: " << m_imp->m_server_peer_adds << eol ;
+	s << px << "IN finished: " << m_imp->m_server_peer_removes << eol ;
 	{
 		for( MonitorImp::ServerPeers::const_iterator p = m_imp->m_server_peers.begin() ;
 			p != m_imp->m_server_peers.end() ; ++p )
 		{
 			s << px
-				<< "  server " << (const void *)(*p) << ": "
+				<< "IN: "
 				<< (*p)->localAddress().second.displayString() << " -> "
 				<< (*p)->peerAddress().second.displayString() << eol ;
 		}
 	}
 }
 
+void GNet::Monitor::onEvent( const std::string & , const std::string & )
+{
+	; // default implementation
+}
+
diff --git a/src/gnet/gmonitor.h b/src/gnet/gmonitor.h
index 6d3e9b3..8f5292a 100644
--- a/src/gnet/gmonitor.h
+++ b/src/gnet/gmonitor.h
@@ -26,6 +26,7 @@
 
 #include "gdef.h"
 #include "gnet.h"
+#include "gnoncopyable.h"
 #include "gclient.h"
 #include "gserver.h"
 #include <iostream>
@@ -34,13 +35,13 @@ namespace GNet
 {
 	class Monitor ;
 	class MonitorImp ;
-} ;
+}
 
 // Class: GNet::Monitor
 // Description: A singleton for monitoring Client and ServerPeer connections.
 // See also: GNet::Client, GNet::ServerPeer
 //
-class GNet::Monitor
+class GNet::Monitor : public G::noncopyable
 {
 public:
 	Monitor() ;
@@ -69,9 +70,11 @@ public:
 		const std::string & eol = std::string("\n") ) ;
 			// Reports itself onto a stream.
 
-private:
-	Monitor( const Monitor & ) ; // not implemented
-	void operator=( const Monitor & ) ; // not implemented
+protected:
+	virtual void onEvent( const std::string & , const std::string & ) ;
+		// Called when the monitor's state has
+		// changed. The default implementation
+		// does nothing.
 
 private:
 	static Monitor * m_this ;
diff --git a/src/gnet/grequest.h b/src/gnet/grequest.h
index e9b3484..fb783e8 100644
--- a/src/gnet/grequest.h
+++ b/src/gnet/grequest.h
@@ -34,7 +34,7 @@ namespace GNet
 	class Request ;
 	class HostRequest ;
 	class ServiceRequest ;
-} ;
+}
 
 // Class: GNet::Request
 // Description: A base class for making
diff --git a/src/gnet/gresolve.h b/src/gnet/gresolve.h
index 8cf00ba..ffce5a8 100644
--- a/src/gnet/gresolve.h
+++ b/src/gnet/gresolve.h
@@ -32,7 +32,7 @@ namespace GNet
 {
 	class Resolver ;
 	class ResolverImp ;
-} ;
+}
 
 // Class: GNet::Resolver
 // Description: A class for asynchronous TCP name-to-address
diff --git a/src/gnet/gselect.h b/src/gnet/gselect.h
deleted file mode 100644
index c1eee59..0000000
--- a/src/gnet/gselect.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later
-// version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-// ===
-//
-// gselect.h
-//
-
-#ifndef G_SELECT_H
-#define G_SELECT_H
-
-#include "gdef.h"
-#include "gnet.h"
-#include "gevent.h"
-#include "gexception.h"
-
-namespace GNet
-{
-	class Select ;
-} ;
-
-// Class: GNet::Select
-// Description: A event-source class which uses ::select().
-//
-class GNet::Select : public GNet:: EventLoop
-{
-public:
-	G_EXCEPTION( Error , "select() error" ) ;
-
-	Select() ;
-		// Constructor.
-
-	virtual ~Select() ;
-		// Destructor.
-
-	virtual bool init() ;
-		// Override from EventLoop. Does nothing. Returns true.
-
-	virtual void run() ;
-		// Override from EventLoop. Runs the event loop.
-
-	virtual void quit() ;
-		// Override from EventLoop. Causes run() to return.
-
-	virtual void addRead( Descriptor fd , EventHandler &handler ) ;
-		// See EventLoop.
-
-	virtual void addWrite( Descriptor fd , EventHandler &handler ) ;
-		// See EventLoop.
-
-	virtual void addException( Descriptor fd , EventHandler &handler ) ;
-		// See EventLoop.
-
-	virtual void dropRead( Descriptor fd ) ;
-		// See EventLoop.
-
-	virtual void dropWrite( Descriptor fd ) ;
-		// See EventLoop.
-
-	virtual void dropException( Descriptor fd ) ;
-		// See EventLoop.
-
-private:
-	Select( const Select & ) ;
-	void operator=( const Select & ) ;
-	void runOnce() ;
-	virtual void setTimeout( const G::credentials<TimerList> & , G::DateTime::EpochTime t ) ;
-
-private:
-	bool m_quit ;
-	EventHandlerList m_read_list ;
-	EventHandlerList m_write_list ;
-	EventHandlerList m_exception_list ;
-} ;
-
-#endif
diff --git a/src/gnet/gserver.cpp b/src/gnet/gserver.cpp
index 4671128..e8ffdc7 100644
--- a/src/gnet/gserver.cpp
+++ b/src/gnet/gserver.cpp
@@ -157,6 +157,14 @@ GNet::Server::~Server()
 {
 }
 
+std::pair<bool,GNet::Address> GNet::Server::address() const
+{
+	std::pair<bool,Address> result( false , Address::invalidAddress() ) ;
+	if( m_socket.get() != NULL )
+		result = m_socket->getLocalAddress() ;
+	return result ;
+}
+
 void GNet::Server::readEvent()
 {
 	// read-event-on-listening-port => new connection to accept
diff --git a/src/gnet/gserver.h b/src/gnet/gserver.h
index 139de71..caeba5b 100644
--- a/src/gnet/gserver.h
+++ b/src/gnet/gserver.h
@@ -28,8 +28,8 @@
 #include "gnet.h"
 #include "gsocket.h"
 #include "gconnection.h"
-#include "gselect.h"
 #include "gevent.h"
+#include <utility>
 #include <list>
 #include <memory>
 #include <string>
@@ -38,7 +38,7 @@ namespace GNet
 {
 	class Server ;
 	class ServerPeer ;
-} ;
+}
 
 // Class: GNet::Server
 // Description: An application-level class for implementing a
@@ -64,14 +64,18 @@ public:
 		// Default constructor. Initialise with init().
 
 	void init( unsigned int listening_port ) ;
-		// Iniailisation after default construction.
+		// Initilisation after default construction.
 
 	void init( const Address & listening_address ) ;
-		// Iniailisation after default construction.
+		// Initilisation after default construction.
 
 	virtual ~Server() ;
 		// Destructor.
 
+	std::pair<bool,Address> address() const ;
+		// Returns the listening address. Pair.first
+		// is false if not properly init()ialised.
+
 protected:
 	virtual ServerPeer * newPeer( StreamSocket * socket ,
 		Address peer_address ) = 0 ;
diff --git a/src/gnet/gsocket.cpp b/src/gnet/gsocket.cpp
index 277c00d..5d44d20 100644
--- a/src/gnet/gsocket.cpp
+++ b/src/gnet/gsocket.cpp
@@ -288,14 +288,14 @@ void GNet::Socket::dropExceptionHandler()
 
 std::string GNet::Socket::asString() const
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << m_socket ;
 	return ss.str() ;
 }
 
 std::string GNet::Socket::reasonString() const
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << m_reason ;
 	return ss.str() ;
 }
diff --git a/src/gnet/gsocket.h b/src/gnet/gsocket.h
index e05056f..7e50603 100644
--- a/src/gnet/gsocket.h
+++ b/src/gnet/gsocket.h
@@ -37,7 +37,7 @@ namespace GNet
 	class StreamSocket ;
 	class DatagramSocket ;
 	class AcceptPair ;
-} ;
+}
 
 // Class: GNet::Socket
 //
diff --git a/src/gnet/gtimer.cpp b/src/gnet/gtimer.cpp
index 9cc6fb3..d3e5aff 100644
--- a/src/gnet/gtimer.cpp
+++ b/src/gnet/gtimer.cpp
@@ -25,11 +25,12 @@
 #include "gtimer.h"
 #include "gevent.h"
 #include "gdebug.h"
+#include "gassert.h"
 
 namespace GNet
 {
 	class TimerUpdate ;
-} ;
+}
 
 // Class: GNet::TimerUpdate
 // Description: A private implementation class used by GNet::Timer.
@@ -60,6 +61,8 @@ GNet::Timer::Timer( TimeoutHandler & handler ) :
 	m_time(0UL) ,
 	m_handler(&handler)
 {
+	G_ASSERT( TimerList::instance(TimerList::NoThrow()) != NULL ) ;
+	G_ASSERT( EventLoop::exists() ) ;
 	TimerUpdate update( *this , "ctor" ) ;
 	TimerList::instance().add( *this ) ;
 }
@@ -68,6 +71,8 @@ GNet::Timer::Timer() :
 	m_time(0UL) ,
 	m_handler(NULL)
 {
+	G_ASSERT( TimerList::instance(TimerList::NoThrow()) != NULL ) ;
+	G_ASSERT( EventLoop::exists() ) ;
 	TimerUpdate update( *this , "ctor" ) ;
 	TimerList::instance().add( *this ) ;
 }
@@ -76,8 +81,11 @@ GNet::Timer::~Timer()
 {
 	try
 	{
-		TimerUpdate update( *this , "dtor" ) ;
-		TimerList::instance().remove( *this ) ;
+		if( TimerList::instance(TimerList::NoThrow()) != NULL )
+		{
+			TimerUpdate update( *this , "dtor" ) ;
+			TimerList::instance().remove( *this ) ;
+		}
 	}
 	catch(...)
 	{
@@ -122,7 +130,8 @@ G::DateTime::EpochTime GNet::Timer::t() const
 
 GNet::TimerList * GNet::TimerList::m_this = NULL ;
 
-GNet::TimerList::TimerList()
+GNet::TimerList::TimerList() :
+	m_changed(false)
 {
 	if( m_this == NULL )
 		m_this = this ;
@@ -136,12 +145,21 @@ GNet::TimerList::~TimerList()
 
 void GNet::TimerList::add( Timer & t )
 {
-	m_set.insert( &t ) ;
+	m_changed = true ;
+	m_list.push_back( &t ) ;
 }
 
 void GNet::TimerList::remove( Timer & t )
 {
-	m_set.erase( &t ) ;
+	for( List::iterator p = m_list.begin() ; p != m_list.end() ; ++p )
+	{
+		if( *p == &t )
+		{
+			m_list.erase( p ) ;
+			m_changed = true ;
+			break ;
+		}
+	}
 }
 
 void GNet::TimerList::update( G::DateTime::EpochTime t_old ,
@@ -150,17 +168,17 @@ void GNet::TimerList::update( G::DateTime::EpochTime t_old ,
 	G::DateTime::EpochTime t_new = soonest() ;
 	G_DEBUG( "GNet::TimerList::update: " << op << ": " << t_old << " -> " << t_new ) ;
 	(void) op.length() ; // pacify the compiler
-	if( t_old != t_new )
+	if( t_old != t_new && EventLoop::exists() )
 	{
-		EventLoop::instance().setTimeout( "" , t_new ) ;
+		EventLoop::instance().setTimeout( t_new ) ;
 	}
 }
 
 G::DateTime::EpochTime GNet::TimerList::soonest() const
 {
 	G::DateTime::EpochTime result = 0U ;
-	const Set::const_iterator end = m_set.end() ;
-	for( Set::const_iterator p = m_set.begin() ; p != end ; ++p )
+	const List::const_iterator end = m_list.end() ;
+	for( List::const_iterator p = m_list.begin() ; p != end ; ++p )
 	{
 		if( (*p)->t() != 0UL && ( result == 0U || (*p)->t() < result ) )
 			result = (*p)->t() ;
@@ -200,12 +218,22 @@ void GNet::TimerList::doTimeouts()
 {
 	G_DEBUG( "GNet::TimerList::doTimeouts" ) ;
 	G::DateTime::EpochTime now = G::DateTime::now() ;
-	for( Set::iterator p = m_set.begin() ; p != m_set.end() ; ++p )
+
+	do
 	{
-		if( now >= (*p)->t() )
-			(*p)->doTimeout() ;
-	}
-	EventLoop::instance().setTimeout( "" , soonest() ) ;
+		m_changed = false ;
+		for( List::iterator p = m_list.begin() ; p != m_list.end() ; ++p )
+		{
+			if( now >= (*p)->t() )
+			{
+				(*p)->doTimeout() ;
+				if( m_changed ) break ;
+			}
+		}
+	} while( m_changed ) ;
+
+	if( EventLoop::exists() )
+		EventLoop::instance().setTimeout( soonest() ) ;
 }
 
 // ===
@@ -221,7 +249,8 @@ GNet::TimerUpdate::~TimerUpdate()
 {
 	try
 	{
-		TimerList::instance().update( m_soonest , m_type ) ;
+		if( TimerList::instance(TimerList::NoThrow()) != NULL )
+			TimerList::instance().update( m_soonest , m_type ) ;
 	}
 	catch(...)
 	{
diff --git a/src/gnet/gtimer.h b/src/gnet/gtimer.h
index 8b7c19a..03190ef 100644
--- a/src/gnet/gtimer.h
+++ b/src/gnet/gtimer.h
@@ -28,14 +28,14 @@
 #include "gnet.h"
 #include "gdatetime.h"
 #include "gexception.h"
-#include <set>
+#include <list>
 
 namespace GNet
 {
 	class Timer ;
 	class TimeoutHandler ;
 	class TimerList ;
-} ;
+}
 
 // Class: GNet::TimeoutHandler
 // Description: An interface used by GNet::Timer.
@@ -148,8 +148,9 @@ private:
 
 private:
 	static TimerList * m_this ;
-	typedef std::set<Timer* GLessAllocator(Timer*,Timer*) > Set ;
-	Set m_set ;
+	typedef std::list<Timer*> List ;
+	List m_list ;
+	bool m_changed ;
 } ;
 
 
diff --git a/src/gnet/gwinsock.h b/src/gnet/gwinsock.h
deleted file mode 100644
index c1b33fe..0000000
--- a/src/gnet/gwinsock.h
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later
-// version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-// ===
-//
-// gwinsock.h
-//
-
-#ifndef G_WINSOCK_H
-#define G_WINSOCK_H
-
-#include "gdef.h"
-#include "gnet.h"
-#include "gwinbase.h"
-#include "gevent.h"
-
-namespace GNet
-{
-	class Winsock ;
-} ;
-
-// Class: GNet::Winsock
-// Description: A windows-specific class which initialises
-// the WinSock system, and integrates the windows message
-// queue with it. Note that WinSock events are delivered
-// as messages to the application's main message queue,
-// and these messages have to be passed on the the
-// WinSock layer.
-//
-class GNet::Winsock : public EventLoop
-{
-public:
-	Winsock() ;
-		// Default constructor. Initialise with load() (optional)
-		// and then either init() or attach().
-
-	bool load( const char * dllpath ) ;
-		// Loads the given WinSock DLL. Must be the first
-		// method called after construction.
-		// Returns false on error.
-
-	virtual bool init() ;
-		// Override from EventLoop. Initialses the
-		// WinSock library, passing it the handle
-		// of an internally-created hidden window.
-		// Returns false on error.
-		//
-		// Use either init() for an internally-created
-		// window, or attach().
-
-	bool attach( HWND hwnd , unsigned int msg , unsigned int timer_id = 0U ) ;
-		// Initialises the WinSock library, passing
-		// it the specified window handle and
-		// message number. WinSock events are sent
-		// to that window. Returns false on error.
-		//
-		// For simple, synchronous programs
-		// the window handle may be zero.
-		//
-		// Use either init() or attach().
-		//
-		// See also onMessage() and onTimer().
-
-	std::string reason() const ;
-		// Returns the reason for initialisation
-		// failure.
-
-	std::string id() const ;
-		// Returns the WinSock implementation's
-		// identification string. Returns the
-		// zero length string on error.
-
-	virtual ~Winsock() ;
-		// Destructor. Releases the WinSock resources
-		// if this is the last Winsock object.
-
-	void onMessage( WPARAM wparam , LPARAM lparam ) ;
-		// To be called when the attach()ed window
-		// receives a message with a message-id
-		// equal to attach() 'msg' parameter.
-
-	void onTimer() ;
-		// To be called when the attach()ed window
-		// receives a WM_TIMER message.
-
-	virtual void run() ;
-		// Override from EventLoop. Calls GGui::Pump::run().
-
-	virtual void quit() ;
-		// Override from EventLoop. Calls GGui::Pump::quit().
-
-protected:
-	virtual void addRead( Descriptor fd , EventHandler & handler ) ;
-	virtual void addWrite( Descriptor fd , EventHandler & handler ) ;
-	virtual void addException( Descriptor fd , EventHandler & handler ) ;
-	virtual void dropRead( Descriptor fd ) ;
-	virtual void dropWrite( Descriptor fd ) ;
-	virtual void dropException( Descriptor fd ) ;
-	virtual void setTimeout( const G::credentials<TimerList> & , G::DateTime::EpochTime ) ;
-
-private:
-	Winsock( const Winsock & other ) ;
-	void operator=( const Winsock & other ) ;
-	EventHandler *findHandler( EventHandlerList & list , Descriptor fd ) ;
-	void update( Descriptor fd ) ;
-	long desiredEvents( Descriptor fd ) ;
-
-private:
-	bool m_initialised ;
-	GGui::WindowBase * m_window ;
-	bool m_success ;
-	std::string m_reason ;
-	std::string m_id ;
-	HWND m_hwnd ;
-	unsigned m_msg ;
-	EventHandlerList m_read_list ;
-	EventHandlerList m_write_list ;
-	EventHandlerList m_exception_list ;
-	unsigned int m_timer_id ;
-} ;
-
-#endif
-
-
diff --git a/src/gsmtp/Makefile.am b/src/gsmtp/Makefile.am
new file mode 100644
index 0000000..46590b8
--- /dev/null
+++ b/src/gsmtp/Makefile.am
@@ -0,0 +1,69 @@
+# 
+# Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later
+# version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# 
+
+EXTRA_DIST=\
+	gmessagestore_win32.cpp \
+	gsasl_cyrus.cpp
+
+INCLUDES = -I$(top_srcdir)/lib/$(COMPILER_VERSION) -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gnet -DG_SPOOLDIR=\"$(e_spooldir)\"
+
+noinst_LIBRARIES = libgsmtp.a
+
+libgsmtp_a_SOURCES = \
+	gadminserver.cpp \
+	gadminserver.h \
+	gbase64.cpp \
+	gbase64.h \
+	gclientprotocol.cpp \
+	gclientprotocol.h \
+	gfilestore.cpp \
+	gfilestore.h \
+	gmessagestore.cpp \
+	gmessagestore.h \
+	gmessagestore_unix.cpp \
+	gnewfile.cpp \
+	gnewfile.h \
+	gnewmessage.cpp \
+	gnewmessage.h \
+	gprotocolmessage.cpp \
+	gprotocolmessage.h \
+	gprotocolmessageforward.cpp \
+	gprotocolmessageforward.h \
+	gprotocolmessagestore.cpp \
+	gprotocolmessagestore.h \
+	gsasl_native.cpp \
+	gsasl.h \
+	gsecrets.cpp \
+	gsecrets.h \
+	gserverprotocol.cpp \
+	gserverprotocol.h \
+	gsmtp.h \
+	gsmtpclient.cpp \
+	gsmtpclient.h \
+	gsmtpserver.cpp \
+	gsmtpserver.h \
+	gstoredfile.cpp \
+	gstoredfile.h \
+	gstoredmessage.cpp \
+	gstoredmessage.h \
+	gverifier.cpp \
+	gverifier.h \
+	gxtext.cpp \
+	gxtext.h
+
diff --git a/src/gsmtp/Makefile.in b/src/gsmtp/Makefile.in
new file mode 100644
index 0000000..8098d40
--- /dev/null
+++ b/src/gsmtp/Makefile.in
@@ -0,0 +1,510 @@
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# 
+# Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later
+# version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# 
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+AR = @AR@
+AWK = @AWK@
+CC = @CC@
+COMPILER_VERSION = @COMPILER_VERSION@
+CXX = @CXX@
+GZIP = @GZIP@
+HAVE_DOXYGEN = @HAVE_DOXYGEN@
+HAVE_MAN2HTML = @HAVE_MAN2HTML@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+VERSION = @VERSION@
+e_docdir = @e_docdir@
+e_examplesdir = @e_examplesdir@
+e_initdir = @e_initdir@
+e_libexecdir = @e_libexecdir@
+e_man1dir = @e_man1dir@
+e_sbindir = @e_sbindir@
+e_spooldir = @e_spooldir@
+
+EXTRA_DIST =  	gmessagestore_win32.cpp 	gsasl_cyrus.cpp
+
+
+INCLUDES = -I$(top_srcdir)/lib/$(COMPILER_VERSION) -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gnet -DG_SPOOLDIR=\"$(e_spooldir)\"
+
+noinst_LIBRARIES = libgsmtp.a
+
+libgsmtp_a_SOURCES =  	gadminserver.cpp 	gadminserver.h 	gbase64.cpp 	gbase64.h 	gclientprotocol.cpp 	gclientprotocol.h 	gfilestore.cpp 	gfilestore.h 	gmessagestore.cpp 	gmessagestore.h 	gmessagestore_unix.cpp 	gnewfile.cpp 	gnewfile.h 	gnewmessage.cpp 	gnewmessage.h 	gprotocolmessage.cpp 	gprotocolmessage.h 	gprotocolmessageforward.cpp 	gprotocolmessageforward.h 	gprotocolmessagestore.cpp 	gprotocolmessagestore.h 	gsasl_native.cpp 	gsasl.h 	gsecrets.cpp 	gsecrets.h 	gserverprotocol.cpp 	gserverprotocol.h 	gsmtp.h 	gsmtpclient.cpp 	gsmtpclient.h 	gsmtpserver.cpp 	gsmtpserver.h 	gstoredfile.cpp 	gstoredfile.h 	gstoredmessage.cpp 	gstoredmessage.h 	gverifier.cpp 	gverifier.h 	gxtext.cpp 	gxtext.h
+
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../../config.h
+CONFIG_CLEAN_FILES = 
+LIBRARIES =  $(noinst_LIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+libgsmtp_a_LIBADD = 
+libgsmtp_a_OBJECTS =  gadminserver.o gbase64.o gclientprotocol.o \
+gfilestore.o gmessagestore.o gmessagestore_unix.o gnewfile.o \
+gnewmessage.o gprotocolmessage.o gprotocolmessageforward.o \
+gprotocolmessagestore.o gsasl_native.o gsecrets.o gserverprotocol.o \
+gsmtpclient.o gsmtpserver.o gstoredfile.o gstoredmessage.o gverifier.o \
+gxtext.o
+CXXFLAGS = @CXXFLAGS@
+CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+SOURCES = $(libgsmtp_a_SOURCES)
+OBJECTS = $(libgsmtp_a_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .cpp .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/gsmtp/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-noinstLIBRARIES:
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+distclean-noinstLIBRARIES:
+
+maintainer-clean-noinstLIBRARIES:
+
+.c.o:
+	$(COMPILE) -c $<
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
+
+maintainer-clean-compile:
+
+libgsmtp.a: $(libgsmtp_a_OBJECTS) $(libgsmtp_a_DEPENDENCIES)
+	-rm -f libgsmtp.a
+	$(AR) cru libgsmtp.a $(libgsmtp_a_OBJECTS) $(libgsmtp_a_LIBADD)
+	$(RANLIB) libgsmtp.a
+.cpp.o:
+	$(CXXCOMPILE) -c $<
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = src/gsmtp
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+gadminserver.o: gadminserver.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits ../../src/gnet/gnet.h \
+	../../src/gnet/geventloop.h ../../src/gnet/geventhandler.h \
+	../../src/glib/gdatetime.h ../../src/glib/gexception.h \
+	../../src/gnet/gdescriptor.h gsmtp.h ../../src/glib/glog.h \
+	gadminserver.h ../../src/gnet/gserver.h \
+	../../src/gnet/gsocket.h ../../src/gnet/gaddress.h \
+	../../src/gnet/gevent.h ../../src/gnet/gconnection.h \
+	../../src/gnet/glinebuffer.h ../../src/glib/gstrings.h \
+	gserverprotocol.h gprotocolmessage.h gverifier.h \
+	../../src/glib/gpath.h gsasl.h gsecrets.h \
+	../../src/glib/gstatemachine.h gsmtpclient.h \
+	../../src/gnet/gclient.h gclientprotocol.h gmessagestore.h \
+	gnewmessage.h gstoredmessage.h ../../src/gnet/gtimer.h \
+	../../src/gnet/gmonitor.h ../../src/glib/gnoncopyable.h \
+	../../src/glib/gstr.h ../../src/glib/gmemory.h
+gbase64.o: gbase64.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
+	../../src/glib/glog.h gbase64.h ../../src/glib/gexception.h \
+	../../src/glib/gassert.h ../../src/glib/glogoutput.h \
+	../../src/glib/gstr.h ../../src/glib/gstrings.h
+gclientprotocol.o: gclientprotocol.cpp ../../src/glib/gdef.h \
+	../../config.h ../../lib/gcc2.95/iostream \
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits \
+	../../src/gnet/gnet.h gsmtp.h ../../src/glib/glog.h \
+	../../src/gnet/glocal.h ../../src/gnet/gaddress.h \
+	../../src/glib/gexception.h ../../src/glib/gfile.h \
+	../../src/glib/gpath.h ../../src/glib/gstrings.h gsasl.h \
+	gsecrets.h gbase64.h ../../src/glib/gstr.h \
+	../../src/glib/gmemory.h gxtext.h gclientprotocol.h \
+	gmessagestore.h gnewmessage.h gstoredmessage.h \
+	../../src/gnet/gtimer.h ../../src/glib/gdatetime.h \
+	../../src/gnet/gresolve.h ../../src/glib/gassert.h \
+	../../src/glib/glogoutput.h
+gfilestore.o: gfilestore.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
+	../../src/glib/glog.h ../../src/glib/gnoncopyable.h \
+	gfilestore.h gmessagestore.h gnewmessage.h gstoredmessage.h \
+	../../src/glib/gstrings.h ../../src/glib/gpath.h \
+	../../src/glib/gexception.h ../../src/glib/gdatetime.h \
+	../../src/glib/groot.h ../../src/glib/gprocess.h gnewfile.h \
+	gstoredfile.h ../../src/glib/gdirectory.h \
+	../../src/glib/gmemory.h ../../src/glib/gfile.h \
+	../../src/glib/gstr.h ../../src/glib/gassert.h \
+	../../src/glib/glogoutput.h
+gmessagestore.o: gmessagestore.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
+	../../src/glib/glog.h gmessagestore.h gnewmessage.h \
+	gstoredmessage.h ../../src/glib/gstrings.h \
+	../../src/glib/gpath.h ../../src/glib/gexception.h \
+	../../src/glib/gassert.h ../../src/glib/glogoutput.h
+gmessagestore_unix.o: gmessagestore_unix.cpp ../../src/glib/gdef.h \
+	../../config.h ../../lib/gcc2.95/iostream \
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gsmtp.h \
+	../../src/gnet/gnet.h ../../src/glib/glog.h gmessagestore.h \
+	gnewmessage.h gstoredmessage.h ../../src/glib/gstrings.h \
+	../../src/glib/gpath.h ../../src/glib/gexception.h
+gnewfile.o: gnewfile.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
+	../../src/glib/glog.h gmessagestore.h gnewmessage.h \
+	gstoredmessage.h ../../src/glib/gstrings.h \
+	../../src/glib/gpath.h ../../src/glib/gexception.h gnewfile.h \
+	gfilestore.h ../../src/glib/gdatetime.h \
+	../../src/glib/gnoncopyable.h ../../src/glib/groot.h \
+	../../src/glib/gprocess.h ../../src/glib/gmemory.h \
+	../../src/glib/gfile.h gxtext.h ../../src/glib/gassert.h \
+	../../src/glib/glogoutput.h
+gnewmessage.o: gnewmessage.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
+	../../src/glib/glog.h gmessagestore.h gnewmessage.h \
+	gstoredmessage.h ../../src/glib/gstrings.h \
+	../../src/glib/gpath.h ../../src/glib/gexception.h
+gprotocolmessage.o: gprotocolmessage.cpp ../../src/glib/gdef.h \
+	../../config.h ../../lib/gcc2.95/iostream \
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gsmtp.h \
+	../../src/gnet/gnet.h ../../src/glib/glog.h gprotocolmessage.h \
+	../../src/glib/gstrings.h gverifier.h ../../src/glib/gpath.h
+gprotocolmessageforward.o: gprotocolmessageforward.cpp \
+	../../src/glib/gdef.h ../../config.h ../../lib/gcc2.95/iostream \
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gsmtp.h \
+	../../src/gnet/gnet.h ../../src/glib/glog.h \
+	gprotocolmessageforward.h gprotocolmessage.h \
+	../../src/glib/gstrings.h gverifier.h ../../src/glib/gpath.h \
+	gprotocolmessagestore.h gnewmessage.h gsmtpclient.h gsecrets.h \
+	../../src/glib/gexception.h ../../src/gnet/glinebuffer.h \
+	../../src/gnet/gclient.h ../../src/gnet/gaddress.h \
+	../../src/gnet/gconnection.h ../../src/gnet/gsocket.h \
+	../../src/gnet/gevent.h ../../src/gnet/geventloop.h \
+	../../src/gnet/geventhandler.h ../../src/glib/gdatetime.h \
+	../../src/gnet/gdescriptor.h gclientprotocol.h gmessagestore.h \
+	gstoredmessage.h gsasl.h ../../src/gnet/gtimer.h \
+	../../src/glib/gmemory.h ../../src/glib/gstr.h \
+	../../src/glib/gassert.h ../../src/glib/glogoutput.h
+gprotocolmessagestore.o: gprotocolmessagestore.cpp ../../src/glib/gdef.h \
+	../../config.h ../../lib/gcc2.95/iostream \
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gsmtp.h \
+	../../src/gnet/gnet.h ../../src/glib/glog.h \
+	gprotocolmessagestore.h gprotocolmessage.h \
+	../../src/glib/gstrings.h gverifier.h ../../src/glib/gpath.h \
+	gnewmessage.h gmessagestore.h gstoredmessage.h \
+	../../src/glib/gexception.h ../../src/glib/gmemory.h \
+	../../src/glib/gstr.h ../../src/glib/gassert.h \
+	../../src/glib/glogoutput.h
+gsasl_native.o: gsasl_native.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits ../../src/gnet/gnet.h gsmtp.h \
+	../../src/glib/glog.h ../../src/gnet/glocal.h \
+	../../src/gnet/gaddress.h ../../src/glib/gexception.h gsasl.h \
+	gsecrets.h ../../src/glib/gpath.h ../../src/glib/gstrings.h \
+	../../src/glib/gstr.h ../../src/glib/gmd5.h \
+	../../src/glib/gdatetime.h ../../src/glib/gmemory.h \
+	../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
+	../../src/glib/gassert.h
+gsecrets.o: gsecrets.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
+	../../src/glib/glog.h gsecrets.h ../../src/glib/gpath.h \
+	../../src/glib/gstrings.h ../../src/glib/gexception.h \
+	../../src/glib/groot.h ../../src/glib/gprocess.h \
+	../../src/glib/gnoncopyable.h gxtext.h ../../src/glib/gstr.h
+gserverprotocol.o: gserverprotocol.cpp ../../src/glib/gdef.h \
+	../../config.h ../../lib/gcc2.95/iostream \
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gsmtp.h \
+	../../src/gnet/gnet.h ../../src/glib/glog.h gserverprotocol.h \
+	gprotocolmessage.h ../../src/glib/gstrings.h gverifier.h \
+	../../src/glib/gpath.h gsasl.h gsecrets.h \
+	../../src/glib/gexception.h ../../src/glib/gstatemachine.h \
+	gbase64.h ../../src/glib/gdate.h ../../src/glib/gdatetime.h \
+	../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
+	../../src/glib/gassert.h ../../src/glib/gtime.h \
+	../../src/glib/gstr.h
+gsmtpclient.o: gsmtpclient.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits ../../src/gnet/gnet.h gsmtp.h \
+	../../src/glib/glog.h ../../src/gnet/glocal.h \
+	../../src/gnet/gaddress.h ../../src/glib/gexception.h \
+	../../src/glib/gfile.h ../../src/glib/gpath.h \
+	../../src/glib/gstrings.h ../../src/glib/gstr.h \
+	../../src/glib/gmemory.h ../../src/gnet/gtimer.h \
+	../../src/glib/gdatetime.h gsmtpclient.h gsecrets.h \
+	../../src/gnet/glinebuffer.h ../../src/gnet/gclient.h \
+	../../src/gnet/gconnection.h ../../src/gnet/gsocket.h \
+	../../src/gnet/gevent.h ../../src/gnet/geventloop.h \
+	../../src/gnet/geventhandler.h ../../src/gnet/gdescriptor.h \
+	gclientprotocol.h gmessagestore.h gnewmessage.h \
+	gstoredmessage.h gsasl.h ../../src/gnet/gresolve.h \
+	../../src/glib/gassert.h ../../src/glib/glogoutput.h
+gsmtpserver.o: gsmtpserver.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
+	../../src/glib/glog.h gsmtpserver.h \
+	../../src/glib/gnoncopyable.h ../../src/gnet/gserver.h \
+	../../src/gnet/gsocket.h ../../src/gnet/gaddress.h \
+	../../src/glib/gexception.h ../../src/gnet/gevent.h \
+	../../src/gnet/geventloop.h ../../src/gnet/geventhandler.h \
+	../../src/glib/gdatetime.h ../../src/gnet/gdescriptor.h \
+	../../src/gnet/gconnection.h ../../src/gnet/glinebuffer.h \
+	../../src/glib/gstrings.h gverifier.h ../../src/glib/gpath.h \
+	gserverprotocol.h gprotocolmessage.h gsasl.h gsecrets.h \
+	../../src/glib/gstatemachine.h gprotocolmessagestore.h \
+	gnewmessage.h gprotocolmessageforward.h gsmtpclient.h \
+	../../src/gnet/gclient.h gclientprotocol.h gmessagestore.h \
+	gstoredmessage.h ../../src/gnet/gtimer.h \
+	../../src/glib/gmemory.h ../../src/gnet/glocal.h \
+	../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
+	../../src/glib/gassert.h
+gstoredfile.o: gstoredfile.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
+	../../src/glib/glog.h gfilestore.h gmessagestore.h \
+	gnewmessage.h gstoredmessage.h ../../src/glib/gstrings.h \
+	../../src/glib/gpath.h ../../src/glib/gexception.h \
+	../../src/glib/gdatetime.h ../../src/glib/gnoncopyable.h \
+	../../src/glib/groot.h ../../src/glib/gprocess.h gstoredfile.h \
+	../../src/glib/gmemory.h gxtext.h ../../src/glib/gfile.h \
+	../../src/glib/gstr.h ../../src/glib/gassert.h \
+	../../src/glib/glogoutput.h
+gstoredmessage.o: gstoredmessage.cpp ../../src/glib/gdef.h \
+	../../config.h ../../lib/gcc2.95/iostream \
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits gsmtp.h \
+	../../src/gnet/gnet.h ../../src/glib/glog.h gstoredmessage.h \
+	../../src/glib/gstrings.h ../../src/glib/gpath.h
+gverifier.o: gverifier.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
+	../../src/glib/glog.h ../../src/glib/gstrings.h gverifier.h \
+	../../src/glib/gpath.h ../../src/glib/gprocess.h \
+	../../src/glib/gexception.h ../../src/glib/gfile.h \
+	../../src/glib/groot.h ../../src/glib/gnoncopyable.h \
+	../../src/glib/gstr.h ../../src/gnet/glocal.h \
+	../../src/gnet/gaddress.h ../../src/glib/gassert.h \
+	../../src/glib/glogoutput.h
+gxtext.o: gxtext.cpp ../../src/glib/gdef.h ../../config.h \
+	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
+	../../src/glib/glog.h gxtext.h ../../src/glib/gassert.h \
+	../../src/glib/glogoutput.h
+
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile $(LIBRARIES)
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
+		mostlyclean-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
+		mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
+		distclean-tags distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
+		maintainer-clean-compile maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/main/gadminserver.cpp b/src/gsmtp/gadminserver.cpp
similarity index 80%
rename from src/main/gadminserver.cpp
rename to src/gsmtp/gadminserver.cpp
index 9854ed1..a86ddbd 100644
--- a/src/main/gadminserver.cpp
+++ b/src/gsmtp/gadminserver.cpp
@@ -23,8 +23,11 @@
 
 #include "gdef.h"
 #include "gnet.h"
+#include "geventloop.h"
 #include "gsmtp.h"
 #include "gadminserver.h"
+#include "gmessagestore.h"
+#include "gstoredmessage.h"
 #include "gmonitor.h"
 #include "gstr.h"
 #include "gmemory.h"
@@ -43,6 +46,7 @@ GSmtp::AdminPeer::AdminPeer( GNet::StreamSocket * s , GNet::Address a , AdminSer
 		m_server(server) ,
 		m_server_address(server_address)
 {
+	G_LOG_S( "GSmtp::AdminPeer: admin connection from " << a.displayString() ) ;
 	// dont prompt() here -- it confuses the poke program
 }
 
@@ -58,6 +62,7 @@ void GSmtp::AdminPeer::clientDone( std::string s )
 
 void GSmtp::AdminPeer::onDelete()
 {
+	G_LOG_S( "GSmtp::AdminPeer: admin connection closed: " << peerAddress().second.displayString() ) ;
 }
 
 void GSmtp::AdminPeer::onData( const char * data , size_t n )
@@ -86,11 +91,21 @@ bool GSmtp::AdminPeer::processLine( const std::string & line )
 		info() ;
 		prompt() ;
 	}
+	else if( is(line,"LIST") )
+	{
+		list() ;
+		prompt() ;
+	}
 	else if( is(line,"QUIT") )
 	{
 		doDelete() ;
 		return false ;
 	}
+	else if( is(line,"TERMINATE") && false )
+	{
+		if( GNet::EventLoop::exists() )
+			GNet::EventLoop::instance().quit() ;
+	}
 	else if( line.find_first_not_of(" \r\n\t") != std::string::npos )
 	{
 		send( "error: unrecognised command" ) ;
@@ -120,7 +135,7 @@ bool GSmtp::AdminPeer::is( const std::string & line_in , const char * key )
 
 void GSmtp::AdminPeer::help()
 {
-	send( "commands: FLUSH, HELP, INFO, QUIT" ) ;
+	send( "commands: FLUSH, HELP, INFO, LIST, QUIT" ) ;
 }
 
 void GSmtp::AdminPeer::flush( const std::string & address )
@@ -160,7 +175,7 @@ void GSmtp::AdminPeer::send( std::string line )
 
 void GSmtp::AdminPeer::info()
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	if( GNet::Monitor::instance() )
 	{
 		GNet::Monitor::instance()->report( ss , "" , crlf() ) ;
@@ -172,6 +187,27 @@ void GSmtp::AdminPeer::info()
 	}
 }
 
+void GSmtp::AdminPeer::list()
+{
+	std::ostringstream ss ;
+	if( MessageStore::exists() )
+	{
+		MessageStore::Iterator iter( MessageStore::instance().iterator(false) ) ;
+		for(;;)
+		{
+			std::auto_ptr<StoredMessage> message( iter.next() ) ;
+			if( message.get() == NULL ) break ;
+			ss << message->name() << crlf() ;
+		}
+	}
+
+	std::string result = ss.str() ;
+	if( result.size() == 0U )
+		send( "<none>" ) ;
+	else
+		send( ss.str() ) ;
+}
+
 // ===
 
 GSmtp::AdminServer::AdminServer( unsigned int port , bool allow_remote , const std::string & address ) :
@@ -187,3 +223,8 @@ GNet::ServerPeer * GSmtp::AdminServer::newPeer( GNet::StreamSocket * s , GNet::A
 	return new AdminPeer( s , a , *this , m_server_address ) ;
 }
 
+void GSmtp::AdminServer::report() const
+{
+	// no-op
+}
+
diff --git a/src/main/gadminserver.h b/src/gsmtp/gadminserver.h
similarity index 97%
rename from src/main/gadminserver.h
rename to src/gsmtp/gadminserver.h
index 7c4fcb0..12950e2 100644
--- a/src/main/gadminserver.h
+++ b/src/gsmtp/gadminserver.h
@@ -38,7 +38,7 @@ namespace GSmtp
 	class AdminPeer ;
 	class AdminServer ;
 	class AdminClient ;
-} ;
+}
 
 // Class: GSmtp::AdminClient
 // Description: A private implementation class.
@@ -72,6 +72,7 @@ private:
 	void flush( const std::string & ) ;
 	void help() ;
 	void info() ;
+	void list() ;
 	void send( std::string ) ;
 	static std::string crlf() ;
 	void prompt() ;
@@ -92,6 +93,9 @@ public:
 	AdminServer( unsigned int port , bool allow_remote , const std::string & server_address ) ;
 		// Constructor.
 
+	void report() const ;
+		// Generates helpful diagnostics.
+
 private:
 	virtual GNet::ServerPeer * newPeer( GNet::StreamSocket * , GNet::Address ) ;
 	AdminServer( const AdminServer & ) ;
diff --git a/src/main/gbase64.cpp b/src/gsmtp/gbase64.cpp
similarity index 99%
rename from src/main/gbase64.cpp
rename to src/gsmtp/gbase64.cpp
index 23fcfca..58b9987 100644
--- a/src/main/gbase64.cpp
+++ b/src/gsmtp/gbase64.cpp
@@ -31,7 +31,7 @@ namespace
 {
 	const char * character_map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" ;
 	char pad = '=' ;
-} ;
+}
 
 g_uint32_t GSmtp::Base64::numeric( char c )
 {
diff --git a/src/main/gbase64.h b/src/gsmtp/gbase64.h
similarity index 99%
rename from src/main/gbase64.h
rename to src/gsmtp/gbase64.h
index 9a077df..4d73701 100644
--- a/src/main/gbase64.h
+++ b/src/gsmtp/gbase64.h
@@ -32,7 +32,7 @@
 namespace GSmtp
 {
 	class Base64 ;
-} ;
+}
 
 // Class: GSmtp::Base64
 // Description: A base64 codec class.
diff --git a/src/main/gclientprotocol.cpp b/src/gsmtp/gclientprotocol.cpp
similarity index 98%
rename from src/main/gclientprotocol.cpp
rename to src/gsmtp/gclientprotocol.cpp
index b28043c..518ad1e 100644
--- a/src/main/gclientprotocol.cpp
+++ b/src/gsmtp/gclientprotocol.cpp
@@ -499,8 +499,10 @@ bool GSmtp::ClientProtocolReply::add( const ClientProtocolReply & other )
 
 bool GSmtp::ClientProtocolReply::textContains( std::string key ) const
 {
-	G::Str::toUpper(key) ;
-	return m_text.find(key) != std::string::npos ;
+	std::string text( m_text ) ;
+	G::Str::toUpper( key ) ;
+	G::Str::toUpper( text ) ;
+	return text.find(key) != std::string::npos ;
 }
 
 // ===
diff --git a/src/main/gclientprotocol.h b/src/gsmtp/gclientprotocol.h
similarity index 99%
rename from src/main/gclientprotocol.h
rename to src/gsmtp/gclientprotocol.h
index 5d28059..8d45fb8 100644
--- a/src/main/gclientprotocol.h
+++ b/src/gsmtp/gclientprotocol.h
@@ -40,7 +40,7 @@ namespace GSmtp
 {
 	class ClientProtocol ;
 	class ClientProtocolReply ;
-} ;
+}
 
 // Class: GSmtp::ClientProtocolReply
 // Description: A private implementation class used
@@ -76,7 +76,7 @@ public:
 		SyntaxError_501 = 501 ,
 		NotImplemented_502 = 502 ,
 		BadSequence_503 = 503 ,
-		Invalid = 0 ,
+		Invalid = 0
 	} ;
 
 	explicit ClientProtocolReply( const std::string & line = std::string() ) ;
diff --git a/src/main/gfilestore.cpp b/src/gsmtp/gfilestore.cpp
similarity index 79%
rename from src/main/gfilestore.cpp
rename to src/gsmtp/gfilestore.cpp
index 149c63f..61bfa6b 100644
--- a/src/main/gfilestore.cpp
+++ b/src/gsmtp/gfilestore.cpp
@@ -23,6 +23,7 @@
 
 #include "gdef.h"
 #include "gsmtp.h"
+#include "gnoncopyable.h"
 #include "gfilestore.h"
 #include "gnewfile.h"
 #include "gstoredfile.h"
@@ -40,7 +41,7 @@
 namespace GSmtp
 {
 	class FileIterator ;
-} ;
+}
 
 // Class: FileIterator
 // Description: A 'body' class for the MessageStore::Iterator
@@ -48,24 +49,23 @@ namespace GSmtp
 // iterators by value, and therefore return them
 // from MessageStore::iterator().
 //
-class GSmtp::FileIterator : public GSmtp:: MessageStore::IteratorImp
+class GSmtp::FileIterator : public GSmtp:: MessageStore::IteratorImp , public G::noncopyable
 {
 public:
-	explicit FileIterator( const G::Directory & dir ) ;
+	FileIterator( FileStore & store , const G::Directory & dir , bool lock ) ;
 	virtual std::auto_ptr<GSmtp::StoredMessage> next() ;
-
 private:
+	FileStore & m_store ;
 	G::DirectoryIterator m_iter ;
-
-private:
-	FileIterator( const FileIterator & ) ;
-	void operator=( const FileIterator & ) ;
+	bool m_lock ;
 } ;
 
 // ===
 
-GSmtp::FileIterator::FileIterator( const G::Directory & dir ) :
-	m_iter( dir , "*.envelope" )
+GSmtp::FileIterator::FileIterator( FileStore & store , const G::Directory & dir , bool lock ) :
+	m_store(store) ,
+	m_iter(dir,"*.envelope") ,
+	m_lock(lock)
 {
 }
 
@@ -73,17 +73,23 @@ std::auto_ptr<GSmtp::StoredMessage> GSmtp::FileIterator::next()
 {
 	while( !m_iter.error() && m_iter.more() )
 	{
-		std::auto_ptr<StoredFile> m( new StoredFile(m_iter.filePath()) ) ;
-		if( m->lock() )
+		std::auto_ptr<StoredFile> m( new StoredFile(m_store,m_iter.filePath()) ) ;
+		if( m_lock && !m->lock() )
 		{
-			std::string reason ;
-			const bool check = true ; // check for no-remote-recipients
-			if( m->readEnvelope(reason,check) && m->openContent(reason) )
-				return std::auto_ptr<StoredMessage>( m.release() ) ;
-
-			m->fail( reason ) ;
+			G_WARNING( "GSmtp::MessageStore: cannot lock file: \"" << m_iter.filePath() << "\"" ) ;
+			continue ;
 		}
-		G_WARNING( "GSmtp::MessageStore: cannot process file: \"" << m_iter.filePath() << "\"" ) ;
+
+		std::string reason ;
+		const bool check = m_lock ; // check for no-remote-recipients
+		bool ok = m->readEnvelope(reason,check) && m->openContent(reason) ;
+		if( ok )
+			return std::auto_ptr<StoredMessage>( m.release() ) ;
+
+		if( m_lock )
+			m->fail( reason ) ;
+		else
+			G_WARNING( "GSmtp::MessageStore: ignoring \"" << m_iter.filePath() << "\": " << reason ) ;
 	}
 	return std::auto_ptr<StoredMessage>(NULL) ;
 }
@@ -162,7 +168,7 @@ G::Path GSmtp::FileStore::envelopeWorkingPath( unsigned long seq ) const
 
 std::string GSmtp::FileStore::filePrefix( unsigned long seq ) const
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << "emailrelay." << G::Process::Id() << "." << m_pid_modifier << "." << seq ;
 	return ss.str() ;
 }
@@ -205,17 +211,17 @@ bool GSmtp::FileStore::emptyCore() const
 	return no_more ;
 }
 
-GSmtp::MessageStore::Iterator GSmtp::FileStore::iterator()
+GSmtp::MessageStore::Iterator GSmtp::FileStore::iterator( bool lock )
 {
 	FileReader claim_reader ;
-	return MessageStore::Iterator( new FileIterator(G::Directory(m_dir) ) ) ;
+	return MessageStore::Iterator( new FileIterator(*this,G::Directory(m_dir),lock) ) ;
 }
 
 std::auto_ptr<GSmtp::StoredMessage> GSmtp::FileStore::get( unsigned long id )
 {
 	G::Path path = envelopePath( id ) ;
 
-	std::auto_ptr<StoredFile> message( new StoredFile(path) ) ;
+	std::auto_ptr<StoredFile> message( new StoredFile(*this,path) ) ;
 
 	if( ! message->lock() )
 		throw GetError( path.str() + ": cannot lock the file" ) ;
@@ -238,10 +244,19 @@ std::auto_ptr<GSmtp::NewMessage> GSmtp::FileStore::newMessage( const std::string
 	return std::auto_ptr<NewMessage>( new NewFile(from,*this) ) ;
 }
 
+void GSmtp::FileStore::updated()
+{
+	onEvent() ;
+}
+
+void GSmtp::FileStore::onEvent()
+{
+	; // default implementation
+}
+
 // ===
 
-GSmtp::FileReader::FileReader() :
-	m_imp(NULL)
+GSmtp::FileReader::FileReader()
 {
 }
 
@@ -252,14 +267,12 @@ GSmtp::FileReader::~FileReader()
 // ===
 
 GSmtp::FileWriter::FileWriter() :
-	m_imp( new G::Root(false) )
+	m_root(false) ,
+	m_umask(G::Process::Umask::Tighter)
 {
-	G::Process::setUmask( false ) ;
 }
 
 GSmtp::FileWriter::~FileWriter()
 {
-	delete m_imp ;
-	G::Process::setUmask( true ) ;
 }
 
diff --git a/src/main/gfilestore.h b/src/gsmtp/gfilestore.h
similarity index 93%
rename from src/main/gfilestore.h
rename to src/gsmtp/gfilestore.h
index 8f864e2..d3ac653 100644
--- a/src/main/gfilestore.h
+++ b/src/gsmtp/gfilestore.h
@@ -40,7 +40,7 @@ namespace GSmtp
 	class FileStore ;
 	class FileReader ;
 	class FileWriter ;
-} ;
+}
 
 // Class: GSmtp::FileStore
 // Description: A concrete implementation of the MessageStore
@@ -88,7 +88,7 @@ public:
 	virtual std::auto_ptr<StoredMessage> get( unsigned long id ) ;
 		// Extracts a stored message.
 
-	virtual MessageStore::Iterator iterator() ;
+	virtual MessageStore::Iterator iterator( bool lock ) ;
 		// Returns an iterator for stored messages.
 
 	virtual std::auto_ptr<NewMessage> newMessage( const std::string & from ) ;
@@ -102,6 +102,14 @@ public:
 		// implemented by this class. If n is -1 then
 		// it returns the previous format (etc.).
 
+	void updated() ;
+		// Called by associated classes to trigger onEvent().
+
+protected:
+	virtual void onEvent() ;
+		// Called when something might have changed. The
+		// default implementation does nothing.
+
 private:
 	static void checkPath( const G::Path & dir ) ;
 	G::Path fullPath( const std::string & filename ) const ;
@@ -129,8 +137,6 @@ class GSmtp::FileReader : public G::noncopyable
 public:
 	FileReader() ;
 	~FileReader() ;
-private:
-	G::Root * m_imp ;
 } ;
 
 // Class: GSmtp::FileWriter
@@ -144,7 +150,8 @@ public:
 	FileWriter() ;
 	~FileWriter() ;
 private:
-	G::Root * m_imp ;
+	G::Root m_root ;
+	G::Process::Umask m_umask ;
 } ;
 
 #endif
diff --git a/src/main/gmessagestore.cpp b/src/gsmtp/gmessagestore.cpp
similarity index 97%
rename from src/main/gmessagestore.cpp
rename to src/gsmtp/gmessagestore.cpp
index 668df97..3e27225 100644
--- a/src/main/gmessagestore.cpp
+++ b/src/gsmtp/gmessagestore.cpp
@@ -48,6 +48,11 @@ GSmtp::MessageStore::~MessageStore()
 		m_this = NULL ;
 }
 
+bool GSmtp::MessageStore::exists()
+{
+	return m_this != NULL ;
+}
+
 // ===
 
 GSmtp::MessageStore::IteratorImp::IteratorImp() :
diff --git a/src/main/gmessagestore.h b/src/gsmtp/gmessagestore.h
similarity index 86%
rename from src/main/gmessagestore.h
rename to src/gsmtp/gmessagestore.h
index cfc5782..713f698 100644
--- a/src/main/gmessagestore.h
+++ b/src/gsmtp/gmessagestore.h
@@ -35,7 +35,7 @@
 namespace GSmtp
 {
 	class MessageStore ;
-} ;
+}
 
 // Class: GSmtp::MessageStore
 // Description: A singleton class which allows SMTP messages
@@ -80,6 +80,9 @@ public:
 	static MessageStore & instance() ;
 		// Singleton access.
 
+	static bool exists() ;
+		// Returns true if an instance exists.
+
 	static G::Path defaultDirectory() ;
 		// Returns a default spool directory, such as
 		// "/usr/local/var/spool/emailrelay". (Typically
@@ -107,19 +110,19 @@ public:
 		// marked as bad, or deleted (if they
 		// have no recipients).
 
-	virtual Iterator iterator() = 0 ;
-		// Returns a read iterator. (Note that copies of
+	virtual Iterator iterator( bool lock ) = 0 ;
+		// Returns an iterator for stored messages. (Note that copies of
 		// iterators share state. For independent iterators
 		// call iterator() for each.)
 		//
-		// Stored messages returned by the iterator are locked.
-		// Normally they are then processed (using
-		// StoredMessage::extractContentStream()) and
-		// then deleted (by StoredMessage::destroy()).
+		// If 'lock' is true then stored messages returned
+		// by the iterator are locked. Normally they are
+		// then processed (using StoredMessage::extractContentStream())
+		// and then deleted (by StoredMessage::destroy()).
 		//
-		// As a side effect of iteration some stored
-		// messages may be marked as bad, or deleted (if
-		// they have no recipients).
+		// As a side effect of iteration when 'lock' is true,
+		// then some stored messages may be marked as bad,
+		// or deleted (if they have no recipients).
 
 private:
 	MessageStore( const MessageStore & ) ;
diff --git a/src/main/gmessagestore_unix.cpp b/src/gsmtp/gmessagestore_unix.cpp
similarity index 100%
rename from src/main/gmessagestore_unix.cpp
rename to src/gsmtp/gmessagestore_unix.cpp
diff --git a/src/main/gmessagestore_win32.cpp b/src/gsmtp/gmessagestore_win32.cpp
similarity index 100%
rename from src/main/gmessagestore_win32.cpp
rename to src/gsmtp/gmessagestore_win32.cpp
diff --git a/src/main/gnewfile.cpp b/src/gsmtp/gnewfile.cpp
similarity index 98%
rename from src/main/gnewfile.cpp
rename to src/gsmtp/gnewfile.cpp
index 78ec22b..45bb4d5 100644
--- a/src/main/gnewfile.cpp
+++ b/src/gsmtp/gnewfile.cpp
@@ -54,6 +54,7 @@ GSmtp::NewFile::NewFile( const std::string & from , FileStore & store ) :
 
 GSmtp::NewFile::~NewFile()
 {
+	m_store.updated() ;
 }
 
 void GSmtp::NewFile::addTo( const std::string & to , bool local )
@@ -164,7 +165,9 @@ bool GSmtp::NewFile::preprocess( const G::Path & path , bool & cancelled )
 int GSmtp::NewFile::preprocessCore( const G::Path & path )
 {
 	G_LOG( "GSmtp::NewFile::preprocess: " << m_preprocessor << " " << path ) ;
-	int exit_code = G::Process::spawn( G::Root::nobody() , m_preprocessor , path.str() ) ;
+	G::Strings args ;
+	args.push_back( path.str() ) ;
+	int exit_code = G::Process::spawn( G::Root::nobody() , m_preprocessor , args ) ;
 	G_LOG( "GSmtp::NewFile::preprocess: exit status " << exit_code ) ;
 	return exit_code ;
 }
diff --git a/src/main/gnewfile.h b/src/gsmtp/gnewfile.h
similarity index 99%
rename from src/main/gnewfile.h
rename to src/gsmtp/gnewfile.h
index 4fee135..59ec2c3 100644
--- a/src/main/gnewfile.h
+++ b/src/gsmtp/gnewfile.h
@@ -34,7 +34,7 @@
 namespace GSmtp
 {
 	class NewFile ;
-} ;
+}
 
 // Class: GSmtp::NewFile
 // Description: A concrete derived class implementing the
diff --git a/src/main/gnewmessage.cpp b/src/gsmtp/gnewmessage.cpp
similarity index 100%
rename from src/main/gnewmessage.cpp
rename to src/gsmtp/gnewmessage.cpp
diff --git a/src/main/gnewmessage.h b/src/gsmtp/gnewmessage.h
similarity index 99%
rename from src/main/gnewmessage.h
rename to src/gsmtp/gnewmessage.h
index 1b19c45..57d4eaa 100644
--- a/src/main/gnewmessage.h
+++ b/src/gsmtp/gnewmessage.h
@@ -31,7 +31,7 @@ namespace GSmtp
 {
 	class NewMessage ;
 	class MessageStoreImp ;
-} ;
+}
 
 // Class: GSmtp::NewMessage
 // Description: An abstract class to allow the creation
diff --git a/src/main/gprotocolmessage.cpp b/src/gsmtp/gprotocolmessage.cpp
similarity index 100%
rename from src/main/gprotocolmessage.cpp
rename to src/gsmtp/gprotocolmessage.cpp
diff --git a/src/main/gprotocolmessage.h b/src/gsmtp/gprotocolmessage.h
similarity index 97%
rename from src/main/gprotocolmessage.h
rename to src/gsmtp/gprotocolmessage.h
index ff62ffa..8f1357d 100644
--- a/src/main/gprotocolmessage.h
+++ b/src/gsmtp/gprotocolmessage.h
@@ -33,7 +33,7 @@
 namespace GSmtp
 {
 	class ProtocolMessage ;
-} ;
+}
 
 // Class: GSmtp::ProtocolMessage
 // Description: An interface used by the ServerProtocol
@@ -90,6 +90,9 @@ public:
 		// Precondition: at least one
 		// successful addTo() call
 
+	virtual std::string from() const = 0 ;
+		// Returns the setFrom() string.
+
 	virtual void process( Callback & callback , const std::string & authenticated_client_id ,
 		const std::string & peer_ip_address ) = 0 ;
 			// Starts asynchronous processing of the
diff --git a/src/main/gprotocolmessageforward.cpp b/src/gsmtp/gprotocolmessageforward.cpp
similarity index 97%
rename from src/main/gprotocolmessageforward.cpp
rename to src/gsmtp/gprotocolmessageforward.cpp
index 7404005..f540b0a 100644
--- a/src/main/gprotocolmessageforward.cpp
+++ b/src/gsmtp/gprotocolmessageforward.cpp
@@ -67,6 +67,11 @@ void GSmtp::ProtocolMessageForward::addText( const std::string & line )
 	m_pm.addText( line ) ;
 }
 
+std::string GSmtp::ProtocolMessageForward::from() const
+{
+	return m_pm.from() ;
+}
+
 void GSmtp::ProtocolMessageForward::process( ProtocolMessage::Callback & callback , const std::string & auth_id ,
 	const std::string & client_ip )
 {
diff --git a/src/main/gprotocolmessageforward.h b/src/gsmtp/gprotocolmessageforward.h
similarity index 97%
rename from src/main/gprotocolmessageforward.h
rename to src/gsmtp/gprotocolmessageforward.h
index 0906e30..3837a24 100644
--- a/src/main/gprotocolmessageforward.h
+++ b/src/gsmtp/gprotocolmessageforward.h
@@ -36,7 +36,7 @@
 namespace GSmtp
 {
 	class ProtocolMessageForward ;
-} ;
+}
 
 // Class: GSmtp::ProtocolMessageForward
 // Description: A concrete implementation of the ProtocolMessage
@@ -75,6 +75,9 @@ public:
 	virtual void addText( const std::string & ) ;
 		// See ProtocolMessage.
 
+	virtual std::string from() const ;
+		// See ProtocolMessage.
+
 	virtual void process( ProtocolMessage::Callback & callback , const std::string & auth_id ,
 		const std::string & client_ip ) ;
 			// See ProtocolMessage.
diff --git a/src/main/gprotocolmessagestore.cpp b/src/gsmtp/gprotocolmessagestore.cpp
similarity index 89%
rename from src/main/gprotocolmessagestore.cpp
rename to src/gsmtp/gprotocolmessagestore.cpp
index 29f406c..aa276f8 100644
--- a/src/main/gprotocolmessagestore.cpp
+++ b/src/gsmtp/gprotocolmessagestore.cpp
@@ -41,6 +41,7 @@ GSmtp::ProtocolMessageStore::~ProtocolMessageStore()
 void GSmtp::ProtocolMessageStore::clear()
 {
 	m_msg <<= 0 ;
+	m_from.erase() ;
 }
 
 bool GSmtp::ProtocolMessageStore::setFrom( const std::string & from )
@@ -56,6 +57,7 @@ bool GSmtp::ProtocolMessageStore::setFrom( const std::string & from )
 		std::auto_ptr<NewMessage> new_message( MessageStore::instance().newMessage(from) ) ;
 		m_msg <<= new_message.release() ;
 
+		m_from = from ;
 		return true ;
 	}
 	catch( std::exception & e )
@@ -70,16 +72,14 @@ bool GSmtp::ProtocolMessageStore::addTo( const std::string & to , Verifier::Stat
 	G_ASSERT( m_msg.get() != NULL ) ;
 	if( to.length() > 0U && m_msg.get() != NULL )
 	{
-		const bool is_local = to_status.is_local ;
-		const bool is_valid = is_local && to_status.full_name.length() != 0U  ;
-		if( is_local && !is_valid )
+		if( !to_status.is_valid )
 		{
-			G_WARNING( "GSmtp::ProtocolMessage: rejecting local recipent (not postmaster): " << to ) ;
+			G_WARNING( "GSmtp::ProtocolMessage: rejecting recipient \"" << to << "\": " << to_status.reason ) ;
 			return false ;
 		}
 		else
 		{
-			m_msg->addTo( to_status.address , is_local ) ;
+			m_msg->addTo( to_status.address , to_status.is_local ) ;
 			return true ;
 		}
 	}
@@ -101,6 +101,11 @@ void GSmtp::ProtocolMessageStore::addText( const std::string & line )
 		m_msg->addText( line ) ;
 }
 
+std::string GSmtp::ProtocolMessageStore::from() const
+{
+	return m_msg.get() ? m_from : std::string() ;
+}
+
 void GSmtp::ProtocolMessageStore::process( Callback & callback , const std::string & auth_id ,
 	const std::string & client_ip )
 {
diff --git a/src/main/gprotocolmessagestore.h b/src/gsmtp/gprotocolmessagestore.h
similarity index 96%
rename from src/main/gprotocolmessagestore.h
rename to src/gsmtp/gprotocolmessagestore.h
index 07a1767..17b59fb 100644
--- a/src/main/gprotocolmessagestore.h
+++ b/src/gsmtp/gprotocolmessagestore.h
@@ -34,7 +34,7 @@
 namespace GSmtp
 {
 	class ProtocolMessageStore ;
-} ;
+}
 
 // Class: GSmtp::ProtocolMessageStore
 // Description: A concrete implementation of the
@@ -66,6 +66,9 @@ public:
 	virtual void addText( const std::string & ) ;
 		// See ProtocolMessage.
 
+	virtual std::string from() const ;
+		// See ProtocolMessage.
+
 	virtual void process( ProtocolMessage::Callback & callback , const std::string & auth_id ,
 		const std::string & client_ip ) ;
 			// See ProtocolMessage.
@@ -75,6 +78,7 @@ private:
 
 private:
 	std::auto_ptr<NewMessage> m_msg ;
+	std::string m_from ;
 } ;
 
 #endif
diff --git a/src/main/gsasl.h b/src/gsmtp/gsasl.h
similarity index 99%
rename from src/main/gsasl.h
rename to src/gsmtp/gsasl.h
index 8598ae2..e81a02e 100644
--- a/src/main/gsasl.h
+++ b/src/gsmtp/gsasl.h
@@ -41,7 +41,7 @@ namespace GSmtp
 	class SaslClientImp ;
 	class SaslServer ;
 	class SaslServerImp ;
-} ;
+}
 
 // Class: GSmtp::Sasl
 // Description: A singleton class representing the SASL library.
@@ -188,7 +188,7 @@ public:
 	std::string preferred( const G::Strings & mechanisms ) const ;
 		// Returns the name of the preferred mechanism taken from
 		// the given set. Returns the empty string if none is
-		// supported.
+		// supported or if not active().
 
 private:
 	SaslClient( const SaslClient & ) ; // not implemented
diff --git a/src/main/gsasl_cyrus.cpp b/src/gsmtp/gsasl_cyrus.cpp
similarity index 98%
rename from src/main/gsasl_cyrus.cpp
rename to src/gsmtp/gsasl_cyrus.cpp
index c0f1886..805f0c3 100644
--- a/src/main/gsasl_cyrus.cpp
+++ b/src/gsmtp/gsasl_cyrus.cpp
@@ -24,8 +24,7 @@
 // SASL library (http://www.cmu.edu/computing).
 //
 // This is work-in-progress which will probably never get completed because
-// the cyrus documentation is useless. Perhaps Carnegie Mellon should teach
-// its students how to write an API spec before letting them loose on code.
+// the cyrus documentation is not good enough.
 //
 
 #include "gdef.h"
diff --git a/src/main/gsasl_native.cpp b/src/gsmtp/gsasl_native.cpp
similarity index 95%
rename from src/main/gsasl_native.cpp
rename to src/gsmtp/gsasl_native.cpp
index c6c808f..aaaaac1 100644
--- a/src/main/gsasl_native.cpp
+++ b/src/gsmtp/gsasl_native.cpp
@@ -37,7 +37,7 @@ namespace
 {
 	const char * login_challenge_1 = "Username:" ;
 	const char * login_challenge_2 = "Password:" ;
-} ;
+}
 
 // ===
 
@@ -75,7 +75,7 @@ void GSmtp::SaslServerImp::init( const std::string & mechanism )
 
 	if( m_mechanism == "CRAM-MD5" )
 	{
-		std::stringstream ss ;
+		std::ostringstream ss ;
 		ss << "<" << ::rand() << "." << G::DateTime::now() << "@" << GNet::Local::fqdn() << ">" ;
 		m_challenge = ss.str() ;
 	}
@@ -272,6 +272,13 @@ std::string GSmtp::SaslClient::response( const std::string & mechanism ,
 
 std::string GSmtp::SaslClient::preferred( const G::Strings & mechanism_list ) const
 {
+	// short-circuit if no secrets
+	//
+	if( !active() )
+		return std::string() ;
+
+	// look for cram-md5 and login in the list
+	//
 	const std::string login( "LOGIN" ) ;
 	const std::string cram( "CRAM-MD5" ) ;
 	bool has_login = false ;
@@ -287,20 +294,24 @@ std::string GSmtp::SaslClient::preferred( const G::Strings & mechanism_list ) co
 			has_cram = true ;
 	}
 
+	// prefer cram-md5 over login...
+	//
 	std::string result = has_cram ? cram : ( has_login ? login : std::string() ) ;
+
+	// ... but only if a secret is defined for it
+	//
 	if( !result.empty() && Sasl::instance().clientSecrets().id(result).empty() )
 	{
-		G_WARNING( "GSmtp::SaslClient: no \"" << result << " client\" entry in secrets file" ) ;
 		result = std::string() ;
 		if( has_cram && has_login )
 		{
 			result = login ;
 			if( Sasl::instance().clientSecrets().id(login).empty() )
-			{
-				G_WARNING( "GSmtp::SaslClient: no \"login client\" entry in secrets file" ) ;
 				result = std::string() ;
-			}
 		}
+		static bool first = true ;
+		if( first ) G_WARNING( "GSmtp::SaslClient: missing \"login\" or \"cram-md5\" entry in secrets file" ) ;
+		first = false ;
 	}
 	return result ;
 }
diff --git a/src/main/gsecrets.cpp b/src/gsmtp/gsecrets.cpp
similarity index 100%
rename from src/main/gsecrets.cpp
rename to src/gsmtp/gsecrets.cpp
diff --git a/src/main/gsecrets.h b/src/gsmtp/gsecrets.h
similarity index 99%
rename from src/main/gsecrets.h
rename to src/gsmtp/gsecrets.h
index fa6dbe2..c34ff13 100644
--- a/src/main/gsecrets.h
+++ b/src/gsmtp/gsecrets.h
@@ -34,7 +34,7 @@
 namespace GSmtp
 {
 	class Secrets ;
-} ;
+}
 
 // Class: GSmtp::Secrets
 // Description: A simple interface to a store of secrets as used in
diff --git a/src/main/gserverprotocol.cpp b/src/gsmtp/gserverprotocol.cpp
similarity index 98%
rename from src/main/gserverprotocol.cpp
rename to src/gsmtp/gserverprotocol.cpp
index e33b756..fcd4d2d 100644
--- a/src/main/gserverprotocol.cpp
+++ b/src/gsmtp/gserverprotocol.cpp
@@ -74,7 +74,7 @@ void GSmtp::ServerProtocol::init( const std::string & ident )
 
 void GSmtp::ServerProtocol::sendGreeting( const std::string & thishost , const std::string & ident )
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << "220 " << thishost << " -- " << ident << " -- Service ready" ;
 	send( ss.str() ) ;
 }
@@ -313,7 +313,7 @@ void GSmtp::ServerProtocol::doMail( const std::string & line , bool & predicate
 void GSmtp::ServerProtocol::doRcpt( const std::string & line , bool & predicate )
 {
 	std::string to = parseTo( line ) ;
-	bool ok = m_pmessage.addTo( to , m_verifier.verify(to) ) ;
+	bool ok = m_pmessage.addTo( to , m_verifier.verify(to,m_pmessage.from()) ) ;
 	predicate = ok ;
 	if( ok )
 		sendRcptReply() ;
@@ -469,7 +469,7 @@ void GSmtp::ServerProtocol::sendBadTo( const std::string & to )
 
 void GSmtp::ServerProtocol::sendEhloReply( const std::string & domain )
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 		ss << "250-" << domain << " says hello" << crlf() ;
 	if( m_sasl.active() )
 		ss << "250-AUTH " << m_sasl.mechanisms() << crlf() ;
@@ -558,9 +558,9 @@ std::string GSmtp::ServerProtocol::receivedLine() const
 	G::Date date( tm ) ;
 	G::Time time( tm ) ;
 
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss
-		<< "Reveived: "
+		<< "Received: "
 		<< "FROM " << m_peer_name << " "
 		<< "([" << m_peer_address << "]) "
 		<< "BY " << m_thishost << " "
diff --git a/src/main/gserverprotocol.h b/src/gsmtp/gserverprotocol.h
similarity index 99%
rename from src/main/gserverprotocol.h
rename to src/gsmtp/gserverprotocol.h
index b54b7e5..15e312f 100644
--- a/src/main/gserverprotocol.h
+++ b/src/gsmtp/gserverprotocol.h
@@ -35,7 +35,7 @@
 namespace GSmtp
 {
 	class ServerProtocol ;
-} ;
+}
 
 // Class: GSmtp::ServerProtocol
 // Description: Implements the SMTP server-side protocol.
diff --git a/src/main/gsmtp.h b/src/gsmtp/gsmtp.h
similarity index 100%
rename from src/main/gsmtp.h
rename to src/gsmtp/gsmtp.h
diff --git a/src/main/gsmtpclient.cpp b/src/gsmtp/gsmtpclient.cpp
similarity index 86%
rename from src/main/gsmtpclient.cpp
rename to src/gsmtp/gsmtpclient.cpp
index b98163b..6a63f3d 100644
--- a/src/main/gsmtpclient.cpp
+++ b/src/gsmtp/gsmtpclient.cpp
@@ -37,7 +37,7 @@
 namespace
 {
 	const bool must_authenticate = true ;
-} ;
+}
 
 unsigned int GSmtp::Client::m_response_timeout = 0U ;
 unsigned int GSmtp::Client::m_connection_timeout = 0U ;
@@ -91,7 +91,7 @@ std::string GSmtp::Client::init( const std::string & host , const std::string &
 	if( m_store != NULL && m_store->empty() )
 		return "no messages to send" ;
 
-	doStatusChange( "connecting" , host ) ;
+	raiseEvent( "connecting" , host ) ;
 
 	if( m_connection_timeout != 0U )
 		m_connect_timer.startTimer( m_connection_timeout ) ;
@@ -103,7 +103,7 @@ std::string GSmtp::Client::init( const std::string & host , const std::string &
 
 bool GSmtp::Client::busy() const
 {
-	return connected() ; // GNet::Client::connected()
+	return m_callback != NULL ; // (was GNet::Client::connected())
 }
 
 bool GSmtp::Client::protocolSend( const std::string & line )
@@ -116,7 +116,7 @@ bool GSmtp::Client::protocolSend( const std::string & line )
 			blocked() ;
 		return false ;
 	}
-	else if( rc < 0 || static_cast<size_t>(rc) < line.length() )
+	else if( static_cast<size_t>(rc) < line.length() )
 	{
 		m_pending = line.substr(rc) ;
 		blocked() ; // GNet::Client::blocked() => addWriteHandler()
@@ -132,13 +132,13 @@ void GSmtp::Client::onConnect( GNet::Socket & socket )
 {
 	m_connect_timer.cancelTimer() ;
 
-	doStatusChange( "connected" ,
+	raiseEvent( "connected" ,
 		socket.getPeerAddress().second.displayString() ) ;
 
 	m_socket = &socket ;
 	if( m_store != NULL )
 	{
-		m_iter = m_store->iterator() ;
+		m_iter = m_store->iterator(true) ;
 		if( !sendNext() )
 			finish() ;
 	}
@@ -173,14 +173,15 @@ bool GSmtp::Client::sendNext()
 void GSmtp::Client::start( StoredMessage & message )
 {
 	m_message_index++ ;
-	doStatusChange( "sending" , G::Str::fromUInt(m_message_index) ) ; // or G::Str::join(message.to(),",") or whatever
+	raiseEvent( "sending" , message.name() ) ;
 
 	std::string server_name = peerName() ; // (from GNet::Client)
 	if( server_name.empty() )
 		server_name = m_host ;
 
+	std::auto_ptr<std::istream> content_stream( message.extractContentStream() ) ;
 	m_protocol.start( message.from() , message.to() , message.eightBit() ,
-		message.authentication() , server_name , message.extractContentStream() , *this ) ;
+		message.authentication() , server_name , content_stream , *this ) ;
 }
 
 void GSmtp::Client::protocolDone( bool ok , bool abort , const std::string & reason )
@@ -245,16 +246,16 @@ void GSmtp::Client::doCallback( const std::string & reason )
 {
 	if( m_callback != NULL )
 	{
-		m_callback->clientStatusChange( "done" , "" ) ;
+		m_callback->clientEvent( "done" , reason ) ;
 		m_callback->clientDone( reason ) ;
 		m_callback = NULL ;
 	}
 }
 
-void GSmtp::Client::doStatusChange( const std::string & s1 , const std::string & s2 )
+void GSmtp::Client::raiseEvent( const std::string & s1 , const std::string & s2 )
 {
 	if( m_callback != NULL )
-		m_callback->clientStatusChange( s1 , s2 ) ;
+		m_callback->clientEvent( s1 , s2 ) ;
 }
 
 void GSmtp::Client::onWriteable()
@@ -282,7 +283,7 @@ unsigned int GSmtp::Client::connectionTimeout( unsigned int new_timeout )
 void GSmtp::Client::onTimeout( GNet::Timer & )
 {
 	//G_ASSERT( &timer == &m_connect_timer ) ;
-	doCallback( "timeout while connecting to server" ) ;
+	doCallback( "connection timeout" ) ;
 }
 
 // ===
@@ -291,10 +292,8 @@ GSmtp::Client::ClientCallback::~ClientCallback()
 {
 }
 
-void GSmtp::Client::ClientCallback::clientStatusChange( const std::string & s1 ,
-	const std::string & s2 )
+void GSmtp::Client::ClientCallback::clientEvent( const std::string & ,
+	const std::string & )
 {
-	(void) s1.length() ; (void) s2.length() ; // pacify the compiler
-	G_DEBUG( "GSmtp::Client::ClientCallback::clientStatusChange: \"" << s1 << "\": \"" << s2 << "\"" ) ;
 }
 
diff --git a/src/main/gsmtpclient.h b/src/gsmtp/gsmtpclient.h
similarity index 93%
rename from src/main/gsmtpclient.h
rename to src/gsmtp/gsmtpclient.h
index 4f8f643..ab80736 100644
--- a/src/main/gsmtpclient.h
+++ b/src/gsmtp/gsmtpclient.h
@@ -44,7 +44,7 @@ namespace GSmtp
 {
 	class Client ;
 	class ClientProtocol ;
-} ;
+}
 
 // Class: GSmtp::Client
 // Description: A class which acts as an SMTP client, extracting
@@ -60,7 +60,7 @@ public:
 	class ClientCallback // A callback interface used by GSmtp::Client.
 	{
 		public: virtual void clientDone( std::string ) = 0 ;
-		public: virtual void clientStatusChange( const std::string & , const std::string & ) ;
+		public: virtual void clientEvent( const std::string & , const std::string & ) ;
 		public: virtual ~ClientCallback() ;
 		private: void operator=( const ClientCallback & ) ; // not implemented
 	} ;
@@ -96,8 +96,10 @@ public:
 		// string on success.
 
 	bool busy() const ;
-		// Returns true if the client is still
-		// busy processing messages.
+		// Returns true after construction and while
+		// message processing is going on. Returns
+		// false once the clientDone() callback
+		// has been fired.
 
 	static unsigned int responseTimeout( unsigned int new_timeout ) ;
 		// Sets the response timeout value. Returns the
@@ -123,7 +125,7 @@ private:
 	bool sendNext() ;
 	void start( StoredMessage & ) ;
 	void doCallback( const std::string & ) ;
-	void doStatusChange( const std::string & , const std::string & ) ;
+	void raiseEvent( const std::string & , const std::string & ) ;
 	void finish( const std::string & reason = std::string() ) ;
 
 private:
diff --git a/src/main/gsmtpserver.cpp b/src/gsmtp/gsmtpserver.cpp
similarity index 76%
rename from src/main/gsmtpserver.cpp
rename to src/gsmtp/gsmtpserver.cpp
index fbeb436..419a72b 100644
--- a/src/main/gsmtpserver.cpp
+++ b/src/gsmtp/gsmtpserver.cpp
@@ -34,14 +34,16 @@
 #include <string>
 
 GSmtp::ServerPeer::ServerPeer( GNet::StreamSocket * socket , GNet::Address peer_address ,
-	Server & server , std::auto_ptr<ProtocolMessage> pmessage , const std::string & ident ) :
+	Server & server , std::auto_ptr<ProtocolMessage> pmessage , const std::string & ident ,
+	const Verifier & verifier ) :
 		GNet::ServerPeer( socket , peer_address ) ,
 		m_server( server ) ,
 		m_buffer( crlf() ) ,
+		m_verifier( verifier ) ,
 		m_pmessage( pmessage ) ,
 		m_protocol( *this, m_verifier, *m_pmessage.get(), thishost(), peer_address.displayString(false) )
 {
-	G_LOG_S( "GSmtp::ServerPeer: new connection from " << peer_address.displayString() ) ;
+	G_LOG_S( "GSmtp::ServerPeer: smtp connection from " << peer_address.displayString() ) ;
 	m_protocol.init( ident ) ;
 }
 
@@ -57,7 +59,7 @@ std::string GSmtp::ServerPeer::crlf()
 
 void GSmtp::ServerPeer::onDelete()
 {
-	G_DEBUG( "GSmtp::ServerPeer: peer disconnected" ) ;
+	G_LOG_S( "GSmtp::ServerPeer: smtp connection closed: " << peerAddress().second.displayString() ) ;
 }
 
 void GSmtp::ServerPeer::onData( const char * p , size_t n )
@@ -83,7 +85,7 @@ void GSmtp::ServerPeer::protocolSend( const std::string & line )
 		return ;
 
 	ssize_t rc = socket().write( line.data() , line.length() ) ;
-	if( rc == -1 && ! socket().eWouldBlock() )
+	if( rc < 0 && ! socket().eWouldBlock() )
 	{
 		doDelete() ; // onDelete() and "delete this"
 	}
@@ -103,42 +105,61 @@ void GSmtp::ServerPeer::protocolSend( const std::string & line )
 
 void GSmtp::ServerPeer::protocolDone()
 {
-	G_LOG_S( "GSmtp::ServerPeer: disconnecting from " << peerAddress().second.displayString() ) ;
+	G_DEBUG( "GSmtp::ServerPeer: disconnecting from " << peerAddress().second.displayString() ) ;
 	doDelete() ; // onDelete() and "delete this"
 }
 
 // ===
 
-GSmtp::Server::Server( unsigned int port , bool allow_remote , const std::string & ident ,
-	const std::string & downstream_server ) :
+GSmtp::Server::Server( unsigned int port , const AddressList & interfaces ,
+	bool allow_remote , const std::string & ident ,
+	const std::string & downstream_server , const Verifier & verifier ) :
 		m_ident( ident ) ,
 		m_allow_remote( allow_remote ) ,
 		m_downstream_server(downstream_server) ,
+		m_verifier(verifier) ,
 		m_gnet_server_1( *this ) ,
 		m_gnet_server_2( *this ) ,
 		m_gnet_server_3( *this )
 {
-	// hacking opportunity to listen on specific hard-coded interfaces...
-	bool normal = true ;
-	if( normal )
+	if( interfaces.size() == 0U )
 	{
 		bind( m_gnet_server_1 , GNet::Address(port) , port ) ;
 	}
 	else
 	{
-		bind( m_gnet_server_1 , GNet::Address("192.168.0.1:0") , port ) ;
-		bind( m_gnet_server_2 , GNet::Address("192.168.0.2:0") , port ) ;
-		bind( m_gnet_server_3 , GNet::Address("192.168.0.3:0") , port ) ;
+		size_t i = 0U ;
+		for( AddressList::const_iterator p = interfaces.begin() ; p != interfaces.end() ; ++p , ++i )
+		{
+			bind( imp(i) , *p , port ) ;
+		}
 	}
 }
 
 void GSmtp::Server::bind( GSmtp::ServerImp & gnet_server , GNet::Address address , unsigned int port )
 {
-	address.setPort(port) ;
-	G_LOG_S( "GSmtp::Server::bind: listening on " << address.displayString() ) ;
+	address.setPort( port ) ;
 	gnet_server.init( address ) ;
 }
 
+GSmtp::ServerImp & GSmtp::Server::imp( size_t i )
+{
+	G_ASSERT( i < 3U ) ;
+	if( i >= 3U ) throw Overflow() ;
+	ServerImp * p[] = { &m_gnet_server_1 , &m_gnet_server_2 , &m_gnet_server_3 } ;
+	return *(p[i]) ;
+}
+
+void GSmtp::Server::report() const
+{
+	for( size_t i = 0U ; i < 3U ; i++ )
+	{
+		Server * This = const_cast<Server*>(this) ;
+		if( This->imp(i).address().first )
+			G_LOG_S( "GSmtp::Server: listening on " << This->imp(i).address().second.displayString() ) ;
+	}
+}
+
 GNet::ServerPeer * GSmtp::Server::newPeer( GNet::StreamSocket * socket , GNet::Address peer_address )
 {
 	std::auto_ptr<GNet::StreamSocket> socket_ptr(socket) ;
@@ -161,7 +182,7 @@ GNet::ServerPeer * GSmtp::Server::newPeer( GNet::StreamSocket * socket , GNet::A
 			static_cast<ProtocolMessage*>(new ProtocolMessageForward(m_downstream_server)) :
 			static_cast<ProtocolMessage*>(new ProtocolMessageStore) ) ;
 
-	return new ServerPeer( socket_ptr.release() , peer_address , *this , pmessage , m_ident ) ;
+	return new ServerPeer( socket_ptr.release() , peer_address , *this , pmessage , m_ident , m_verifier ) ;
 }
 
 // ===
diff --git a/src/main/gsmtpserver.h b/src/gsmtp/gsmtpserver.h
similarity index 77%
rename from src/main/gsmtpserver.h
rename to src/gsmtp/gsmtpserver.h
index da3f2f8..03bbfb0 100644
--- a/src/main/gsmtpserver.h
+++ b/src/gsmtp/gsmtpserver.h
@@ -26,32 +26,36 @@
 
 #include "gdef.h"
 #include "gsmtp.h"
+#include "gnoncopyable.h"
 #include "gserver.h"
 #include "glinebuffer.h"
 #include "gverifier.h"
 #include "gserverprotocol.h"
 #include "gprotocolmessage.h"
+#include "gexception.h"
 #include <string>
 #include <sstream>
 #include <memory>
+#include <list>
 
 namespace GSmtp
 {
 	class Server ;
 	class ServerPeer ;
 	class ServerImp ;
-} ;
+}
 
 // Class: GSmtp::ServerPeer
 // Description: Represents a connection from an SMTP client.
 // Instances are created on the heap by Server (only).
-// See also: Server
+// See also: GSmtp::Server
 //
 class GSmtp::ServerPeer : public GNet::ServerPeer , private GSmtp:: ServerProtocol::Sender
 {
 public:
 	ServerPeer( GNet::StreamSocket * socket , GNet::Address address ,
-		Server & server , std::auto_ptr<ProtocolMessage> pmessage , const std::string & ident ) ;
+		Server & server , std::auto_ptr<ProtocolMessage> pmessage ,
+		const std::string & ident , const Verifier & verifier ) ;
 			// Constructor.
 
 private:
@@ -63,11 +67,11 @@ private:
 	virtual void onData( const char * , size_t ) ; // from GNet::ServerPeer
 	bool processLine( const std::string & line ) ;
 	std::string thishost() const ;
+	static std::string crlf() ;
 
 private:
 	Server & m_server ;
 	GNet::LineBuffer m_buffer ;
-	static std::string crlf() ;
 	Verifier m_verifier ; // order dependency -- first
 	std::auto_ptr<ProtocolMessage> m_pmessage ; // order dependency -- second
 	ServerProtocol m_protocol ; // order dependency -- third
@@ -96,31 +100,42 @@ private:
 // Class: GSmtp::Server
 // Description: An SMTP server class.
 //
-class GSmtp::Server
+class GSmtp::Server : public G::noncopyable
 {
 public:
-	Server( unsigned int port , bool allow_remote , const std::string & ident ,
-		const std::string & downstream_server_address ) ;
-			// Constructor.
+	typedef std::list<GNet::Address> AddressList ;
+	G_EXCEPTION( Overflow , "too many interface addresses" ) ;
+
+	Server( unsigned int port , const AddressList & interfaces ,
+		bool allow_remote , const std::string & ident ,
+		const std::string & downstream_server_address ,
+		const Verifier & verifier ) ;
+			// Constructor. Listens on the given port number
+			// using INET_ANY if 'interfaces' is empty, or
+			// on specific interfaces otherwise. Currently
+			// only three interface addresses are supported.
 			//
 			// If the 'downstream-server-address' parameter is
 			// given then all messages are forwarded immediately.
 
+	void report() const ;
+		// Generates helpful diagnostics after construction.
+
 	GNet::ServerPeer * newPeer( GNet::StreamSocket * , GNet::Address ) ;
 		// ServerPeer factory method used by ServerImp.
 
 private:
-	Server( const Server & ) ;
-	void operator=( const Server & ) ;
 	void bind( ServerImp & , GNet::Address , unsigned int ) ;
+	ServerImp & imp( size_t n ) ;
 
 private:
 	std::string m_ident ;
 	bool m_allow_remote ;
 	std::string m_downstream_server ;
+	Verifier m_verifier ;
 	ServerImp m_gnet_server_1 ;
-	ServerImp m_gnet_server_2 ; // not used
-	ServerImp m_gnet_server_3 ; // not used
+	ServerImp m_gnet_server_2 ;
+	ServerImp m_gnet_server_3 ;
 } ;
 
 #endif
diff --git a/src/main/gstoredfile.cpp b/src/gsmtp/gstoredfile.cpp
similarity index 93%
rename from src/main/gstoredfile.cpp
rename to src/gsmtp/gstoredfile.cpp
index 329f554..19fb41b 100644
--- a/src/main/gstoredfile.cpp
+++ b/src/gsmtp/gstoredfile.cpp
@@ -33,18 +33,27 @@
 #include "gassert.h"
 #include <fstream>
 
-GSmtp::StoredFile::StoredFile( const G::Path & path ) :
+GSmtp::StoredFile::StoredFile( FileStore & store , const G::Path & path ) :
+	m_store(store) ,
 	m_envelope_path(path) ,
 	m_eight_bit(false) ,
 	m_errors(0U)
 {
-	G_DEBUG( "StoredFile: \"" << path << "\"" ) ;
+	m_name = m_envelope_path.basename() ;
+	size_t pos = m_name.rfind(".envelope") ;
+	if( pos != std::string::npos ) m_name.erase( pos ) ;
+	G_DEBUG( "StoredFile: \"" << m_name << "\"" ) ;
 }
 
 GSmtp::StoredFile::~StoredFile()
 {
 }
 
+std::string GSmtp::StoredFile::name() const
+{
+	return m_name ;
+}
+
 bool GSmtp::StoredFile::eightBit() const
 {
 	return m_eight_bit ;
@@ -296,10 +305,13 @@ std::auto_ptr<std::istream> GSmtp::StoredFile::extractContentStream()
 
 G::Path GSmtp::StoredFile::contentPath() const
 {
-	G::Path path( m_envelope_path ) ; // "foo.envelope.busy"
-	path.removeExtension() ; // "foo.envelope"
-	path.setExtension( "content" ) ; // "foo.content"
-	return path ;
+	std::string e( ".envelope" ) ;
+	std::string s = m_envelope_path.str() ;
+	size_t pos = s.rfind( e ) ;
+	if( pos == std::string::npos ) throw InvalidFilename(s) ;
+	s.erase( pos ) ;
+	s.append( ".content" ) ;
+	return G::Path( s ) ;
 }
 
 size_t GSmtp::StoredFile::remoteRecipientCount() const
diff --git a/src/main/gstoredfile.h b/src/gsmtp/gstoredfile.h
similarity index 94%
rename from src/main/gstoredfile.h
rename to src/gsmtp/gstoredfile.h
index 775ff81..8d1661d 100644
--- a/src/main/gstoredfile.h
+++ b/src/gsmtp/gstoredfile.h
@@ -37,7 +37,7 @@
 namespace GSmtp
 {
 	class StoredFile ;
-} ;
+}
 
 // Class: GSmtp::StoredFile
 // Description: A concete derived class implementing the
@@ -52,8 +52,9 @@ public:
 	G_EXCEPTION( NoRecipients , "no remote recipients" ) ;
 	G_EXCEPTION( OpenError , "cannot open the envelope" ) ;
 	G_EXCEPTION( StreamError , "envelope reading/parsing error" ) ;
+	G_EXCEPTION( InvalidFilename , "invalid filename" ) ;
 
-	explicit StoredFile( const G::Path & envelope_path ) ;
+	StoredFile( FileStore & store , const G::Path & envelope_path ) ;
 		// Constructor.
 
 	virtual ~StoredFile() ;
@@ -71,6 +72,9 @@ public:
 		// Opens the content file. Returns false on error.
 		// Used by FileStore and FileIterator.
 
+	virtual std::string name() const ;
+		// From StoredMessage.
+
 	virtual bool eightBit() const ;
 		// From StoredMessage.
 
@@ -116,10 +120,12 @@ private:
 	void readEnvelopeCore( bool ) ;
 
 private:
+	FileStore & m_store ;
 	G::Strings m_to_local ;
 	G::Strings m_to_remote ;
 	std::string m_from ;
 	G::Path m_envelope_path ;
+	std::string m_name ;
 	std::auto_ptr<std::istream> m_content ;
 	bool m_eight_bit ;
 	std::string m_authentication ;
diff --git a/src/main/gstoredmessage.cpp b/src/gsmtp/gstoredmessage.cpp
similarity index 100%
rename from src/main/gstoredmessage.cpp
rename to src/gsmtp/gstoredmessage.cpp
diff --git a/src/main/gstoredmessage.h b/src/gsmtp/gstoredmessage.h
similarity index 95%
rename from src/main/gstoredmessage.h
rename to src/gsmtp/gstoredmessage.h
index f5b162c..1bc711f 100644
--- a/src/main/gstoredmessage.h
+++ b/src/gsmtp/gstoredmessage.h
@@ -32,7 +32,7 @@
 namespace GSmtp
 {
 	class StoredMessage ;
-} ;
+}
 
 // Class: GSmtp::StoredMessage
 // Description: An abstract class for messages which have
@@ -42,6 +42,9 @@ namespace GSmtp
 class GSmtp::StoredMessage
 {
 public:
+	virtual std::string name() const = 0 ;
+		// Returns some sort of unique identifier for the message.
+
 	virtual const std::string & from() const = 0 ;
 		// Returns the envelope 'from' field.
 
diff --git a/src/gsmtp/gverifier.cpp b/src/gsmtp/gverifier.cpp
new file mode 100644
index 0000000..ba73799
--- /dev/null
+++ b/src/gsmtp/gverifier.cpp
@@ -0,0 +1,131 @@
+//
+// Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// ===
+//
+// gverifier.cpp
+//
+
+#include "gdef.h"
+#include "gsmtp.h"
+#include "gstrings.h"
+#include "gverifier.h"
+#include "gprocess.h"
+#include "gfile.h"
+#include "groot.h"
+#include "gstr.h"
+#include "glocal.h"
+#include "gassert.h"
+#include "glog.h"
+
+GSmtp::Verifier::Verifier( const G::Path & path ) :
+	m_path(path)
+{
+}
+
+GSmtp::Verifier::Status GSmtp::Verifier::verify( const std::string & address , const std::string & from ) const
+{
+	G_DEBUG( "GSmtp::ProtocolMessage::verify: to \"" << address << "\": from \"" << from << "\"" ) ;
+
+	std::string fqdn = GNet::Local::fqdn() ;
+	std::string host ;
+	std::string user( address ) ;
+	size_t at_pos = address.find('@') ;
+	if( at_pos != std::string::npos )
+	{
+		host = address.substr(at_pos+1U) ;
+		user = address.substr(0U,at_pos) ;
+	}
+	G::Str::toUpper( fqdn ) ;
+	G::Str::toUpper( host ) ;
+	G::Str::toUpper( user ) ;
+
+	Status status =
+		m_path == G::Path() ?
+			verifyInternal( address , user , host , fqdn , from ) :
+			verifyExternal( address , user , host , fqdn , from ) ;
+
+	return status ;
+}
+
+GSmtp::Verifier::Status GSmtp::Verifier::verifyInternal( const std::string & address , const std::string & user ,
+	const std::string & host , const std::string & fqdn , const std::string & ) const
+{
+	Status status ;
+	if( user == "POSTMASTER" && ( host.empty() || host == "LOCALHOST" || host == fqdn ) )
+	{
+		// accept 'postmaster' for local delivery
+		status.is_valid = true ;
+		status.is_local = true ;
+		status.full_name = "Local postmaster <postmaster@localhost>" ;
+		status.address = "postmaster" ;
+	}
+	else if( host.empty() || host == "LOCALHOST" )
+	{
+		// reject local addressees
+		status.is_valid = false ;
+		status.is_local = true ;
+		status.reason = "invalid local mailbox (not postmaster)" ;
+	}
+	else
+	{
+		// accept remote/fqdn addressees
+		status.is_valid = true ;
+		status.is_local = false ;
+		status.address = address ;
+	}
+	return status ;
+}
+
+GSmtp::Verifier::Status GSmtp::Verifier::verifyExternal( const std::string & address , const std::string & user ,
+	const std::string & host , const std::string & fqdn , const std::string & from ) const
+{
+	G::Strings args ;
+	args.push_back( address ) ;
+	args.push_back( user ) ;
+	args.push_back( host ) ;
+	args.push_back( fqdn ) ;
+	args.push_back( from ) ;
+	G_LOG( "GSmtp::Verifier: executing " << m_path << " " << address << " " << user << " " << host << " " << fqdn << " " << from ) ;
+
+	std::string response ;
+	int rc = G::Process::spawn( G::Root::nobody() , m_path , args , &response ) ;
+
+	G::Str::trim( response , "\r\n\t" ) ;
+	G_LOG( "GSmtp::Verifier: " << rc << ": \"" << response << "\"" ) ;
+	G::Strings response_parts ;
+	G::Str::splitIntoFields( response , response_parts , "\n" ) ;
+
+	Status status ;
+	if( ( rc == 0 || rc == 1 ) && response_parts.size() >= 2 )
+	{
+		status.is_valid = true ;
+		status.is_local = rc == 0 ;
+		status.full_name = response_parts.front() ;
+		response_parts.pop_front() ;
+		status.address = response_parts.front() ;
+	}
+	else
+	{
+		status.is_valid = false ;
+		status.reason = response.empty() ? G::Str::fromInt(rc) : response ;
+		G::Str::replaceAll( status.reason , "\n" , " " ) ;
+	}
+	return status ;
+}
+
diff --git a/src/main/gverifier.h b/src/gsmtp/gverifier.h
similarity index 62%
rename from src/main/gverifier.h
rename to src/gsmtp/gverifier.h
index 4021cc6..60cd02c 100644
--- a/src/main/gverifier.h
+++ b/src/gsmtp/gverifier.h
@@ -26,12 +26,13 @@
 
 #include "gdef.h"
 #include "gsmtp.h"
+#include "gpath.h"
 #include <string>
 
 namespace GSmtp
 {
 	class Verifier ;
-} ;
+}
 
 // Class: GSmtp::Verifier
 // Description: A class which verifies recipient addresses.
@@ -44,28 +45,48 @@ class GSmtp::Verifier
 public:
 	struct Status
 	{
+		bool is_valid ;
 		bool is_local ;
 		std::string full_name ;
 		std::string address ;
+		std::string reason ;
 	} ;
 
-        Status verify( const std::string & recipient_address ) const ;
+	explicit Verifier( const G::Path & exe ) ;
+		// Constructor.
+
+        Status verify( const std::string & recipient_address , const std::string & from = std::string() ) const ;
 		// Checks a recipient address returning
 		// a structure which indicates whether the
 		// address is local, what the full name is,
 		// and the canonical address.
 		//
-		// If syntactically local then 'is_local' is
-		// set true. If local and valid then
-		// 'full_name' is set to the full description
+		// If invalid then 'is_valid' is set false
+		// and a 'reason' is supplied.
+		//
+		// If valid and syntactically local then
+		// 'is_local' is set true, 'full_name' is
+		// set to the full description
 		// and 'address' is set to the
 		// canonical local address (without an
 		// at sign).
 		//
-		// If syntactically remote, then 'is_local'
-		// is set false, 'full_name' is empty,
-		// and 'address' is copied from
+		// If valid and syntactically remote, then
+		// 'is_local' is set false, 'full_name' is
+		// empty, and 'address' is copied from
 		// 'recipient_address'.
+		//
+		// The 'from' address is passed in for
+		// RCPT commands, but not VRFY.
+
+private:
+	Status verifyInternal( const std::string & , const std::string & , const std::string & ,
+		const std::string & , const std::string & ) const ;
+	Status verifyExternal( const std::string & , const std::string & , const std::string & ,
+		const std::string & , const std::string & ) const ;
+
+private:
+	G::Path m_path ;
 } ;
 
 #endif
diff --git a/src/main/gxtext.cpp b/src/gsmtp/gxtext.cpp
similarity index 99%
rename from src/main/gxtext.cpp
rename to src/gsmtp/gxtext.cpp
index 99d6273..0ed94a8 100644
--- a/src/main/gxtext.cpp
+++ b/src/gsmtp/gxtext.cpp
@@ -37,7 +37,7 @@ namespace
 	{
 		return (c >= '0' && c <= '9') ? (c-'0') : (10U+(c-'A')) ;
 	}
-} ;
+}
 
 std::string GSmtp::Xtext::encode( const std::string & s )
 {
diff --git a/src/main/gxtext.h b/src/gsmtp/gxtext.h
similarity index 99%
rename from src/main/gxtext.h
rename to src/gsmtp/gxtext.h
index f17ba41..787390f 100644
--- a/src/main/gxtext.h
+++ b/src/gsmtp/gxtext.h
@@ -31,7 +31,7 @@
 namespace GSmtp
 {
 	class Xtext ;
-} ;
+}
 
 // Class: GSmtp::Xtext
 // Description: An xtext codec class.
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 71c45c2..9aeb0bf 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -20,56 +20,31 @@
 # force symbol stripping on 'make install'
 AM_INSTALL_PROGRAM_FLAGS=-s
 
-EXTRA_DIST=commandline_win32.cpp main_win32.cpp gmessagestore_win32.cpp emailrelay.dsw emailrelay.dsp common.dsp submit.dsp passwd.dsp icon-32.ico icon2.ico icon3.ico icon4.ico doxygen.cfg emailrelay.rc resource.h gsasl_cyrus.cpp messages.mc
-INCLUDES = -I$(top_srcdir)/lib/gcc2.95 -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gnet -DG_SPOOLDIR=\"$(e_spooldir)\"
+EXTRA_DIST=\
+	commandline_win32.cpp \
+	common.dsp \
+	doxygen.cfg \
+	doxygen.h \
+	emailrelay.dsp \
+	emailrelay.dsw \
+	emailrelay.rc \
+	icon-32.ico \
+	icon2.ico \
+	icon3.ico \
+	icon4.ico \
+	main_win32.cpp \
+	messages.mc \
+	passwd.dsp \
+	poke.dsp \
+	resource.h \
+	submit.dsp
+
+INCLUDES = -I$(top_srcdir)/lib/$(COMPILER_VERSION) -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gnet -I$(top_srcdir)/src/gsmtp -DG_SPOOLDIR=\"$(e_spooldir)\"
 
-noinst_LIBRARIES = libgsmtp.a
 e_sbin_PROGRAMS = emailrelay emailrelay-submit emailrelay-passwd
 e_libexec_PROGRAMS = emailrelay-poke
 e_spool_DATA = 
 
-libgsmtp_a_SOURCES = \
-	gadminserver.cpp \
-	gadminserver.h \
-	gbase64.cpp \
-	gbase64.h \
-	gclientprotocol.cpp \
-	gclientprotocol.h \
-	gfilestore.cpp \
-	gfilestore.h \
-	gmessagestore.cpp \
-	gmessagestore.h \
-	gmessagestore_unix.cpp \
-	gnewfile.cpp \
-	gnewfile.h \
-	gnewmessage.cpp \
-	gnewmessage.h \
-	gprotocolmessage.cpp \
-	gprotocolmessage.h \
-	gprotocolmessageforward.cpp \
-	gprotocolmessageforward.h \
-	gprotocolmessagestore.cpp \
-	gprotocolmessagestore.h \
-	gsasl_native.cpp \
-	gsasl.h \
-	gsecrets.cpp \
-	gsecrets.h \
-	gserverprotocol.cpp \
-	gserverprotocol.h \
-	gsmtp.h \
-	gsmtpclient.cpp \
-	gsmtpclient.h \
-	gsmtpserver.cpp \
-	gsmtpserver.h \
-	gstoredfile.cpp \
-	gstoredfile.h \
-	gstoredmessage.cpp \
-	gstoredmessage.h \
-	gverifier.cpp \
-	gverifier.h \
-	gxtext.cpp \
-	gxtext.h
-
 emailrelay_SOURCES = \
 	main_unix.cpp \
 	configuration.cpp \
@@ -83,23 +58,23 @@ emailrelay_SOURCES = \
 	commandline.h
 
 emailrelay_LDADD = \
-	$(top_builddir)/src/main/libgsmtp.a \
+	$(top_builddir)/src/gsmtp/libgsmtp.a \
 	$(top_builddir)/src/glib/libglib.a \
 	$(top_builddir)/src/gnet/libgnet.a
 
 emailrelay_poke_SOURCES = poke.c
 emailrelay_poke_LDADD =
 
-emailrelay_passwd_SOURCES = passwd.cpp
+emailrelay_passwd_SOURCES = passwd.cpp legal.cpp
 emailrelay_passwd_LDADD = $(top_builddir)/src/glib/libglib.a
 
 emailrelay_submit_SOURCES = submit.cpp legal.cpp
 emailrelay_submit_LDADD = \
-	$(top_builddir)/src/main/libgsmtp.a \
+	$(top_builddir)/src/gsmtp/libgsmtp.a \
 	$(top_builddir)/src/glib/libglib.a \
 	$(top_builddir)/src/gnet/libgnet.a
 
-install-data-local:
+install-data-local: install-e_sbinPROGRAMS install-e_spoolDATA install-e_libexecPROGRAMS
 	-chgrp daemon $(DESTDIR)$(e_spooldir)
 	-chmod 775 $(DESTDIR)$(e_spooldir)
 	-chgrp daemon $(DESTDIR)$(e_sbindir)/emailrelay-submit
@@ -107,4 +82,7 @@ install-data-local:
 
 install-exec-local:
 
+uninstall-local:
+	-rmdir $(DESTDIR)$(e_spooldir) 2>/dev/null
+	-rmdir $(DESTDIR)$(e_libexecdir) 2>/dev/null
 
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index e9b6fe5..d26dd27 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -81,6 +81,7 @@ POST_UNINSTALL = :
 AR = @AR@
 AWK = @AWK@
 CC = @CC@
+COMPILER_VERSION = @COMPILER_VERSION@
 CXX = @CXX@
 GZIP = @GZIP@
 HAVE_DOXYGEN = @HAVE_DOXYGEN@
@@ -100,64 +101,53 @@ e_spooldir = @e_spooldir@
 
 AM_INSTALL_PROGRAM_FLAGS = -s
 
-EXTRA_DIST = commandline_win32.cpp main_win32.cpp gmessagestore_win32.cpp emailrelay.dsw emailrelay.dsp common.dsp submit.dsp passwd.dsp icon-32.ico icon2.ico icon3.ico icon4.ico doxygen.cfg emailrelay.rc resource.h gsasl_cyrus.cpp messages.mc
-INCLUDES = -I$(top_srcdir)/lib/gcc2.95 -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gnet -DG_SPOOLDIR=\"$(e_spooldir)\"
+EXTRA_DIST =  	commandline_win32.cpp 	common.dsp 	doxygen.cfg 	doxygen.h 	emailrelay.dsp 	emailrelay.dsw 	emailrelay.rc 	icon-32.ico 	icon2.ico 	icon3.ico 	icon4.ico 	main_win32.cpp 	messages.mc 	passwd.dsp 	poke.dsp 	resource.h 	submit.dsp
+
+
+INCLUDES = -I$(top_srcdir)/lib/$(COMPILER_VERSION) -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gnet -I$(top_srcdir)/src/gsmtp -DG_SPOOLDIR=\"$(e_spooldir)\"
 
-noinst_LIBRARIES = libgsmtp.a
 e_sbin_PROGRAMS = emailrelay emailrelay-submit emailrelay-passwd
 e_libexec_PROGRAMS = emailrelay-poke
 e_spool_DATA = 
 
-libgsmtp_a_SOURCES =  	gadminserver.cpp 	gadminserver.h 	gbase64.cpp 	gbase64.h 	gclientprotocol.cpp 	gclientprotocol.h 	gfilestore.cpp 	gfilestore.h 	gmessagestore.cpp 	gmessagestore.h 	gmessagestore_unix.cpp 	gnewfile.cpp 	gnewfile.h 	gnewmessage.cpp 	gnewmessage.h 	gprotocolmessage.cpp 	gprotocolmessage.h 	gprotocolmessageforward.cpp 	gprotocolmessageforward.h 	gprotocolmessagestore.cpp 	gprotocolmessagestore.h 	gsasl_native.cpp 	gsasl.h 	gsecrets.cpp 	gsecrets.h 	gserverprotocol.cpp 	gserverprotocol.h 	gsmtp.h 	gsmtpclient.cpp 	gsmtpclient.h 	gsmtpserver.cpp 	gsmtpserver.h 	gstoredfile.cpp 	gstoredfile.h 	gstoredmessage.cpp 	gstoredmessage.h 	gverifier.cpp 	gverifier.h 	gxtext.cpp 	gxtext.h
-
-
 emailrelay_SOURCES =  	main_unix.cpp 	configuration.cpp 	configuration.h 	legal.cpp 	legal.h 	run.cpp 	run.h 	commandline.cpp 	commandline_unix.cpp 	commandline.h
 
 
-emailrelay_LDADD =  	$(top_builddir)/src/main/libgsmtp.a 	$(top_builddir)/src/glib/libglib.a 	$(top_builddir)/src/gnet/libgnet.a
+emailrelay_LDADD =  	$(top_builddir)/src/gsmtp/libgsmtp.a 	$(top_builddir)/src/glib/libglib.a 	$(top_builddir)/src/gnet/libgnet.a
 
 
 emailrelay_poke_SOURCES = poke.c
 emailrelay_poke_LDADD = 
 
-emailrelay_passwd_SOURCES = passwd.cpp
+emailrelay_passwd_SOURCES = passwd.cpp legal.cpp
 emailrelay_passwd_LDADD = $(top_builddir)/src/glib/libglib.a
 
 emailrelay_submit_SOURCES = submit.cpp legal.cpp
-emailrelay_submit_LDADD =  	$(top_builddir)/src/main/libgsmtp.a 	$(top_builddir)/src/glib/libglib.a 	$(top_builddir)/src/gnet/libgnet.a
+emailrelay_submit_LDADD =  	$(top_builddir)/src/gsmtp/libgsmtp.a 	$(top_builddir)/src/glib/libglib.a 	$(top_builddir)/src/gnet/libgnet.a
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
+PROGRAMS =  $(e_libexec_PROGRAMS) $(e_sbin_PROGRAMS)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libgsmtp_a_LIBADD = 
-libgsmtp_a_OBJECTS =  gadminserver.o gbase64.o gclientprotocol.o \
-gfilestore.o gmessagestore.o gmessagestore_unix.o gnewfile.o \
-gnewmessage.o gprotocolmessage.o gprotocolmessageforward.o \
-gprotocolmessagestore.o gsasl_native.o gsecrets.o gserverprotocol.o \
-gsmtpclient.o gsmtpserver.o gstoredfile.o gstoredmessage.o gverifier.o \
-gxtext.o
-PROGRAMS =  $(e_libexec_PROGRAMS) $(e_sbin_PROGRAMS)
-
 emailrelay_poke_OBJECTS =  poke.o
 emailrelay_poke_DEPENDENCIES = 
 emailrelay_poke_LDFLAGS = 
 emailrelay_OBJECTS =  main_unix.o configuration.o legal.o run.o \
 commandline.o commandline_unix.o
-emailrelay_DEPENDENCIES =  $(top_builddir)/src/main/libgsmtp.a \
+emailrelay_DEPENDENCIES =  $(top_builddir)/src/gsmtp/libgsmtp.a \
 $(top_builddir)/src/glib/libglib.a $(top_builddir)/src/gnet/libgnet.a
 emailrelay_LDFLAGS = 
 emailrelay_submit_OBJECTS =  submit.o legal.o
-emailrelay_submit_DEPENDENCIES =  $(top_builddir)/src/main/libgsmtp.a \
+emailrelay_submit_DEPENDENCIES =  $(top_builddir)/src/gsmtp/libgsmtp.a \
 $(top_builddir)/src/glib/libglib.a $(top_builddir)/src/gnet/libgnet.a
 emailrelay_submit_LDFLAGS = 
-emailrelay_passwd_OBJECTS =  passwd.o
+emailrelay_passwd_OBJECTS =  passwd.o legal.o
 emailrelay_passwd_DEPENDENCIES =  $(top_builddir)/src/glib/libglib.a
 emailrelay_passwd_LDFLAGS = 
 CXXFLAGS = @CXXFLAGS@
@@ -177,8 +167,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
-SOURCES = $(libgsmtp_a_SOURCES) $(emailrelay_poke_SOURCES) $(emailrelay_SOURCES) $(emailrelay_submit_SOURCES) $(emailrelay_passwd_SOURCES)
-OBJECTS = $(libgsmtp_a_OBJECTS) $(emailrelay_poke_OBJECTS) $(emailrelay_OBJECTS) $(emailrelay_submit_OBJECTS) $(emailrelay_passwd_OBJECTS)
+SOURCES = $(emailrelay_poke_SOURCES) $(emailrelay_SOURCES) $(emailrelay_submit_SOURCES) $(emailrelay_passwd_SOURCES)
+OBJECTS = $(emailrelay_poke_OBJECTS) $(emailrelay_OBJECTS) $(emailrelay_submit_OBJECTS) $(emailrelay_passwd_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -191,39 +181,6 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-libgsmtp.a: $(libgsmtp_a_OBJECTS) $(libgsmtp_a_DEPENDENCIES)
-	-rm -f libgsmtp.a
-	$(AR) cru libgsmtp.a $(libgsmtp_a_OBJECTS) $(libgsmtp_a_LIBADD)
-	$(RANLIB) libgsmtp.a
-
 mostlyclean-e_libexecPROGRAMS:
 
 clean-e_libexecPROGRAMS:
@@ -274,6 +231,25 @@ uninstall-e_sbinPROGRAMS:
 	  rm -f $(DESTDIR)$(e_sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
+.c.o:
+	$(COMPILE) -c $<
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
+
+maintainer-clean-compile:
+
 emailrelay-poke: $(emailrelay_poke_OBJECTS) $(emailrelay_poke_DEPENDENCIES)
 	@rm -f emailrelay-poke
 	$(LINK) $(emailrelay_poke_LDFLAGS) $(emailrelay_poke_OBJECTS) $(emailrelay_poke_LDADD) $(LIBS)
@@ -357,306 +333,103 @@ distdir: $(DISTFILES)
 	done
 commandline.o: commandline.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
-	../../src/gnet/gnet.h ../../src/glib/glog.h legal.h \
+	../../lib/gcc2.95/limits ../../src/gsmtp/gsmtp.h \
+	../../src/gnet/gnet.h ../../src/glib/glog.h \
+	../../src/gnet/gaddress.h ../../src/glib/gexception.h legal.h \
 	configuration.h ../../src/glib/gpath.h \
 	../../src/glib/gstrings.h commandline.h ../../src/glib/garg.h \
-	../../src/glib/ggetopt.h ../../src/glib/gexception.h \
-	gmessagestore.h gnewmessage.h gstoredmessage.h \
+	../../src/glib/ggetopt.h ../../src/gsmtp/gmessagestore.h \
+	../../src/gsmtp/gnewmessage.h ../../src/gsmtp/gstoredmessage.h \
 	../../src/glib/gstr.h ../../src/glib/gdebug.h \
 	../../src/glib/glogoutput.h ../../src/glib/gassert.h
 commandline_unix.o: commandline_unix.cpp ../../src/glib/gdef.h \
 	../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
+	../../lib/gcc2.95/sstream ../../lib/gcc2.95/limits \
+	../../src/gsmtp/gsmtp.h ../../src/gnet/gnet.h \
 	../../src/glib/glog.h commandline.h ../../src/glib/garg.h \
 	configuration.h ../../src/glib/gpath.h \
 	../../src/glib/gstrings.h ../../src/glib/ggetopt.h \
 	../../src/glib/gexception.h ../../src/glib/gstr.h
 configuration.o: configuration.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
+	../../lib/gcc2.95/limits ../../src/gsmtp/gsmtp.h \
 	../../src/gnet/gnet.h ../../src/glib/glog.h configuration.h \
 	../../src/glib/gpath.h ../../src/glib/gstrings.h commandline.h \
 	../../src/glib/garg.h ../../src/glib/ggetopt.h \
-	../../src/glib/gexception.h gmessagestore.h gnewmessage.h \
-	gstoredmessage.h ../../src/glib/gstr.h ../../src/glib/gdebug.h \
+	../../src/glib/gexception.h ../../src/gsmtp/gmessagestore.h \
+	../../src/gsmtp/gnewmessage.h ../../src/gsmtp/gstoredmessage.h \
+	../../src/glib/gstr.h ../../src/glib/gdebug.h \
 	../../src/glib/glogoutput.h ../../src/glib/gassert.h
-gadminserver.o: gadminserver.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits \
-	../../src/gnet/gnet.h gsmtp.h ../../src/glib/glog.h \
-	gadminserver.h ../../src/gnet/gserver.h \
-	../../src/gnet/gsocket.h ../../src/gnet/gaddress.h \
-	../../src/glib/gexception.h ../../src/gnet/gevent.h \
-	../../src/gnet/geventloop.h ../../src/gnet/geventhandler.h \
-	../../src/glib/gcredentials.h ../../src/glib/gdatetime.h \
-	../../src/gnet/gdescriptor.h ../../src/gnet/gconnection.h \
-	../../src/gnet/gselect.h ../../src/gnet/glinebuffer.h \
-	../../src/glib/gstrings.h gserverprotocol.h gprotocolmessage.h \
-	gverifier.h gsasl.h gsecrets.h ../../src/glib/gpath.h \
-	../../src/glib/gstatemachine.h gsmtpclient.h \
-	../../src/gnet/gclient.h gclientprotocol.h gmessagestore.h \
-	gnewmessage.h gstoredmessage.h ../../src/gnet/gtimer.h \
-	../../src/gnet/gmonitor.h ../../src/glib/gstr.h \
-	../../src/glib/gmemory.h
-gbase64.o: gbase64.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
-	../../src/gnet/gnet.h ../../src/glib/glog.h gbase64.h \
-	../../src/glib/gexception.h ../../src/glib/gassert.h \
-	../../src/glib/glogoutput.h ../../src/glib/gstr.h \
-	../../src/glib/gstrings.h
-gclientprotocol.o: gclientprotocol.cpp ../../src/glib/gdef.h \
-	../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits ../../src/gnet/gnet.h gsmtp.h \
-	../../src/glib/glog.h ../../src/gnet/glocal.h \
-	../../src/gnet/gaddress.h ../../src/glib/gexception.h \
-	../../src/glib/gfile.h ../../src/glib/gpath.h \
-	../../src/glib/gstrings.h gsasl.h gsecrets.h gbase64.h \
-	../../src/glib/gstr.h ../../src/glib/gmemory.h gxtext.h \
-	gclientprotocol.h gmessagestore.h gnewmessage.h \
-	gstoredmessage.h ../../src/gnet/gtimer.h \
-	../../src/glib/gdatetime.h ../../src/gnet/gresolve.h \
-	../../src/glib/gassert.h ../../src/glib/glogoutput.h
-gfilestore.o: gfilestore.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
-	../../src/gnet/gnet.h ../../src/glib/glog.h gfilestore.h \
-	gmessagestore.h gnewmessage.h gstoredmessage.h \
-	../../src/glib/gstrings.h ../../src/glib/gpath.h \
-	../../src/glib/gexception.h ../../src/glib/gdatetime.h \
-	../../src/glib/gnoncopyable.h ../../src/glib/groot.h \
-	../../src/glib/gprocess.h gnewfile.h gstoredfile.h \
-	../../src/glib/gdirectory.h ../../src/glib/gmemory.h \
-	../../src/glib/gfile.h ../../src/glib/gstr.h \
-	../../src/glib/gassert.h ../../src/glib/glogoutput.h
-gmessagestore.o: gmessagestore.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
-	../../src/gnet/gnet.h ../../src/glib/glog.h gmessagestore.h \
-	gnewmessage.h gstoredmessage.h ../../src/glib/gstrings.h \
-	../../src/glib/gpath.h ../../src/glib/gexception.h \
-	../../src/glib/gassert.h ../../src/glib/glogoutput.h
-gmessagestore_unix.o: gmessagestore_unix.cpp ../../src/glib/gdef.h \
-	../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
-	../../src/glib/glog.h gmessagestore.h gnewmessage.h \
-	gstoredmessage.h ../../src/glib/gstrings.h \
-	../../src/glib/gpath.h ../../src/glib/gexception.h
-gnewfile.o: gnewfile.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
-	../../src/gnet/gnet.h ../../src/glib/glog.h gmessagestore.h \
-	gnewmessage.h gstoredmessage.h ../../src/glib/gstrings.h \
-	../../src/glib/gpath.h ../../src/glib/gexception.h gnewfile.h \
-	gfilestore.h ../../src/glib/gdatetime.h \
-	../../src/glib/gnoncopyable.h ../../src/glib/groot.h \
-	../../src/glib/gprocess.h ../../src/glib/gmemory.h \
-	../../src/glib/gfile.h gxtext.h ../../src/glib/gassert.h \
-	../../src/glib/glogoutput.h
-gnewmessage.o: gnewmessage.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
-	../../src/gnet/gnet.h ../../src/glib/glog.h gmessagestore.h \
-	gnewmessage.h gstoredmessage.h ../../src/glib/gstrings.h \
-	../../src/glib/gpath.h ../../src/glib/gexception.h
-gprotocolmessage.o: gprotocolmessage.cpp ../../src/glib/gdef.h \
-	../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
-	../../src/glib/glog.h gprotocolmessage.h \
-	../../src/glib/gstrings.h gverifier.h
-gprotocolmessageforward.o: gprotocolmessageforward.cpp \
-	../../src/glib/gdef.h ../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
-	../../src/glib/glog.h gprotocolmessageforward.h \
-	gprotocolmessage.h ../../src/glib/gstrings.h gverifier.h \
-	gprotocolmessagestore.h gnewmessage.h gsmtpclient.h gsecrets.h \
-	../../src/glib/gpath.h ../../src/glib/gexception.h \
-	../../src/gnet/glinebuffer.h ../../src/gnet/gclient.h \
-	../../src/gnet/gaddress.h ../../src/gnet/gconnection.h \
-	../../src/gnet/gsocket.h ../../src/gnet/gevent.h \
-	../../src/gnet/geventloop.h ../../src/gnet/geventhandler.h \
-	../../src/glib/gcredentials.h ../../src/glib/gdatetime.h \
-	../../src/gnet/gdescriptor.h gclientprotocol.h gmessagestore.h \
-	gstoredmessage.h gsasl.h ../../src/gnet/gtimer.h \
-	../../src/glib/gmemory.h ../../src/glib/gstr.h \
-	../../src/glib/gassert.h ../../src/glib/glogoutput.h
-gprotocolmessagestore.o: gprotocolmessagestore.cpp ../../src/glib/gdef.h \
-	../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
-	../../src/glib/glog.h gprotocolmessagestore.h \
-	gprotocolmessage.h ../../src/glib/gstrings.h gverifier.h \
-	gnewmessage.h gmessagestore.h gstoredmessage.h \
-	../../src/glib/gpath.h ../../src/glib/gexception.h \
-	../../src/glib/gmemory.h ../../src/glib/gstr.h \
-	../../src/glib/gassert.h ../../src/glib/glogoutput.h
-gsasl_native.o: gsasl_native.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits \
-	../../src/gnet/gnet.h gsmtp.h ../../src/glib/glog.h \
-	../../src/gnet/glocal.h ../../src/gnet/gaddress.h \
-	../../src/glib/gexception.h gsasl.h gsecrets.h \
-	../../src/glib/gpath.h ../../src/glib/gstrings.h \
-	../../src/glib/gstr.h ../../src/glib/gmd5.h \
-	../../src/glib/gdatetime.h ../../src/glib/gmemory.h \
-	../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
-	../../src/glib/gassert.h
-gsecrets.o: gsecrets.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
-	../../src/gnet/gnet.h ../../src/glib/glog.h gsecrets.h \
-	../../src/glib/gpath.h ../../src/glib/gstrings.h \
-	../../src/glib/gexception.h ../../src/glib/groot.h \
-	../../src/glib/gprocess.h ../../src/glib/gnoncopyable.h \
-	gxtext.h ../../src/glib/gstr.h
-gserverprotocol.o: gserverprotocol.cpp ../../src/glib/gdef.h \
-	../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
-	../../src/glib/glog.h gserverprotocol.h gprotocolmessage.h \
-	../../src/glib/gstrings.h gverifier.h gsasl.h gsecrets.h \
-	../../src/glib/gpath.h ../../src/glib/gexception.h \
-	../../src/glib/gstatemachine.h gbase64.h ../../src/glib/gdate.h \
-	../../src/glib/gdatetime.h ../../src/glib/gdebug.h \
-	../../src/glib/glogoutput.h ../../src/glib/gassert.h \
-	../../src/glib/gtime.h ../../src/glib/gstr.h
-gsmtpclient.o: gsmtpclient.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits \
-	../../src/gnet/gnet.h gsmtp.h ../../src/glib/glog.h \
-	../../src/gnet/glocal.h ../../src/gnet/gaddress.h \
-	../../src/glib/gexception.h ../../src/glib/gfile.h \
-	../../src/glib/gpath.h ../../src/glib/gstrings.h \
-	../../src/glib/gstr.h ../../src/glib/gmemory.h \
-	../../src/gnet/gtimer.h ../../src/glib/gdatetime.h \
-	gsmtpclient.h gsecrets.h ../../src/gnet/glinebuffer.h \
-	../../src/gnet/gclient.h ../../src/gnet/gconnection.h \
-	../../src/gnet/gsocket.h ../../src/gnet/gevent.h \
-	../../src/gnet/geventloop.h ../../src/gnet/geventhandler.h \
-	../../src/glib/gcredentials.h ../../src/gnet/gdescriptor.h \
-	gclientprotocol.h gmessagestore.h gnewmessage.h \
-	gstoredmessage.h gsasl.h ../../src/gnet/gresolve.h \
-	../../src/glib/gassert.h ../../src/glib/glogoutput.h
-gsmtpserver.o: gsmtpserver.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
-	../../src/gnet/gnet.h ../../src/glib/glog.h gsmtpserver.h \
-	../../src/gnet/gserver.h ../../src/gnet/gsocket.h \
-	../../src/gnet/gaddress.h ../../src/glib/gexception.h \
-	../../src/gnet/gevent.h ../../src/gnet/geventloop.h \
-	../../src/gnet/geventhandler.h ../../src/glib/gcredentials.h \
-	../../src/glib/gdatetime.h ../../src/gnet/gdescriptor.h \
-	../../src/gnet/gconnection.h ../../src/gnet/gselect.h \
-	../../src/gnet/glinebuffer.h ../../src/glib/gstrings.h \
-	gverifier.h gserverprotocol.h gprotocolmessage.h gsasl.h \
-	gsecrets.h ../../src/glib/gpath.h \
-	../../src/glib/gstatemachine.h gprotocolmessagestore.h \
-	gnewmessage.h gprotocolmessageforward.h gsmtpclient.h \
-	../../src/gnet/gclient.h gclientprotocol.h gmessagestore.h \
-	gstoredmessage.h ../../src/gnet/gtimer.h \
-	../../src/glib/gmemory.h ../../src/gnet/glocal.h \
-	../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
-	../../src/glib/gassert.h
-gstoredfile.o: gstoredfile.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
-	../../src/gnet/gnet.h ../../src/glib/glog.h gfilestore.h \
-	gmessagestore.h gnewmessage.h gstoredmessage.h \
-	../../src/glib/gstrings.h ../../src/glib/gpath.h \
-	../../src/glib/gexception.h ../../src/glib/gdatetime.h \
-	../../src/glib/gnoncopyable.h ../../src/glib/groot.h \
-	../../src/glib/gprocess.h gstoredfile.h \
-	../../src/glib/gmemory.h gxtext.h ../../src/glib/gfile.h \
-	../../src/glib/gstr.h ../../src/glib/gassert.h \
-	../../src/glib/glogoutput.h
-gstoredmessage.o: gstoredmessage.cpp ../../src/glib/gdef.h \
-	../../config.h ../../lib/gcc2.95/iostream \
-	../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
-	../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
-	../../src/glib/glog.h gstoredmessage.h \
-	../../src/glib/gstrings.h ../../src/glib/gpath.h
-gverifier.o: gverifier.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
-	../../src/gnet/gnet.h ../../src/glib/glog.h gverifier.h \
-	../../src/glib/gstr.h ../../src/glib/gexception.h \
-	../../src/glib/gstrings.h ../../src/gnet/glocal.h \
-	../../src/gnet/gaddress.h ../../src/glib/gassert.h \
-	../../src/glib/glogoutput.h
-gxtext.o: gxtext.cpp ../../src/glib/gdef.h ../../config.h \
-	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
-	../../src/gnet/gnet.h ../../src/glib/glog.h gxtext.h \
-	../../src/glib/gassert.h ../../src/glib/glogoutput.h
 legal.o: legal.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits legal.h \
-	gsmtp.h ../../src/gnet/gnet.h ../../src/glib/glog.h
+	../../lib/gcc2.95/limits legal.h ../../src/gsmtp/gsmtp.h \
+	../../src/gnet/gnet.h ../../src/glib/glog.h
 main_unix.o: main_unix.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
+	../../lib/gcc2.95/limits ../../src/gsmtp/gsmtp.h \
 	../../src/gnet/gnet.h ../../src/glib/glog.h \
 	../../src/glib/garg.h run.h configuration.h \
 	../../src/glib/gpath.h ../../src/glib/gstrings.h commandline.h \
 	../../src/glib/ggetopt.h ../../src/glib/gexception.h \
 	../../src/gnet/geventloop.h ../../src/gnet/geventhandler.h \
-	../../src/glib/gcredentials.h ../../src/glib/gdatetime.h \
-	../../src/gnet/gdescriptor.h ../../src/glib/glogoutput.h \
-	../../src/glib/gdaemon.h gmessagestore.h gnewmessage.h \
-	gstoredmessage.h gsmtpclient.h gsecrets.h \
-	../../src/gnet/glinebuffer.h ../../src/gnet/gclient.h \
-	../../src/gnet/gaddress.h ../../src/gnet/gconnection.h \
-	../../src/gnet/gsocket.h ../../src/gnet/gevent.h \
-	gclientprotocol.h gsasl.h ../../src/gnet/gtimer.h
+	../../src/glib/gdatetime.h ../../src/gnet/gdescriptor.h \
+	../../src/gnet/gtimer.h ../../src/glib/glogoutput.h \
+	../../src/glib/gdaemon.h ../../src/glib/gpidfile.h \
+	../../src/gsmtp/gmessagestore.h ../../src/gsmtp/gnewmessage.h \
+	../../src/gsmtp/gstoredmessage.h ../../src/gsmtp/gsmtpclient.h \
+	../../src/gsmtp/gsecrets.h ../../src/gnet/glinebuffer.h \
+	../../src/gnet/gclient.h ../../src/gnet/gaddress.h \
+	../../src/gnet/gconnection.h ../../src/gnet/gsocket.h \
+	../../src/gnet/gevent.h ../../src/gsmtp/gclientprotocol.h \
+	../../src/gsmtp/gsasl.h
 passwd.o: passwd.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits \
-	../../src/glib/gstr.h ../../src/glib/gexception.h \
-	../../src/glib/gstrings.h ../../src/glib/garg.h \
-	../../src/glib/gmd5.h
+	../../lib/gcc2.95/limits ../../src/glib/gstr.h \
+	../../src/glib/gexception.h ../../src/glib/gstrings.h \
+	../../src/glib/garg.h ../../src/glib/gmd5.h legal.h \
+	../../src/gsmtp/gsmtp.h ../../src/gnet/gnet.h \
+	../../src/glib/glog.h
 poke.o: poke.c
 run.o: run.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
+	../../lib/gcc2.95/limits ../../src/gsmtp/gsmtp.h \
 	../../src/gnet/gnet.h ../../src/glib/glog.h run.h \
 	configuration.h ../../src/glib/gpath.h \
 	../../src/glib/gstrings.h commandline.h ../../src/glib/garg.h \
 	../../src/glib/ggetopt.h ../../src/glib/gexception.h \
 	../../src/gnet/geventloop.h ../../src/gnet/geventhandler.h \
-	../../src/glib/gcredentials.h ../../src/glib/gdatetime.h \
-	../../src/gnet/gdescriptor.h ../../src/glib/glogoutput.h \
-	../../src/glib/gdaemon.h gmessagestore.h gnewmessage.h \
-	gstoredmessage.h gsmtpclient.h gsecrets.h \
-	../../src/gnet/glinebuffer.h ../../src/gnet/gclient.h \
-	../../src/gnet/gaddress.h ../../src/gnet/gconnection.h \
-	../../src/gnet/gsocket.h ../../src/gnet/gevent.h \
-	gclientprotocol.h gsasl.h ../../src/gnet/gtimer.h gsmtpserver.h \
-	../../src/gnet/gserver.h ../../src/gnet/gselect.h gverifier.h \
-	gserverprotocol.h gprotocolmessage.h \
-	../../src/glib/gstatemachine.h gfilestore.h \
-	../../src/glib/gnoncopyable.h ../../src/glib/groot.h \
-	../../src/glib/gprocess.h gnewfile.h gadminserver.h \
+	../../src/glib/gdatetime.h ../../src/gnet/gdescriptor.h \
+	../../src/gnet/gtimer.h ../../src/glib/glogoutput.h \
+	../../src/glib/gdaemon.h ../../src/glib/gpidfile.h \
+	../../src/gsmtp/gmessagestore.h ../../src/gsmtp/gnewmessage.h \
+	../../src/gsmtp/gstoredmessage.h ../../src/gsmtp/gsmtpclient.h \
+	../../src/gsmtp/gsecrets.h ../../src/gnet/glinebuffer.h \
+	../../src/gnet/gclient.h ../../src/gnet/gaddress.h \
+	../../src/gnet/gconnection.h ../../src/gnet/gsocket.h \
+	../../src/gnet/gevent.h ../../src/gsmtp/gclientprotocol.h \
+	../../src/gsmtp/gsasl.h ../../src/gsmtp/gsmtpserver.h \
+	../../src/glib/gnoncopyable.h ../../src/gnet/gserver.h \
+	../../src/gsmtp/gverifier.h ../../src/gsmtp/gserverprotocol.h \
+	../../src/gsmtp/gprotocolmessage.h \
+	../../src/glib/gstatemachine.h ../../src/gsmtp/gfilestore.h \
+	../../src/glib/groot.h ../../src/glib/gprocess.h \
+	../../src/gsmtp/gnewfile.h ../../src/gsmtp/gadminserver.h \
 	../../src/gnet/gmonitor.h ../../src/gnet/glocal.h \
 	../../src/glib/gmemory.h ../../src/glib/gdebug.h \
 	../../src/glib/gassert.h
 submit.o: submit.cpp ../../src/glib/gdef.h ../../config.h \
 	../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
-	../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits \
-	../../src/gnet/gnet.h gsmtp.h ../../src/glib/glog.h \
+	../../lib/gcc2.95/limits ../../src/gnet/gnet.h \
+	../../src/gsmtp/gsmtp.h ../../src/glib/glog.h \
 	../../src/gnet/glocal.h ../../src/gnet/gaddress.h \
 	../../src/glib/gexception.h ../../src/gnet/geventloop.h \
-	../../src/gnet/geventhandler.h ../../src/glib/gcredentials.h \
-	../../src/glib/gdatetime.h ../../src/gnet/gdescriptor.h \
-	../../src/glib/garg.h ../../src/glib/gstrings.h \
-	../../src/glib/gstr.h ../../src/glib/ggetopt.h \
-	../../src/glib/gpath.h gverifier.h gfilestore.h gmessagestore.h \
-	gnewmessage.h gstoredmessage.h ../../src/glib/gnoncopyable.h \
+	../../src/gnet/geventhandler.h ../../src/glib/gdatetime.h \
+	../../src/gnet/gdescriptor.h ../../src/glib/garg.h \
+	../../src/glib/gstrings.h ../../src/glib/gstr.h \
+	../../src/glib/ggetopt.h ../../src/glib/gpath.h \
+	../../src/gsmtp/gverifier.h ../../src/gsmtp/gfilestore.h \
+	../../src/gsmtp/gmessagestore.h ../../src/gsmtp/gnewmessage.h \
+	../../src/gsmtp/gstoredmessage.h ../../src/glib/gnoncopyable.h \
 	../../src/glib/groot.h ../../src/glib/gprocess.h legal.h
 
 info-am:
@@ -678,9 +451,9 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
 uninstall-am: uninstall-e_libexecPROGRAMS uninstall-e_sbinPROGRAMS \
-		uninstall-e_spoolDATA
+		uninstall-e_spoolDATA uninstall-local
 uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA)
+all-am: Makefile $(PROGRAMS) $(DATA)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -698,55 +471,50 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-e_libexecPROGRAMS \
-		mostlyclean-e_sbinPROGRAMS mostlyclean-tags \
-		mostlyclean-generic
+mostlyclean-am:  mostlyclean-e_libexecPROGRAMS \
+		mostlyclean-e_sbinPROGRAMS mostlyclean-compile \
+		mostlyclean-tags mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLIBRARIES clean-compile clean-e_libexecPROGRAMS \
-		clean-e_sbinPROGRAMS clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-e_libexecPROGRAMS clean-e_sbinPROGRAMS clean-compile \
+		clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-e_libexecPROGRAMS distclean-e_sbinPROGRAMS \
-		distclean-tags distclean-generic clean-am
+distclean-am:  distclean-e_libexecPROGRAMS distclean-e_sbinPROGRAMS \
+		distclean-compile distclean-tags distclean-generic \
+		clean-am
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile \
-		maintainer-clean-e_libexecPROGRAMS \
-		maintainer-clean-e_sbinPROGRAMS maintainer-clean-tags \
+maintainer-clean-am:  maintainer-clean-e_libexecPROGRAMS \
+		maintainer-clean-e_sbinPROGRAMS \
+		maintainer-clean-compile maintainer-clean-tags \
 		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-e_libexecPROGRAMS \
-distclean-e_libexecPROGRAMS clean-e_libexecPROGRAMS \
-maintainer-clean-e_libexecPROGRAMS uninstall-e_libexecPROGRAMS \
-install-e_libexecPROGRAMS mostlyclean-e_sbinPROGRAMS \
-distclean-e_sbinPROGRAMS clean-e_sbinPROGRAMS \
-maintainer-clean-e_sbinPROGRAMS uninstall-e_sbinPROGRAMS \
-install-e_sbinPROGRAMS uninstall-e_spoolDATA install-e_spoolDATA tags \
-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-distdir info-am info dvi-am dvi check check-am installcheck-am \
-installcheck install-exec-local install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
+.PHONY: mostlyclean-e_libexecPROGRAMS distclean-e_libexecPROGRAMS \
+clean-e_libexecPROGRAMS maintainer-clean-e_libexecPROGRAMS \
+uninstall-e_libexecPROGRAMS install-e_libexecPROGRAMS \
+mostlyclean-e_sbinPROGRAMS distclean-e_sbinPROGRAMS \
+clean-e_sbinPROGRAMS maintainer-clean-e_sbinPROGRAMS \
+uninstall-e_sbinPROGRAMS install-e_sbinPROGRAMS mostlyclean-compile \
+distclean-compile clean-compile maintainer-clean-compile \
+uninstall-e_spoolDATA install-e_spoolDATA tags mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck \
+install-exec-local install-exec-am install-exec install-data-local \
+install-data-am install-data install-am install uninstall-local \
 uninstall-am uninstall all-redirect all-am all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-install-data-local:
+install-data-local: install-e_sbinPROGRAMS install-e_spoolDATA install-e_libexecPROGRAMS
 	-chgrp daemon $(DESTDIR)$(e_spooldir)
 	-chmod 775 $(DESTDIR)$(e_spooldir)
 	-chgrp daemon $(DESTDIR)$(e_sbindir)/emailrelay-submit
@@ -754,6 +522,10 @@ install-data-local:
 
 install-exec-local:
 
+uninstall-local:
+	-rmdir $(DESTDIR)$(e_spooldir) 2>/dev/null
+	-rmdir $(DESTDIR)$(e_libexecdir) 2>/dev/null
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/main/commandline.cpp b/src/main/commandline.cpp
index 958d595..a67e5f7 100644
--- a/src/main/commandline.cpp
+++ b/src/main/commandline.cpp
@@ -23,6 +23,7 @@
 
 #include "gdef.h"
 #include "gsmtp.h"
+#include "gaddress.h"
 #include "legal.h"
 #include "configuration.h"
 #include "commandline.h"
@@ -34,33 +35,38 @@
 std::string Main::CommandLine::switchSpec()
 {
 	std::string dir = GSmtp::MessageStore::defaultDirectory().str() ;
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss
 		<< osSwitchSpec() << "|"
-		<< "C!client-auth!enables authentication with remote server, using the given secrets file!1!file|"
-		<< "L!log-time!adds a timestamp to the logging output!0!|"
-		<< "S!server-auth!enables authentication of remote clients, using the given secrets file!1!file|"
-		<< "y!as-proxy!equivalent to \"--log --close-stderr --immediate --forward-to\"!1!host:port|"
-		<< "e!close-stderr!closes the standard error stream after start-up!0!|"
-		<< "a!admin!enables the administration interface and specifies its listening port number!1!admin-port|"
-		<< "x!dont-serve!stops the process acting as a server (usually used with --forward)!0!|"
-		<< "z!filter!defines a mail pre-processor!1!program|"
-		<< "D!domain!sets an override for the host's fully qualified domain name!1!fqdn|"
-		<< "f!forward!forwards stored mail on startup (requires --forward-to)!0!|"
-		<< "o!forward-to!specifies the remote smtp server (required by --forward and --admin)!1!host:port|"
-		<< "h!help!displays help text and exits!0!|"
-		<< "T!response-timeout!sets the response timeout (in seconds) when talking to a remote server (default is 1800)!1!time|"
-		<< "U!connection-timeout!sets the timeout (in seconds) when connecting to a remote server (default is 40)!1!time|"
-		<< "m!immediate!forwards each message as soon as it is received (requires --forward-to)!0!|"
-		<< "i!pid-file!records the daemon process-id in the given file!1!pid-file|"
-		<< "p!port!specifies the smtp listening port number!1!port|"
-		<< "r!remote-clients!allows remote clients to connect!0!|"
-		<< "s!spool-dir!specifies the spool directory (default is \"" << dir << "\")!1!dir|"
-		<< "v!verbose!generates more verbose logging!0!|"
-		<< "g!debug!generates debug-level logging (if compiled-in)!0!|"
-		<< "V!version!displays version information and exits!0!|"
-		<< "q!as-client!equivalent to \"--log --no-syslog --no-daemon --dont-serve --forward --forward-to\"!" << "1!host:port|"
-		<< "d!as-server!equivalent to \"--log --close-stderr\"!0!"
+		<< "q!as-client!runs as a client, forwarding spooled mail to <host>: equivalent to \"--log --no-syslog --no-daemon --dont-serve --forward --forward-to\"!" << "1!host:port!1|"
+		<< "d!as-server!runs as a server: equivalent to \"--log --close-stderr\"!0!!1|"
+		<< "y!as-proxy!runs as a proxy: equivalent to \"--log --close-stderr --immediate --forward-to\"!1!host:port!1|"
+		<< "v!verbose!generates more verbose output (works with --help and --log)!0!!1|"
+		<< "h!help!displays help text and exits!0!!1|"
+		<< ""
+		<< "p!port!specifies the smtp listening port number!1!port!2|"
+		<< "r!remote-clients!allows remote clients to connect!0!!2|"
+		<< "s!spool-dir!specifies the spool directory (default is \"" << dir << "\")!1!dir!2|"
+		<< "V!version!displays version information and exits!0!!2|"
+		<< ""
+		<< "g!debug!generates debug-level logging (if compiled-in)!0!!3|"
+		<< "C!client-auth!enables authentication with remote server, using the given secrets file!1!file!3|"
+		<< "L!log-time!adds a timestamp to the logging output!0!!3|"
+		<< "S!server-auth!enables authentication of remote clients, using the given secrets file!1!file!3|"
+		<< "e!close-stderr!closes the standard error stream after start-up!0!!3|"
+		<< "a!admin!enables the administration interface and specifies its listening port number!1!admin-port!3|"
+		<< "x!dont-serve!dont act as a server (usually used with --forward)!0!!3|"
+		<< "X!dont-listen!dont listen for smtp connections (usually used with --admin)!0!!3|"
+		<< "z!filter!defines a mail processor program!1!program!3|"
+		<< "D!domain!sets an override for the host's fully qualified domain name!1!fqdn!3|"
+		<< "f!forward!forwards stored mail on startup (requires --forward-to)!0!!3|"
+		<< "o!forward-to!specifies the remote smtp server (required by --forward and --admin)!1!host:port!3|"
+		<< "T!response-timeout!sets the response timeout (in seconds) when talking to a remote server (default is 1800)!1!time!3|"
+		<< "U!connection-timeout!sets the timeout (in seconds) when connecting to a remote server (default is 40)!1!time!3|"
+		<< "m!immediate!forwards each message as soon as it is received (requires --forward-to)!0!!3|"
+		<< "I!interface!listen on a specific interface!1!ip-address!3|"
+		<< "i!pid-file!records the daemon process-id in the given file!1!pid-file!3|"
+		<< "Z!verifier!!1!program!3|"
 		;
 	return ss.str() ;
 }
@@ -90,8 +96,17 @@ bool Main::CommandLine::hasUsageErrors() const
 void Main::CommandLine::showUsage( bool e ) const
 {
 	Show show( e ) ;
-	unsigned int columns = ttyColumns() ;
-	m_getopt.showUsage( show.s() , m_arg.prefix() , "" , 33U , columns ) ;
+
+	G::GetOpt::Level level = G::GetOpt::Level(2U) ;
+	if( m_getopt.contains("verbose") )
+		level = G::GetOpt::levelDefault() ;
+	else
+		show.s() << "abbreviated " ;
+
+	size_t tab_stop = 33U ;
+	size_t columns = ttyColumns() ;
+	m_getopt.showUsage( show.s() , m_arg.prefix() , "" ,
+		level , tab_stop , columns ) ;
 }
 
 bool Main::CommandLine::contains( const std::string & name ) const
@@ -131,8 +146,22 @@ std::string Main::CommandLine::semanticError() const
 		m_getopt.contains("immediate") ||
 		m_getopt.contains("admin") ) )
 	{
-		return "usage error: the --forward, --immediate and --admin "
-			"switches require --forward-to" ;
+		return "the --forward, --immediate and --admin switches require --forward-to" ;
+	}
+
+	if( m_getopt.contains("verbose") && ! (
+		m_getopt.contains("help") ||
+		m_getopt.contains("log") ||
+		m_getopt.contains("as-server") ||
+		m_getopt.contains("as-client") ||
+		m_getopt.contains("as-proxy") ) )
+	{
+		return "the --verbose switch must be used with --log, --help, --as-client, --as-server or --as-proxy" ;
+	}
+
+	if( m_getopt.contains("interface") && ( m_getopt.contains("dont-serve") || m_getopt.contains("as-client") ) )
+	{
+		return "the --interface switch cannot be used with --as-client or --dont-serve" ;
 	}
 
 	return std::string() ;
@@ -146,7 +175,7 @@ bool Main::CommandLine::hasSemanticError() const
 void Main::CommandLine::showSemanticError( bool e ) const
 {
 	Show show( e ) ;
-	show.s() << m_arg.prefix() << ": " << semanticError() << std::endl ;
+	show.s() << m_arg.prefix() << ": usage error: " << semanticError() << std::endl ;
 }
 
 void Main::CommandLine::showUsageErrors( bool e ) const
@@ -169,7 +198,7 @@ void Main::CommandLine::showShortHelp( bool e ) const
 	const std::string & exe = m_arg.prefix() ;
 	show.s()
 		<< std::string(exe.length()+2U,' ')
-		<< "try \"" << exe << " --help\" for more information" << std::endl ;
+		<< "try \"" << exe << " --help --verbose\" for more information" << std::endl ;
 }
 
 void Main::CommandLine::showHelp( bool e ) const
@@ -189,20 +218,30 @@ void Main::CommandLine::showExtraHelp( bool e ) const
 
 	show.s() << std::endl ;
 
-	show.s()
-		<< "To start a 'storage' daemon in background..." << std::endl
-		<< "   " << exe << " --as-server" << std::endl
-		<< std::endl ;
+	if( m_getopt.contains("verbose") )
+	{
+		show.s()
+			<< "To start a 'storage' daemon in background..." << std::endl
+			<< "   " << exe << " --as-server" << std::endl
+			<< std::endl ;
 
-	show.s()
-		<< "To forward stored mail to \"mail.myisp.co.uk\"..."  << std::endl
-		<< "   " << exe << " --as-client mail.myisp.co.uk:smtp" << std::endl
-		<< std::endl ;
+		show.s()
+			<< "To forward stored mail to \"mail.myisp.co.uk\"..."  << std::endl
+			<< "   " << exe << " --as-client mail.myisp.co.uk:smtp" << std::endl
+			<< std::endl ;
 
-	show.s()
-		<< "To run as a proxy (on port 10025) to a local server (on port 25)..." << std::endl
-		<< "   " << exe << " --port 10025 --as-proxy localhost:25" << std::endl
-		<< std::endl ;
+		show.s()
+			<< "To run as a proxy (on port 10025) to a local server (on port 25)..." << std::endl
+			<< "   " << exe << " --port 10025 --as-proxy localhost:25" << std::endl
+			<< std::endl ;
+	}
+	else
+	{
+		show.s()
+			<< "For complete usage information run \"" << exe
+			<< " --help --verbose\"" << std::endl
+			<< std::endl ;
+	}
 }
 
 void Main::CommandLine::showNoop( bool e ) const
@@ -227,7 +266,7 @@ void Main::CommandLine::showCopyright( bool e ) const
 void Main::CommandLine::showWarranty( bool e ) const
 {
 	Show show( e ) ;
-	show.s() << Legal::warranty() ;
+	show.s() << Legal::warranty("","\n") ;
 }
 
 void Main::CommandLine::showVersion( bool e ) const
diff --git a/src/main/commandline.h b/src/main/commandline.h
index f6c6da5..542cdd4 100644
--- a/src/main/commandline.h
+++ b/src/main/commandline.h
@@ -35,7 +35,7 @@
 namespace Main
 {
 	class CommandLine ;
-} ;
+}
 
 // Class: Main::CommandLine
 // Description: A class which deals with the command-line interface
@@ -65,9 +65,6 @@ public:
 	bool hasSemanticError() const ;
 		// Returns true if the command line has logical errors (eg. conflicting switches).
 
-	void showUsage( bool error_stream = false ) const ;
-		// Writes usage info.
-
 	void showHelp( bool error_stream = false ) const ;
 		// Writes help text.
 
@@ -99,6 +96,7 @@ private:
 	static std::string switchSpec() ;
 	static std::string osSwitchSpec() ; // o/s-specific
 	unsigned int ttyColumns() const ; // o/s-specific
+	void showUsage( bool e ) const ;
 	void showExtraHelp( bool error_stream ) const ;
 
 private:
@@ -113,8 +111,10 @@ private:
 		public: std::ostream & s() ;
 		public: ~Show() ;
 		private: static Show * m_this ;
-		private: std::stringstream m_ss ;
-		private: bool m_e ;
+		private: class Imp ;
+		private: Imp * m_imp ;
+		private: Show( const Show & ) ; // not implemented
+		private: void operator=( const Show & ) ; // not implemented
 	} ;
 } ;
 
diff --git a/src/main/commandline_unix.cpp b/src/main/commandline_unix.cpp
index 45ebc6c..33e9b18 100644
--- a/src/main/commandline_unix.cpp
+++ b/src/main/commandline_unix.cpp
@@ -27,33 +27,42 @@
 #include "gstr.h"
 #include <iostream>
 
-Main::CommandLine::Show * Main::CommandLine::Show::m_this = NULL ;
+// Class: Main::CommandLine::ShowImp
+// Description: A private implementation class used by Main::CommandLine::Show.
+//
+class Main::CommandLine::Show::Imp
+{
+public:
+	bool m_e ;
+	explicit Imp( bool b ) : m_e(b) {}
+} ;
 
 //static
 std::string Main::CommandLine::osSwitchSpec()
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss
-		<< "l!log!writes log information on standard error (if open) and syslog (if not disabled)!0!|"
-		<< "t!no-daemon!does not detach from the terminal!0!|"
-		<< "u!user!names the effective user to switch to when started as root (default is \"daemon\")!1!username|"
-		<< "n!no-syslog!disables syslog output!0!"
+		<< "l!log!writes log information on standard error and syslog!0!!2|"
+		<< "t!no-daemon!does not detach from the terminal!0!!3|"
+		<< "u!user!names the effective user to switch to when started as root (default is \"daemon\")!1!username!3|"
+		<< "n!no-syslog!disables syslog output!0!!3"
 		;
 	return ss.str() ;
 }
 
 Main::CommandLine::Show::Show( bool e ) :
-	m_e(e)
+	m_imp( new Imp(e) )
 {
 }
 
 std::ostream & Main::CommandLine::Show::s()
 {
-	return m_e ? std::cerr : std::cout ;
+	return m_imp->m_e ? std::cerr : std::cout ;
 }
 
 Main::CommandLine::Show::~Show()
 {
+	delete m_imp ;
 }
 
 unsigned int Main::CommandLine::ttyColumns() const
diff --git a/src/main/commandline_win32.cpp b/src/main/commandline_win32.cpp
index db9766e..541ca62 100644
--- a/src/main/commandline_win32.cpp
+++ b/src/main/commandline_win32.cpp
@@ -24,9 +24,18 @@
 #include "gdef.h"
 #include "gsmtp.h"
 #include "commandline.h"
+#include <sstream>
 
 Main::CommandLine::Show * Main::CommandLine::Show::m_this = NULL ;
 
+class Main::CommandLine::Show::Imp
+{
+public:
+	std::ostringstream m_ss ;
+} ;
+
+// ===
+
 //static
 std::string Main::CommandLine::osSwitchSpec()
 {
@@ -34,12 +43,12 @@ std::string Main::CommandLine::osSwitchSpec()
 	// do not appear in the "--help" listing, but that might be
 	// confusing)
 
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss
-		<< "l!log!writes log information on standard error (if open)!0!|"
-		<< "t!no-daemon!use an ordinary window, not the system tray!0!|"
-		<< "n!no-syslog!dont use the event log!0!|"
-		<< "I!icon!selects the application icon!1!0^|1^|2^|3"
+		<< "l!log!writes log information on standard error and event log!0!!2|"
+		<< "t!no-daemon!use an ordinary window, not the system tray!0!!3|"
+		<< "n!no-syslog!dont use the event log!0!!3|"
+		<< "I!icon!selects the application icon!1!0^|1^|2^|3!3"
 		;
 
 	return ss.str() ;
@@ -52,7 +61,8 @@ unsigned int Main::CommandLine::ttyColumns() const
 
 // ===
 
-Main::CommandLine::Show::Show( bool )
+Main::CommandLine::Show::Show( bool ) :
+	m_imp( new Imp )
 {
 	if( m_this == NULL )
 	{
@@ -62,7 +72,7 @@ Main::CommandLine::Show::Show( bool )
 
 std::ostream & Main::CommandLine::Show::s()
 {
-	return m_this->m_ss ;
+	return m_this->m_imp->m_ss ;
 }
 
 Main::CommandLine::Show::~Show()
@@ -70,7 +80,8 @@ Main::CommandLine::Show::~Show()
 	if( m_this == this )
 	{
 		m_this = NULL ;
-		::MessageBox( NULL , m_ss.str().c_str() , "E-MailRelay" , MB_OK ) ;
+		::MessageBox( NULL , m_imp->m_ss.str().c_str() , "E-MailRelay" , MB_OK ) ;
 	}
+	delete m_imp ;
 }
 
diff --git a/src/main/common.dsp b/src/main/common.dsp
index 706109c..63b143c 100644
--- a/src/main/common.dsp
+++ b/src/main/common.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "CommonRelease"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GR /GX /O2 /I "../../lib/msvc6.0" /I "../gnet" /I "../glib" /I "../win32" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "G_WIN32" /YX"gdef.h" /FD /c
+# ADD CPP /nologo /W3 /GR /GX /O2 /I "../../lib/msvc6.0" /I "../gsmtp" /I "../gnet" /I "../glib" /I "../win32" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "G_WIN32" /YX"gdef.h" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "CommonDebug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../../lib/msvc6.0" /I "../gnet" /I "../glib" /I "../win32" /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "G_WIN32" /YX"gdef.h" /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../../lib/msvc6.0" /I "../gsmtp" /I "../gnet" /I "../glib" /I "../win32" /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "G_WIN32" /YX"gdef.h" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -89,7 +89,7 @@ SOURCE=..\gnet\gaddress_ipv4.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gadminserver.cpp
+SOURCE=..\gsmtp\gadminserver.cpp
 # End Source File
 # Begin Source File
 
@@ -109,7 +109,11 @@ SOURCE=..\glib\garg_win32.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gbase64.cpp
+SOURCE=..\gsmtp\gbase64.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glib\gcleanup_win32.cpp
 # End Source File
 # Begin Source File
 
@@ -121,7 +125,7 @@ SOURCE=..\gnet\gclient_win32.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gclientprotocol.cpp
+SOURCE=..\gsmtp\gclientprotocol.cpp
 # End Source File
 # Begin Source File
 
@@ -137,10 +141,6 @@ SOURCE=..\win32\gcracker.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\glib\gdaemon.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\glib\gdaemon_win32.cpp
 # End Source File
 # Begin Source File
@@ -173,10 +173,6 @@ SOURCE=..\glib\gdirectory_win32.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\gnet\gevent_win32.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\gnet\geventhandler.cpp
 # End Source File
 # Begin Source File
@@ -185,6 +181,10 @@ SOURCE=..\gnet\geventloop.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\gnet\geventloop_win32.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\gnet\geventserver.cpp
 # End Source File
 # Begin Source File
@@ -201,7 +201,7 @@ SOURCE=..\glib\gfile_win32.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gfilestore.cpp
+SOURCE=..\gsmtp\gfilestore.cpp
 # End Source File
 # Begin Source File
 
@@ -241,11 +241,11 @@ SOURCE=..\glib\gmd5.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gmessagestore.cpp
+SOURCE=..\gsmtp\gmessagestore.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gmessagestore_win32.cpp
+SOURCE=..\gsmtp\gmessagestore_win32.cpp
 # End Source File
 # Begin Source File
 
@@ -253,11 +253,11 @@ SOURCE=..\gnet\gmonitor.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gnewfile.cpp
+SOURCE=..\gsmtp\gnewfile.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gnewmessage.cpp
+SOURCE=..\gsmtp\gnewmessage.cpp
 # End Source File
 # Begin Source File
 
@@ -265,19 +265,23 @@ SOURCE=..\glib\gpath.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\glib\gpidfile.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\glib\gprocess_win32.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gprotocolmessage.cpp
+SOURCE=..\gsmtp\gprotocolmessage.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gprotocolmessageforward.cpp
+SOURCE=..\gsmtp\gprotocolmessageforward.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gprotocolmessagestore.cpp
+SOURCE=..\gsmtp\gprotocolmessagestore.cpp
 # End Source File
 # Begin Source File
 
@@ -289,6 +293,10 @@ SOURCE=..\win32\gpump_dialog.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\glib\gregistry_win32.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\gnet\grequest.cpp
 # End Source File
 # Begin Source File
@@ -309,7 +317,7 @@ SOURCE=..\glib\groot.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gsasl_native.cpp
+SOURCE=..\gsmtp\gsasl_native.cpp
 # End Source File
 # Begin Source File
 
@@ -317,7 +325,7 @@ SOURCE=..\win32\gscmap.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gsecrets.cpp
+SOURCE=..\gsmtp\gsecrets.cpp
 # End Source File
 # Begin Source File
 
@@ -325,15 +333,15 @@ SOURCE=..\gnet\gserver.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gserverprotocol.cpp
+SOURCE=..\gsmtp\gserverprotocol.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gsmtpclient.cpp
+SOURCE=..\gsmtp\gsmtpclient.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gsmtpserver.cpp
+SOURCE=..\gsmtp\gsmtpserver.cpp
 # End Source File
 # Begin Source File
 
@@ -345,11 +353,11 @@ SOURCE=..\gnet\gsocket_win32.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gstoredfile.cpp
+SOURCE=..\gsmtp\gstoredfile.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gstoredmessage.cpp
+SOURCE=..\gsmtp\gstoredmessage.cpp
 # End Source File
 # Begin Source File
 
@@ -369,7 +377,7 @@ SOURCE=..\win32\gtray.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=gverifier.cpp
+SOURCE=..\gsmtp\gverifier.cpp
 # End Source File
 # Begin Source File
 
@@ -385,11 +393,7 @@ SOURCE=..\win32\gwinhid.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\gnet\gwinsock.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=gxtext.cpp
+SOURCE=..\gsmtp\gxtext.cpp
 # End Source File
 # Begin Source File
 
diff --git a/src/main/configuration.cpp b/src/main/configuration.cpp
index f3e8262..5a4d4de 100644
--- a/src/main/configuration.cpp
+++ b/src/main/configuration.cpp
@@ -41,30 +41,47 @@ std::string Main::Configuration::yn( bool b )
 	return b ? std::string("yes") : std::string("no") ;
 }
 
+std::string Main::Configuration::na() const
+{
+	return "<none>" ;
+}
+
+std::string Main::Configuration::na( const std::string & s ) const
+{
+	return s.empty() ? na() : s ;
+}
+
+//static
+std::string Main::Configuration::any( const std::string & s )
+{
+	return s.empty() ? std::string("<any>") : s ;
+}
+
 std::string Main::Configuration::str( const std::string & p , const std::string & eol ) const
 {
-	const std::string na( "n/a" ) ;
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss
-		<< p << "listening port: " << (doServing()?G::Str::fromUInt(port()):na) << eol
-		<< p << "downstream server address: " << (doForwarding()?serverAddress():na) << eol
+		<< p << "listening port: " << (doServing()?G::Str::fromUInt(port()):na()) << eol
+		<< p << "listening interface: " << (doServing()?any(interface_()):na()) << eol
+		<< p << "next server address: " << (doForwarding()?serverAddress():na()) << eol
 		<< p << "spool directory: " << spoolDir() << eol
 		<< p << "immediate forwarding? " << yn(immediate()) << eol
-		<< p << "pre-processor: " << (useFilter()?filter():na) << eol
-		<< p << "admin port: " << (doAdmin()?G::Str::fromUInt(adminPort()):na) << eol
+		<< p << "mail processor: " << (useFilter()?filter():na()) << eol
+		//<< p << "address verifier: " << na(verifier().str()) << eol
+		<< p << "admin port: " << (doAdmin()?G::Str::fromUInt(adminPort()):na()) << eol
 		<< p << "run as daemon? " << yn(daemon()) << eol
-		<< p << "log to stderr/syslog? " << yn(log()) << eol
 		<< p << "verbose logging? " << yn(verbose()) << eol
 		<< p << "debug logging? " << yn(debug()) << eol
-		//<< p << "use syslog? " << yn(syslog()) << eol
+		<< p << "log to stderr/syslog? " << yn(log()) << eol
+		<< p << "use syslog? " << yn(syslog()) << eol
 		<< p << "close stderr? " << yn(closeStderr()) << eol
 		<< p << "allow remote clients? " << yn(allowRemoteClients()) << eol
-		<< p << "pid file: " << (usePidFile()?pidFile():na) << eol
-		<< p << "client secrets file: " << clientSecretsFile() << eol
-		<< p << "server secrets file: " << serverSecretsFile() << eol
+		<< p << "pid file: " << (usePidFile()?pidFile():na()) << eol
+		<< p << "client secrets file: " << na(clientSecretsFile()) << eol
+		<< p << "server secrets file: " << na(serverSecretsFile()) << eol
 		<< p << "connect timeout: " << connectionTimeout() << "s" << eol
 		<< p << "response timeout: " << responseTimeout() << "s" << eol
-		<< p << "domain override: " << fqdn() << eol
+		<< p << "domain override: " << na(fqdn()) << eol
 		;
 	return ss.str() ;
 }
@@ -104,6 +121,11 @@ unsigned int Main::Configuration::port() const
 		G::Str::toUInt(m_cl.value("port")) : 25U ;
 }
 
+std::string Main::Configuration::interface_() const
+{
+	return m_cl.contains("interface") ? m_cl.value("interface") : std::string() ;
+}
+
 unsigned int Main::Configuration::adminPort() const
 {
 	return m_cl.contains("admin") ?
@@ -157,6 +179,11 @@ bool Main::Configuration::doServing() const
 	return !m_cl.contains("dont-serve") && !m_cl.contains("as-client") ;
 }
 
+bool Main::Configuration::doSmtp() const
+{
+	return !m_cl.contains("dont-listen") ;
+}
+
 bool Main::Configuration::allowRemoteClients() const
 {
 	return m_cl.contains("remote-clients") ;
@@ -232,3 +259,8 @@ std::string Main::Configuration::nobody() const
 	return m_cl.contains("user") ? m_cl.value("user") : std::string("daemon") ;
 }
 
+G::Path Main::Configuration::verifier() const
+{
+	return m_cl.contains("verifier") ? G::Path(m_cl.value("verifier")) : G::Path() ;
+}
+
diff --git a/src/main/configuration.h b/src/main/configuration.h
index dfddb35..84e55c8 100644
--- a/src/main/configuration.h
+++ b/src/main/configuration.h
@@ -33,7 +33,7 @@ namespace Main
 {
 	class Configuration ;
 	class CommandLine ;
-} ;
+}
 
 // Class: Main::Configuration
 // Description: An interface for returning application configuration
@@ -54,7 +54,10 @@ public:
 			// string.
 
 	unsigned int port() const ;
-		// Returns the main port number.
+		// Returns the main listening port number.
+
+	std::string interface_() const ;
+		// Returns the listening interface.
 
 	unsigned int adminPort() const ;
 		// Returns the admin port number.
@@ -87,10 +90,13 @@ public:
 		// Returns true if running as a client.
 
 	bool doServing() const ;
-		// Returns true if running as a server.
+		// Returns true if running as a server (SMTP, admin or COM).
+
+	bool doSmtp() const ;
+		// Returns true if listening for smtp connections.
 
 	bool doAdmin() const ;
-		// Returns true if enabling the admin interface.
+		// Returns true if listening for admin connections.
 
 	bool allowRemoteClients() const ;
 		// Returns true if allowing remote clients to connect.
@@ -137,11 +143,17 @@ public:
 		// Returns the name of an unprivileged user. This is only
 		// used if running with a real user-id of root.
 
+	G::Path verifier() const ;
+		// Returns the path of an external address verifier program.
+
 private:
 	const CommandLine & m_cl ;
 
 private:
 	static std::string yn( bool ) ;
+	static std::string any( const std::string & ) ;
+	std::string na() const ;
+	std::string na( const std::string & ) const ;
 } ;
 
 #endif
diff --git a/src/main/doxygen.cfg b/src/main/doxygen.cfg
old mode 100755
new mode 100644
index 8084b76..5005071
--- a/src/main/doxygen.cfg
+++ b/src/main/doxygen.cfg
@@ -3,7 +3,7 @@
 # General configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = E-MailRelay
-PROJECT_NUMBER         = 0.9.9
+PROJECT_NUMBER         = 1.0.0
 OUTPUT_DIRECTORY       = 
 OUTPUT_LANGUAGE        = English
 EXTRACT_ALL            = YES
@@ -53,6 +53,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 INPUT                  = __TOP_SRC__/src/glib \
                          __TOP_SRC__/src/gnet \
+                         __TOP_SRC__/src/gsmtp \
                          __TOP_SRC__/src/main
 FILE_PATTERNS          = *.cpp \
                          *.h
@@ -71,7 +72,8 @@ EXCLUDE_PATTERNS       = \
                          */gwinsock.* \
                          */grequest.* \
                          */submit.cpp \
-                         */passwd.cpp
+                         */passwd.cpp \
+                         */emailrelay_idl.h
 EXAMPLE_PATH           = 
 EXAMPLE_PATTERNS       = 
 IMAGE_PATH             = 
diff --git a/src/main/doxygen.h b/src/main/doxygen.h
new file mode 100644
index 0000000..22d1f5d
--- /dev/null
+++ b/src/main/doxygen.h
@@ -0,0 +1,103 @@
+/*
+
+Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+/* \htmlonly */
+
+/*! \mainpage E-MailRelay Source code
+
+This documentation has been generated by doxygen from the E-MailRelay's
+source code. The <a href="namespaces.html">Namespace List</a> is a good starting point
+for browsing -- the detailed description section towards the end of each namespace
+page gives a list of the namespace's key classes.
+
+The E-MailRelay <a href="../developer.html">developer's guide</a> also gives an overview
+of the code structure, including simple class diagrams for the
+<a href="../gnet-classes.png">GNet</a> and
+<a href="../gsmtp-classes.png">GSmtp</a> namespaces.
+
+*/
+
+/*! \namespace Main
+\short
+Application-level classes.
+
+The Main namespace contains application-level classes for
+the E-MailRelay process.
+
+Key classes are:
+- Run
+- CommandLine
+- Configuration
+
+ */
+
+/*! \namespace GSmtp
+\short
+SMTP and message-store classes.
+
+The GSmtp namespace contains classes relating to the SMTP
+protocol and to e-mail storage.
+
+Key classes are:
+- MessageStore
+- ClientProtocol
+- Client
+- ServerProtocol
+- Server
+
+ */
+
+/*! \namespace GNet
+\short
+Network classes.
+
+The GNet namespace contains network interface classes
+based on the Berkley socket and WinSock system APIs.
+
+Key classes are:
+- EventHandler
+- EventLoop
+- Socket
+- Address
+- Resolver
+- Server
+
+*/
+
+/*! \namespace G
+\short
+Low-level classes.
+
+The G namespace contains low-level classes for file-system abstraction,
+date and time representation, string utility functions, logging,
+command line parsing etc.
+
+Key classes are:
+- Str
+- GetOpt
+- Path
+- File
+- LogOutput
+- Log
+- Process
+
+*/
+
+/* \endhtmlonly */
diff --git a/src/main/emailrelay.dsp b/src/main/emailrelay.dsp
index 8e2d38f..a6d2616 100644
--- a/src/main/emailrelay.dsp
+++ b/src/main/emailrelay.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /W3 /GR /GX /O2 /I "../win32" /I "../../lib/msvc6.0" /I "../gnet" /I "../glib" /D "NDEBUG" /D "G_WIN32" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /YX"gdef.h" /FD /c
+# ADD CPP /nologo /W3 /GR /GX /O2 /I "../../lib/msvc6.0" /I "../gsmtp" /I "../gnet" /I "../glib" /I "../win32" /D "NDEBUG" /D "G_WIN32" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /YX"gdef.h" /FD /c
 # SUBTRACT CPP /X
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib /nologo /machine:I386
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "emailrelay - Win32 Debug"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../../src/glib" /I "../../src/gnet" /I "../../src/win32" /I "../../lib/msvc6.0" /I "../gnet" /I "../glib" /I "../win32" /D "_DEBUG" /D "G_WIN32" /D "WIN32" /D "_MBCS" /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../../src/glib" /I "../../src/gnet" /I "../../src/win32" /I "../../lib/msvc6.0" /I "../gsmtp" /I "../gnet" /I "../glib" /I "../win32" /D "_DEBUG" /D "G_WIN32" /D "WIN32" /D "_MBCS" /FD /GZ /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
@@ -77,7 +77,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib /nologo /debug /machine:I386 /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
diff --git a/src/main/emailrelay.dsw b/src/main/emailrelay.dsw
index 05bf41e..fe83055 100644
--- a/src/main/emailrelay.dsw
+++ b/src/main/emailrelay.dsw
@@ -45,6 +45,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "poke"=".\poke.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "submit"=".\submit.dsp" - Package Owner=<4>
 
 Package=<5>
diff --git a/src/main/emailrelay.rc b/src/main/emailrelay.rc
index f4fd6d9..753c6e6 100644
--- a/src/main/emailrelay.rc
+++ b/src/main/emailrelay.rc
@@ -51,6 +51,8 @@ END
 3 TEXTINCLUDE DISCARDABLE 
 BEGIN
     "#include <messages.rc>\r\n"
+    "\r\n"
+    "\r\n"
     "\0"
 END
 
@@ -114,8 +116,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,9,0
- PRODUCTVERSION 0,9,9,0
+ FILEVERSION 1,0,0,0
+ PRODUCTVERSION 1,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -133,14 +135,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", " \0"
             VALUE "FileDescription", "E-MailRelay Application\0"
-            VALUE "FileVersion", "0, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 0, 0, 0\0"
             VALUE "InternalName", "emailrelay\0"
             VALUE "LegalCopyright", "Copyright © Graeme Walker, 2002\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "emailrelay.rc\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "E-MailRelay\0"
-            VALUE "ProductVersion", "0, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 0, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
@@ -164,6 +166,8 @@ END
 //
 #include <messages.rc>
 
+
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
diff --git a/src/main/gverifier.cpp b/src/main/gverifier.cpp
deleted file mode 100644
index da8671a..0000000
--- a/src/main/gverifier.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (C) 2001-2002 Graeme Walker <graeme_walker@users.sourceforge.net>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later
-// version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-// ===
-//
-// gverifier.cpp
-//
-
-#include "gdef.h"
-#include "gsmtp.h"
-#include "gverifier.h"
-#include "gstr.h"
-#include "glocal.h"
-#include "gassert.h"
-#include "glog.h"
-
-GSmtp::Verifier::Status GSmtp::Verifier::verify( const std::string & address ) const
-{
-	G_DEBUG( "GSmtp::ProtocolMessage::verify: \"" << address << "\"" ) ;
-
-	std::string fqdn = GNet::Local::fqdn() ;
-	std::string host ;
-	std::string user( address ) ;
-	size_t at_pos = address.find('@') ;
-	if( at_pos != std::string::npos )
-	{
-		host = address.substr(at_pos+1U) ;
-		user = address.substr(0U,at_pos) ;
-	}
-	G::Str::toUpper( fqdn ) ;
-	G::Str::toUpper( host ) ;
-	G::Str::toUpper( user ) ;
-
-	Status status ;
-	status.is_local = false ;
-	status.address = address ;
-	if( user == "POSTMASTER" && ( host.empty() || host == "LOCALHOST" || host == fqdn ) )
-	{
-		// accept 'postmaster' for local delivery
-		status.is_local = true ;
-		status.full_name = "Local postmaster <postmaster@localhost>" ;
-		status.address = "postmaster" ;
-	}
-	else if( host.empty() || host == "LOCALHOST" )
-	{
-		// reject local addressees
-		status.is_local = true ;
-	}
-	return status ;
-}
-
diff --git a/src/main/legal.cpp b/src/main/legal.cpp
index 8b9ca59..21d6421 100644
--- a/src/main/legal.cpp
+++ b/src/main/legal.cpp
@@ -33,14 +33,14 @@ std::string Main::Legal::copyright()
 }
 
 //static
-std::string Main::Legal::warranty( const std::string & eol )
+std::string Main::Legal::warranty( const std::string & prefix , const std::string & eol )
 {
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss
-		<< "This software is provided without warranty of any kind." << eol
-		<< "You may redistribure copies of this program under " << eol
-		<< "the terms of the GNU General Public License." << eol
-		<< "For more information refer to the file named COPYING." << eol ;
+		<< prefix << "This software is provided without warranty of any kind." << eol
+		<< prefix << "You may redistribure copies of this program under " << eol
+		<< prefix << "the terms of the GNU General Public License." << eol
+		<< prefix << "For more information refer to the file named COPYING." << eol ;
 	return ss.str() ;
 }
 
diff --git a/src/main/legal.h b/src/main/legal.h
index 3a4a255..8f160b1 100644
--- a/src/main/legal.h
+++ b/src/main/legal.h
@@ -31,7 +31,7 @@
 namespace Main
 {
 	class Legal ;
-} ;
+}
 
 // Class: Main::Legal
 // Description: A static class providing warranty and copyright text.
@@ -39,7 +39,7 @@ namespace Main
 class Main::Legal
 {
 public:
-	static std::string warranty( const std::string & eol = std::string("\n") ) ;
+	static std::string warranty( const std::string & prefix , const std::string & eol ) ;
 		// Returns the warranty text.
 
 	static std::string copyright() ;
diff --git a/src/main/main_win32.cpp b/src/main/main_win32.cpp
index edd5e84..88b7bb7 100644
--- a/src/main/main_win32.cpp
+++ b/src/main/main_win32.cpp
@@ -20,60 +20,69 @@
 //
 // main_win32.cpp
 //
+// This file contains all the GUI code
+// for the Windows executable. (There's too much
+// in here, but at least it keeps it out of sight
+// when in a unix mindset.)
+//
 
 #include "gdef.h"
 #include "gsmtp.h"
-#include "run.h"
-#include "configuration.h"
 #include "commandline.h"
+#include "configuration.h"
 #include "legal.h"
 #include "resource.h"
-#include "gtray.h"
+#include "run.h"
 #include "gappbase.h"
-#include "gdialog.h"
-#include "gcontrol.h"
-#include "gmonitor.h"
-#include "gpump.h"
-#include "gstr.h"
-#include "gexception.h"
-#include "gmemory.h"
-#include "glog.h"
 #include "gassert.h"
+#include "gcontrol.h"
+#include "gdialog.h"
+#include "gexception.h"
+#include "glog.h"
+#include "gmd5.h"
+#include "gmemory.h"
+#include "gmessagestore.h"
+#include "gmonitor.h"
+#include "gnoncopyable.h"
+#include "gpump.h"
+#include "gregistry.h"
+#include "gstoredmessage.h"
+#include "gstr.h"
+#include "gtray.h"
+#include <algorithm>
+#include <list>
 
 namespace
 {
-	class Callback
-	{
-		public: virtual void callback() = 0 ;
-	} ;
+	class App ;
 
 	class Form : public GGui::Dialog
 	{
 	public:
-		Form( GGui::ApplicationBase & , Callback & ,
-			const Main::Configuration & cfg , bool confirm ) ;
+		Form( App & , const Main::Configuration & cfg , bool confirm ) ;
 		void close() ;
 	private:
 		virtual bool onInit() ;
 		virtual void onNcDestroy() ;
-		virtual void onClose() ;
 		virtual void onCommand( unsigned int id ) ;
 		std::string text() const ;
 	private:
-		GGui::ApplicationBase & m_app ;
-		Callback & m_callback ;
+		App & m_app ;
 		GGui::EditBox m_edit_box ;
 		Main::Configuration m_cfg ;
 		bool m_confirm ;
 	} ;
 
-	class App : public GGui::ApplicationBase , private Callback
+	class App : public GGui::ApplicationBase
 	{
 	public:
 		G_EXCEPTION( Error , "application error" ) ;
 		App( HINSTANCE h , HINSTANCE p , const char * name ) ;
 		void init( const Main::Configuration & cfg ) ;
 		void setStatus( const std::string & , const std::string & ) ;
+		bool confirm() ;
+		void formOk() ;
+		void formDone() ;
 	private:
 		void doOpen() ;
 		void doClose() ;
@@ -85,9 +94,9 @@ namespace
 		virtual bool onClose() ;
 		virtual void onTrayDoubleClick() ;
 		virtual void onTrayRightMouseButtonDown() ;
-		virtual void callback() ;
 		virtual void onDimension( int & , int & ) ;
 		virtual bool onSysCommand( SysCommand ) ;
+		virtual LRESULT onUser( WPARAM , LPARAM ) ;
 	private:
 		std::auto_ptr<GGui::Tray> m_tray ;
 		std::auto_ptr<Form> m_form ;
@@ -95,6 +104,7 @@ namespace
 		bool m_quit ;
 		bool m_use_tray ;
 		unsigned int m_icon ;
+		bool m_external_gui ;
 	} ;
 
 	class Menu
@@ -103,7 +113,7 @@ namespace
 		G_EXCEPTION( Error , "menu error" ) ;
 		explicit Menu( unsigned int resource_id ) ;
 		~Menu() ;
-		int popup( const GGui::WindowBase & w , int sub_pos = 0 ) ;
+		int popup( const GGui::WindowBase & w , bool with_open , bool with_close ) ;
 	private:
 		HMENU m_hmenu ;
 		HMENU m_hmenu_popup ;
@@ -113,18 +123,22 @@ namespace
 
 	class Run : public Main::Run
 	{
-		public: Run( App & app , const G::Arg & ) ;
-		protected: void onStatusChange( const std::string & , const std::string & ) ;
-		private: App & m_app ;
+	public:
+		Run( App & app , const G::Arg & ) ;
+	protected:
+		virtual void onEvent( const std::string & , const std::string & , const std::string & ) ;
+		virtual bool runnable() const ;
+	private:
+		App & m_app ;
+		bool m_runnable ;
 	} ;
 } ;
 
 // ===
 
-Form::Form( GGui::ApplicationBase & app , Callback & cb , const Main::Configuration & cfg , bool confirm ) :
+Form::Form( App & app , const Main::Configuration & cfg , bool confirm ) :
 	GGui::Dialog(app) ,
 	m_app(app) ,
-	m_callback(cb) ,
 	m_cfg(cfg) ,
 	m_edit_box(*this,IDC_EDIT1) ,
 	m_confirm(confirm)
@@ -141,7 +155,7 @@ std::string Form::text() const
 {
 	const std::string crlf( "\r\n" ) ;
 
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss
 		<< "E-MailRelay V" << Main::Run::versionNumber() << crlf << crlf
 		<< "Configuration..." << crlf
@@ -155,17 +169,12 @@ std::string Form::text() const
 	}
 
 	ss
-		<< crlf << Main::Legal::warranty(crlf)
+		<< crlf << Main::Legal::warranty("",crlf)
 		<< crlf << Main::Legal::copyright() ;
 
 	return ss.str() ;
 }
 
-void Form::onClose()
-{
-	end() ;
-}
-
 void Form::close()
 {
 	end() ;
@@ -173,18 +182,15 @@ void Form::close()
 
 void Form::onNcDestroy()
 {
-	m_callback.callback() ;
+	m_app.formDone() ;
 }
 
 void Form::onCommand( unsigned int id )
 {
-	if( id == IDOK ) // always true?
+	if( id == IDOK && ( !m_confirm || m_app.confirm() ) )
 	{
-		bool really = true ;
-		if( m_confirm )
-			really = m_app.messageBoxQuery( "Really quit?" ) ;
-		if( really )
-			end() ;
+		m_app.formOk() ;
+		end() ;
 	}
 }
 
@@ -194,7 +200,8 @@ App::App( HINSTANCE h , HINSTANCE p , const char * name ) :
 	GGui::ApplicationBase( h , p , name ) ,
 	m_use_tray(false) ,
 	m_quit(false) ,
-	m_icon(0U)
+	m_icon(0U) ,
+	m_external_gui(false)
 {
 }
 
@@ -205,17 +212,9 @@ void App::init( const Main::Configuration & cfg )
 	m_icon = m_cfg->icon() % 4U ;
 }
 
-void App::callback()
-{
-	m_form <<= 0 ;
-	if( m_use_tray )
-		hide() ;
-	else
-		close() ;
-}
-
 void App::onDimension( int & dx , int & dy )
 {
+	G_ASSERT( m_form.get() != NULL ) ;
 	if( m_form.get() )
 	{
 		// (force main window's internal size to be
@@ -258,94 +257,103 @@ bool App::onCreate()
 	return true ;
 }
 
+void App::onTrayRightMouseButtonDown()
+{
+	Menu menu( IDR_MENU1 ) ;
+	bool form_is_open = m_form.get() != NULL ;
+	bool with_open = m_external_gui || !form_is_open ;
+	bool with_close = m_external_gui || form_is_open ;
+	int id = menu.popup( *this , with_open , with_close ) ;
+
+	// make it asychronous to prevent "RPC_E_CANTCALLOUT_ININPUTSYNCCALL" --
+	// see App::onUser()
+	::PostMessage( handle() , wm_user() , 0 , static_cast<LPARAM>(id) ) ;
+}
+
 void App::onTrayDoubleClick()
 {
-	doOpen() ;
+	// make it asychronous to prevent "RPC_E_CANTCALLOUT_ININPUTSYNCCALL" --
+	// see App::onUser()
+	::PostMessage( handle() , wm_user() , 0 , static_cast<LPARAM>(IDM_OPEN) ) ;
+}
+
+LRESULT App::onUser( WPARAM , LPARAM lparam )
+{
+	int id = static_cast<int>(lparam) ;
+	if( id == IDM_OPEN ) doOpen() ;
+	if( id == IDM_CLOSE ) doClose() ;
+	if( id == IDM_QUIT ) doQuit() ;
+	return 0L ;
 }
 
 void App::doOpen()
 {
-	if( m_form.get() == NULL )
+	if( !m_external_gui )
 	{
-		m_form <<= new Form( *this , *this , *m_cfg.get() , !m_use_tray ) ;
-		if( ! m_form->runModeless(IDD_DIALOG1) )
-			throw Error( "cannot run dialog box" ) ;
-	}
-	resize( externalSize() ) ; // no-op in itself, but uses onDimension()
-	show() ;
-}
+		if( m_form.get() == NULL )
+		{
+			m_form <<= new Form( *this , *m_cfg.get() , !m_use_tray ) ;
+			if( ! m_form->runModeless(IDD_DIALOG1) )
+				throw Error( "cannot run dialog box" ) ;
+		}
 
-void App::onTrayRightMouseButtonDown()
-{
-	Menu menu( IDR_MENU1 ) ;
-	int id = menu.popup( *this ) ;
-	if( id == IDM_OPEN )
-		doOpen() ;
-	else if( id == IDM_CLOSE )
-		doClose() ;
-	else
-		doQuit() ;
+		resize( externalSize() ) ; // no-op in itself, but uses onDimension()
+		show() ;
+	}
 }
 
 void App::doQuit()
 {
 	m_quit = true ;
-	close() ;
-}
-
-void App::doClose()
-{
-	if( m_form.get() )
-	{
-		m_form->close() ;
-		hide() ;
-	}
+	close() ; // triggers onClose(), but without doClose()
 }
 
 bool App::onClose()
 {
-	if( m_use_tray )
-	{
-		if( m_quit ) // if called as a result of doQuit()
-		{
-			return true ;
-		}
-		else
-		{
-			doClose() ;
-			return false ; // false <= keep running
-		}
-	}
-	else
-	{
-		return true ;
-	}
+	// (this is triggered by close() or using the system close menu item)
+
+	bool really_quit = m_quit || ( !m_use_tray && confirm() ) ;
+	if( !really_quit ) doClose() ;
+	return really_quit ;
+}
+
+bool App::confirm()
+{
+	return messageBoxQuery("Really quit?") ;
+}
+
+void App::doClose()
+{
+	hide() ;
+
+	// (close the form so that it gets recreated each time with current data)
+	if( m_form.get() != NULL )
+		m_form->close() ;
+}
+
+void App::formOk()
+{
+	// (this is triggered by clicking the OK button)
+	m_use_tray ? doClose() : doQuit() ;
+}
+
+void App::formDone()
+{
+	// (this is called from Form::onNcDestroy)
+	m_form <<= 0 ;
 }
 
 bool App::onSysCommand( SysCommand sc )
 {
-	if( sc == scMaximise || sc == scSize )
-		return true ; // true <= processed as no-op => dont change
-	else
-		return false ;
+	// true <= processed as no-op => dont change size
+	return sc == scMaximise || sc == scSize ;
 }
 
 void App::setStatus( const std::string & s1 , const std::string & s2 )
 {
-	// simple implementation for now...
-
-	std::string s0( title() ) ;
-	std::string message( s0 ) ;
-	if( !s1.empty() )
-	{
-		message.append( ": " ) ;
-		message.append( s1 ) ;
-	}
-	if( !s2.empty() )
-	{
-		message.append( ": " ) ;
-		message.append( s2 ) ;
-	}
+	std::string message( title() ) ;
+	if( !s1.empty() ) message.append( std::string(": ")+s1 ) ;
+	if( !s2.empty() ) message.append( std::string(": ")+s2 ) ;
 	::SetWindowText( handle() , message.c_str() ) ;
 }
 
@@ -359,8 +367,11 @@ Menu::Menu( unsigned int id )
 		throw Error() ;
 }
 
-int Menu::popup( const GGui::WindowBase & w , int sub_pos )
+int Menu::popup( const GGui::WindowBase & w , bool with_open , bool with_close )
 {
+	const int open_pos = 0 ;
+	const int close_pos = 1 ;
+
 	POINT p ;
 	::GetCursorPos( &p ) ;
 	::SetForegroundWindow( w.handle() ) ;
@@ -368,13 +379,21 @@ int Menu::popup( const GGui::WindowBase & w , int sub_pos )
 	// TrackPopup() only works with a sub-menu, although
 	// you would never guess from the documentation
 	//
-	m_hmenu_popup = ::GetSubMenu( m_hmenu , sub_pos ) ;
+	m_hmenu_popup = ::GetSubMenu( m_hmenu , 0 ) ;
 
 	// make the "open" menu item bold
 	//
-	const int default_pos = 0 ;
-	::SetMenuDefaultItem( m_hmenu_popup , default_pos , TRUE ) ;
+	::SetMenuDefaultItem( m_hmenu_popup , open_pos , TRUE ) ;
 
+	// optionally grey-out menu items
+	//
+	if( !with_open )
+		::EnableMenuItem( m_hmenu_popup , open_pos , MF_BYPOSITION | MF_GRAYED ) ;
+	if( !with_close )
+		::EnableMenuItem( m_hmenu_popup , close_pos , MF_BYPOSITION | MF_GRAYED ) ;
+
+	// display the menu
+	//
 	BOOL rc = ::TrackPopupMenuEx( m_hmenu_popup ,
 		TPM_RETURNCMD , p.x , p.y , w.handle() , NULL ) ;
 	return static_cast<int>(rc) ; // BOOL->int!, only in Microsoft wonderland
@@ -390,13 +409,20 @@ Menu::~Menu()
 
 Run::Run( App & app , const G::Arg & arg ) :
 	Main::Run(arg) ,
-	m_app(app)
+	m_app(app) ,
+	m_runnable(true)
 {
 }
 
-void Run::onStatusChange( const std::string & s1 , const std::string & s2 )
+void Run::onEvent( const std::string & category , const std::string & s1 , const std::string & s2 )
 {
-	m_app.setStatus( s1 , s2 ) ;
+	if( category == "client" )
+		m_app.setStatus( s1 , s2 ) ;
+}
+
+bool Run::runnable() const
+{
+	return m_runnable ;
 }
 
 // ===
diff --git a/src/main/passwd.cpp b/src/main/passwd.cpp
index 88b8886..aac5ccb 100644
--- a/src/main/passwd.cpp
+++ b/src/main/passwd.cpp
@@ -29,6 +29,7 @@
 #include "gstr.h"
 #include "garg.h"
 #include "gmd5.h"
+#include "legal.h"
 #include <iostream>
 
 int main( int argc , char * argv [] )
@@ -40,11 +41,8 @@ int main( int argc , char * argv [] )
 		{
 			std::cerr
 				<< "usage: " << arg.prefix() << std::endl
-				<< "  This software is provided without warranty of any kind." << std::endl
-				<< "  You may redistribure copies of this program under " << std::endl
-				<< "  the terms of the GNU General Public License." << std::endl
-				<< "  For more information refer to the file named COPYING." << std::endl
-        			<< "    Copyright (C) 2002 Graeme Walker" << std::endl ;
+				<< Main::Legal::warranty("  ","\n")
+				<< "    " << Main::Legal::copyright() << std::endl ;
 			return EXIT_FAILURE ;
 		}
 
diff --git a/src/main/passwd.dsp b/src/main/passwd.dsp
index b58bf35..517fade 100644
--- a/src/main/passwd.dsp
+++ b/src/main/passwd.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GR /GX /O2 /I "../../lib/msvc6.0" /I "../gnet" /I "../glib" /I "../win32" /D "NDEBUG" /D "_CONSOLE" /D "G_WIN32" /D "WIN32" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GR /GX /O2 /I "../../lib/msvc6.0" /I "../gsmtp" /I "../gnet" /I "../glib" /I "../win32" /D "NDEBUG" /D "_CONSOLE" /D "G_WIN32" /D "WIN32" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\glib" /I "../../lib/msvc6.0" /I "../gnet" /I "../glib" /I "../win32" /D "_DEBUG" /D "G_WIN32" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\glib" /I "../../lib/msvc6.0" /I "../gsmtp" /I "../gnet" /I "../glib" /I "../win32" /D "_DEBUG" /D "G_WIN32" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/src/main/poke.c b/src/main/poke.c
index d467cd8..7ef90d4 100644
--- a/src/main/poke.c
+++ b/src/main/poke.c
@@ -34,12 +34,19 @@
 // usage: poke [<port> [<send-string>]]
 //
 
+#if defined(G_WINDOWS) || defined(G_WIN32) || defined(_WIN32) || defined(WIN32)
+#include <windows.h>
+#include <io.h>
+#define write _write
+#define STDOUT_FILENO 1
+#else
 #include <unistd.h>
-#include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/inet.h>
+#endif
+#include <stdlib.h>
 #include <string.h>
 
 int main( int argc , char * argv [] )
@@ -81,12 +88,12 @@ int main( int argc , char * argv [] )
 		return EXIT_FAILURE ;
 
 	/* send the string */
-	rc = write( fd , buffer , strlen(buffer) ) ;
+	rc = send( fd , buffer , strlen(buffer) , 0 ) ;
 	if( rc != (int)strlen(buffer) ) 
 		return EXIT_FAILURE ;
 
 	/* read the reply */
-	rc = read( fd , buffer , sizeof(buffer)-1U) ;
+	rc = recv( fd , buffer , sizeof(buffer)-1U , 0 ) ;
 	if( rc <= 0 ) 
 		return EXIT_FAILURE ;
 
diff --git a/src/main/poke.dsp b/src/main/poke.dsp
new file mode 100644
index 0000000..2f4145b
--- /dev/null
+++ b/src/main/poke.dsp
@@ -0,0 +1,102 @@
+# Microsoft Developer Studio Project File - Name="poke" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=poke - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "poke.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "poke.mak" CFG="poke - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "poke - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "poke - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "poke - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "poke___Win32_Release"
+# PROP BASE Intermediate_Dir "poke___Win32_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "PokeRelease"
+# PROP Intermediate_Dir "PokeRelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "G_WIN32" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "poke - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "PokeDebug"
+# PROP Intermediate_Dir "PokeDebug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "G_WIN32" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "poke - Win32 Release"
+# Name "poke - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\poke.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/src/main/resource.h b/src/main/resource.h
index c995e39..79f51c2 100644
--- a/src/main/resource.h
+++ b/src/main/resource.h
@@ -42,7 +42,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        108
+#define _APS_NEXT_RESOURCE_VALUE        109
 #define _APS_NEXT_COMMAND_VALUE         40006
 #define _APS_NEXT_CONTROL_VALUE         1001
 #define _APS_NEXT_SYMED_VALUE           101
diff --git a/src/main/run.cpp b/src/main/run.cpp
old mode 100755
new mode 100644
index e0970f2..a9aa258
--- a/src/main/run.cpp
+++ b/src/main/run.cpp
@@ -31,6 +31,7 @@
 #include "geventloop.h"
 #include "garg.h"
 #include "gdaemon.h"
+#include "gpidfile.h"
 #include "gfilestore.h"
 #include "gnewfile.h"
 #include "gadminserver.h"
@@ -45,19 +46,54 @@
 #include <iostream>
 #include <exception>
 
+namespace Main
+{
+	class FileStore ;
+	class Monitor ;
+}
+
+// Class: Main::FileStore
+// Description: A derivation of GSmtp::FileStore which is used to
+// do event plumbing into Main::Run.
+//
+class Main::FileStore : public GSmtp::FileStore
+{
+	private: Run & m_run ;
+	public: FileStore( Run & run , const G::Path & path ) : GSmtp::FileStore(path) , m_run(run) {}
+	private: virtual void onEvent() { m_run.raiseStoreEvent() ; }
+} ;
+
+// Class: Main::Monitor
+// Description: A derivation of GNet::Monitor which is used to do
+// event plumbing into Main::Run.
+//
+class Main::Monitor : public GNet::Monitor
+{
+	private: Run & m_run ;
+	public: Monitor( Run & run ) : m_run(run) {}
+	private: virtual void onEvent( const std::string & s1 , const std::string & s2 )
+		{ m_run.raiseNetworkEvent( s1 , s2 ) ; }
+} ;
+
+Main::Run * Main::Run::m_this = NULL ;
+
 //static
 std::string Main::Run::versionNumber()
 {
-	return "0.9.9" ;
+	return "1.0.0" ;
 }
 
 Main::Run::Run( const G::Arg & arg ) :
 	m_arg(arg)
 {
+	if( m_this == NULL )
+		m_this = this ;
 }
 
 Main::Run::~Run()
 {
+	if( m_this == this )
+		m_this = NULL ;
 }
 
 Main::Configuration Main::Run::cfg() const
@@ -89,7 +125,10 @@ bool Main::Run::prepare()
 {
 	bool do_run = false ;
 
-	if( cl().contains("help") )
+	if( !runnable() )
+	{
+	}
+	else if( cl().contains("help") )
 	{
 		cl().showHelp( false ) ;
 	}
@@ -114,6 +153,8 @@ bool Main::Run::prepare()
 		do_run = true ;
 	}
 
+	// early singletons...
+	//
 	// (prefix,output,log,verbose-log,debug,level,timestamp,strip-context)
 	m_log_output <<= new G::LogOutput( m_arg.prefix() , cfg().log() , cfg().log() ,
 		cfg().verbose() , cfg().debug() , true ,
@@ -154,15 +195,11 @@ void Main::Run::runCore()
 
 	// daemonising
 	//
-	G::Daemon::PidFile pid_file ;
-	G::Process::setUmask() ;
-	if( cfg().daemon() )
-	{
-		closeFiles() ; // before opening any sockets or message-store streams
-		if( cfg().usePidFile() )
-			pid_file = G::Daemon::PidFile( G::Path(cfg().pidFile()) ) ;
-		G::Daemon::detach( pid_file ) ;
-	}
+	G::PidFile pid_file ;
+	G::Process::Umask::set( G::Process::Umask::Tightest ) ;
+	if( cfg().daemon() ) closeFiles() ; // before opening any sockets or message-store streams
+	if( cfg().usePidFile() ) pid_file.init( G::Path(cfg().pidFile()) ) ;
+	if( cfg().daemon() ) G::Daemon::detach( pid_file ) ;
 
 	// release root privileges
 	//
@@ -170,7 +207,7 @@ void Main::Run::runCore()
 
 	// message store singleton
 	//
-	GSmtp::FileStore store( cfg().spoolDir() ) ;
+	Main::FileStore store( *this , cfg().spoolDir() ) ;
 	if( cfg().useFilter() )
 		GSmtp::NewFile::setPreprocessor( G::Path(cfg().filter()) ) ;
 
@@ -187,7 +224,12 @@ void Main::Run::runCore()
 
 	// network monitor singleton
 	//
-	GNet::Monitor monitor ;
+	Main::Monitor monitor( *this ) ;
+
+	// timeout configuration
+	//
+	GSmtp::Client::responseTimeout( cfg().responseTimeout() ) ;
+	GSmtp::Client::connectionTimeout( cfg().connectionTimeout() ) ;
 
 	// run as forwarding agent
 	//
@@ -205,20 +247,31 @@ void Main::Run::runCore()
 	{
 		doServing( pid_file , *event_loop.get() ) ;
 	}
+
+	// clean up
+	//
+	m_client <<= 0 ;
 }
 
-void Main::Run::doServing( G::Daemon::PidFile & pid_file ,
+void Main::Run::doServing( G::PidFile & pid_file ,
 	GNet::EventLoop & event_loop )
 {
-	GSmtp::Server server( cfg().port() ,
-		cfg().allowRemoteClients() , smtpIdent() ,
-		cfg().immediate() ? cfg().serverAddress() : std::string() ) ;
+	std::auto_ptr<GSmtp::Server> smtp_server ;
+	if( cfg().doSmtp() )
+	{
+		GSmtp::Server::AddressList interfaces ;
+		if( cfg().interface_().length() )
+			interfaces.push_back( GNet::Address(cfg().interface_(),cfg().port()) ) ;
+
+		smtp_server <<= new GSmtp::Server( cfg().port() , interfaces ,
+			cfg().allowRemoteClients() , smtpIdent() ,
+			cfg().immediate() ? cfg().serverAddress() : std::string() ,
+			GSmtp::Verifier(cfg().verifier()) ) ;
+	}
 
 	std::auto_ptr<GSmtp::AdminServer> admin_server ;
 	if( cfg().doAdmin() )
 	{
-		GSmtp::Client::responseTimeout( cfg().responseTimeout() ) ;
-		GSmtp::Client::connectionTimeout( cfg().connectionTimeout() ) ;
 		admin_server <<= new GSmtp::AdminServer( cfg().adminPort() ,
 			cfg().allowRemoteClients() , cfg().serverAddress() ) ;
 	}
@@ -229,14 +282,14 @@ void Main::Run::doServing( G::Daemon::PidFile & pid_file ,
 	}
 
 	closeMoreFiles() ;
+	if( smtp_server.get() ) smtp_server->report() ;
+	if( admin_server.get() ) admin_server->report() ;
 	event_loop.run() ;
 }
 
 void Main::Run::doForwarding( GSmtp::MessageStore & store , GNet::EventLoop & event_loop )
 {
 	const bool quit_on_disconnect = true ;
-	GSmtp::Client::responseTimeout( cfg().responseTimeout() ) ;
-	GSmtp::Client::connectionTimeout( cfg().connectionTimeout() ) ;
 	GSmtp::Client client( store , *this , quit_on_disconnect ) ;
 	std::string error = client.init( cfg().serverAddress() ) ;
 	if( error.length() )
@@ -248,7 +301,7 @@ void Main::Run::doForwarding( GSmtp::MessageStore & store , GNet::EventLoop & ev
 
 const Main::CommandLine & Main::Run::cl() const
 {
-	// lazy evaluation so that the constructor does not throw
+	// lazy evaluation so that the constructor doesnt throw
 	if( m_cl.get() == NULL )
 	{
 		const_cast<Run*>(this)->m_cl <<= new CommandLine( m_arg , versionNumber() ) ;
@@ -263,13 +316,66 @@ void Main::Run::clientDone( std::string reason )
 		throw G::Exception( reason ) ;
 }
 
-void Main::Run::clientStatusChange( const std::string & s1 , const std::string & s2 )
+void Main::Run::clientEvent( const std::string & s1 , const std::string & s2 )
 {
-	onStatusChange( s1 , s2 ) ;
+	onEvent( "client" , s1 , s2 ) ;
 }
 
-void Main::Run::onStatusChange( const std::string & , const std::string & )
+void Main::Run::raiseStoreEvent()
+{
+	onEvent( "store" , "update" , std::string() ) ;
+}
+
+void Main::Run::raiseNetworkEvent( const std::string & s1 , const std::string & s2 )
+{
+	onEvent( "network" , s1 , s2 ) ;
+}
+
+void Main::Run::onEvent( const std::string & , const std::string & , const std::string & )
 {
 	; // default implementation does nothing
 }
 
+bool Main::Run::runnable() const
+{
+	return true ; // default implementation
+}
+
+//static
+bool Main::Run::startForwarding( GSmtp::Client::ClientCallback & callback , const std::string & to )
+{
+	const char * reason =
+		m_this == NULL ?
+			"no instance" :
+			m_this->startForwarding( &callback , to ) ;
+
+	if( reason != NULL )
+	{
+		G_DEBUG( "Main::Run::startForwarding: doing nothing: " << reason ) ;
+		return false ;
+	}
+	else
+	{
+		return true ;
+	}
+}
+
+const char * Main::Run::startForwarding( GSmtp::Client::ClientCallback * callback , const std::string & to )
+{
+	if( !GSmtp::MessageStore::exists() ) return "no message store instance" ;
+	if( !GNet::EventLoop::exists() ) return "no event loop instance" ;
+	if( !GNet::EventLoop::instance().running() ) return "not running the event loop" ;
+	if( GSmtp::MessageStore::instance().empty() ) return "nothing to do" ;
+	if( m_client.get() != NULL && m_client->busy() ) return "busy" ;
+
+	std::string address( to ) ;
+	if( address.empty() )
+		address = cfg().serverAddress() ;
+
+	m_client <<= new GSmtp::Client( GSmtp::MessageStore::instance() , *callback , false ) ;
+	std::string error = m_client->init( address ) ;
+	if( error.length() )
+		throw G::Exception( error + ": " + address ) ;
+	return NULL ;
+}
+
diff --git a/src/main/run.h b/src/main/run.h
index 7d3d371..f41b731 100644
--- a/src/main/run.h
+++ b/src/main/run.h
@@ -29,8 +29,10 @@
 #include "configuration.h"
 #include "commandline.h"
 #include "geventloop.h"
+#include "gtimer.h"
 #include "glogoutput.h"
 #include "gdaemon.h"
+#include "gpidfile.h"
 #include "garg.h"
 #include "gmessagestore.h"
 #include "gsmtpclient.h"
@@ -41,7 +43,7 @@
 namespace Main
 {
 	class Run ;
-} ;
+}
 
 // Class: Main::Run
 // Description: A top-level class for the process.
@@ -78,27 +80,53 @@ public:
 	static std::string versionNumber() ;
 		// Returns the application version number string.
 
+	static bool startForwarding( GSmtp::Client::ClientCallback & ,
+		const std::string & to ) ;
+			// Starts forwarding spooled email.
+			// Should be called from within run().
+			// Returns false if there is nothing to
+			// do or if nothing can be done. Throws
+			// on error. If true is returned then the
+			// callback object must remain valid
+			// until its clientDone() method is
+			// called.
+
+	void raiseStoreEvent() ;
+		// A pseudo-private method.
+
+	void raiseNetworkEvent( const std::string & , const std::string & ) ;
+		// A pseudo-private method.
+
 protected:
-	virtual void onStatusChange( const std::string & s1 , const std::string & s2 ) ;
-		// Called when the smtp client status changes.
+	virtual void onEvent( const std::string & category ,
+		const std::string & s1 , const std::string & s2 ) ;
+			// Overridable. Called when something changes.
+
+	virtual bool runnable() const ;
+		// Overridable. Allows derived classes to have prepare()
+		// return false. The default implementation
+		// returns true.
 
 private:
 	Run( const Run & ) ; // not implemented
 	void operator=( const Run & ) ; // not implemented
 	void runCore() ;
 	void doForwarding( GSmtp::MessageStore & , GNet::EventLoop & ) ;
-	void doServing( G::Daemon::PidFile & , GNet::EventLoop & ) ;
+	void doServing( G::PidFile & , GNet::EventLoop & ) ;
 	void closeFiles() ;
 	void closeMoreFiles() ;
 	std::string smtpIdent() const ;
 	void recordPid() ;
 	const CommandLine & cl() const ;
 	virtual void clientDone( std::string ) ; // from ClientCallback
-	virtual void clientStatusChange( const std::string & , const std::string & ) ; // from ClientCallback
+	virtual void clientEvent( const std::string & , const std::string & ) ; // from ClientCallback
+	const char * startForwarding( GSmtp::Client::ClientCallback * , const std::string & ) ;
 
 private:
+	static Run * m_this ;
 	std::auto_ptr<CommandLine> m_cl ;
 	std::auto_ptr<G::LogOutput> m_log_output ;
+	std::auto_ptr<GSmtp::Client> m_client ;
 	G::Arg m_arg ;
 } ;
 
diff --git a/src/main/submit.cpp b/src/main/submit.cpp
index 19d2c60..b44c0f3 100644
--- a/src/main/submit.cpp
+++ b/src/main/submit.cpp
@@ -83,7 +83,8 @@ static void process( const G::Path & path , std::istream & stream ,
 
 	// add "To:" lines to the envelope
 	//
-	GSmtp::Verifier verifier ;
+	G::Path verifier_exe ;
+	GSmtp::Verifier verifier( verifier_exe ) ;
 	for( G::Strings::const_iterator to_p = to_list.begin() ; to_p != to_list.end() ; ++to_p )
 	{
 		std::string to = *to_p ;
@@ -128,9 +129,9 @@ static void process( const G::Path & path , std::istream & stream ,
 static void run( const G::Arg & arg )
 {
 	G::GetOpt getopt( arg ,
-		"s/spool-dir/specifies the spool directory/1/dir|"
-		"f/from/sets the envelope sender/1/name|"
-		"h/help/shows this help/0/" ) ;
+		"s/spool-dir/specifies the spool directory/1/dir/1|"
+		"f/from/sets the envelope sender/1/name/1|"
+		"h/help/shows this help/0//1" ) ;
 
 	if( getopt.hasErrors() )
 	{
@@ -139,10 +140,10 @@ static void run( const G::Arg & arg )
 	else if( getopt.contains("help") )
 	{
 		std::ostream & stream = std::cerr ;
-		getopt.showUsage( stream , arg.prefix() , " <to-address> [<to-address> ...]" ) ;
+		getopt.showUsage( stream , arg.prefix() , std::string(" <to-address> [<to-address> ...]") ) ;
 		stream
 			<< std::endl
-			<< Main::Legal::warranty()
+			<< Main::Legal::warranty("","\n")
 			<< std::endl
 			<< Main::Legal::copyright()
 			<< std::endl ;
diff --git a/src/main/submit.dsp b/src/main/submit.dsp
index 7262fc2..ee9b7df 100644
--- a/src/main/submit.dsp
+++ b/src/main/submit.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GR /GX /O2 /I "../../lib/msvc6.0" /I "../gnet" /I "../glib" /I "../win32" /D "NDEBUG" /D "_CONSOLE" /D "G_WIN32" /D "WIN32" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GR /GX /O2 /I "../../lib/msvc6.0" /I "../gsmtp" /I "../gnet" /I "../glib" /I "../win32" /D "NDEBUG" /D "_CONSOLE" /D "G_WIN32" /D "WIN32" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\glib" /I "../../lib/msvc6.0" /I "../gnet" /I "../glib" /I "../win32" /D "_DEBUG" /D "G_WIN32" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\glib" /I "../../lib/msvc6.0" /I "../gsmtp" /I "../gnet" /I "../glib" /I "../win32" /D "_DEBUG" /D "G_WIN32" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/src/win32/Makefile.in b/src/win32/Makefile.in
index b78f289..ace3c22 100644
--- a/src/win32/Makefile.in
+++ b/src/win32/Makefile.in
@@ -79,6 +79,7 @@ POST_UNINSTALL = :
 AR = @AR@
 AWK = @AWK@
 CC = @CC@
+COMPILER_VERSION = @COMPILER_VERSION@
 CXX = @CXX@
 GZIP = @GZIP@
 HAVE_DOXYGEN = @HAVE_DOXYGEN@
diff --git a/src/win32/gwinhid.cpp b/src/win32/gwinhid.cpp
index 74636e3..397a284 100644
--- a/src/win32/gwinhid.cpp
+++ b/src/win32/gwinhid.cpp
@@ -79,7 +79,7 @@ std::string GGui::WindowHidden::windowClassName()
 	// created from it
 
 	WNDPROC wndproc = windowProcedure() ;
-	std::stringstream ss ;
+	std::ostringstream ss ;
 	ss << "GGui::WindowHidden." << (unsigned long)wndproc ;
 	return ss.str() ;
 }