From 6b2298628ab84e6fd936df3dc5351a201138da4f Mon Sep 17 00:00:00 2001 From: Graeme Walker Date: Sun, 21 Oct 2001 12:00:00 +0000 Subject: [PATCH] v0.9.3 --- ChangeLog | 8 + INSTALL | 3 +- Makefile.am | 2 +- Makefile.in | 3 +- NEWS | 10 +- README | 67 +- bin/Makefile.am | 6 +- bin/Makefile.in | 6 +- bin/emailrelay-deliver.sh_ | 20 +- ...lter.sh_ => emailrelay-doxygen-filter.sh_} | 0 bin/emailrelay-notify.sh_ | 58 +- bin/emailrelay-process.sh_ | 146 +++ bin/emailrelay-test.sh_ | 23 +- bin/emailrelay.sh_ | 12 +- bin/txt2html.sh_ | 285 ++++- config.h.in | 3 + configure | 77 +- configure.in | 23 +- doc/Makefile.am | 32 +- doc/Makefile.in | 35 +- doc/developer.txt | 264 +++-- doc/doxygen_header.html | 6 + doc/emailrelay.1 | 25 +- doc/graphics/bullet.gif | Bin 0 -> 573 bytes doc/index.html | 13 +- doc/reference.txt | 159 ++- doc/userguide.txt | 187 +-- emailrelay.spec | 60 + lib/gcc2.95/sstream | 3 +- src/glib/Makefile.am | 82 +- src/glib/Makefile.in | 13 +- src/glib/garg.h | 10 +- src/glib/gassert.h | 1 - src/glib/gdaemon.h | 34 +- src/glib/gdaemon_unix.cpp | 98 +- src/glib/gdaemon_win32.cpp | 19 +- src/glib/gdate.cpp | 12 +- src/glib/gdate.h | 22 +- src/glib/ggetopt.cpp | 102 +- src/glib/ggetopt.h | 6 + src/glib/glog.h | 2 +- src/glib/glogoutput_win32.cpp | 2 - src/glib/gmemory.h | 36 +- src/glib/gprocess.h | 129 ++ src/glib/gprocess_unix.cpp | 249 ++++ src/glib/gprocess_win32.cpp | 149 +++ src/gnet/gaddress.h | 10 +- src/gnet/gclient.cpp | 4 +- src/gnet/gdescriptor.h | 6 +- src/gnet/gevent.cpp | 2 +- src/gnet/gevent.h | 5 +- src/gnet/geventserver.h | 2 +- src/gnet/glinebuffer.cpp | 13 - src/gnet/glinebuffer.h | 1 - src/gnet/grequest.h | 4 +- src/gnet/gresolve_unix.cpp | 2 +- src/gnet/gselect.h | 2 +- src/gnet/gserver.h | 4 +- src/gnet/gsocket.h | 14 +- src/gnet/gwinsock.h | 6 +- src/main/Makefile.am | 39 +- src/main/Makefile.in | 142 ++- src/main/doxygen.cfg | 6 +- src/main/emailrelay.dsp | 1044 +++++++++-------- src/main/emailrelay.rc | 2 + src/main/gadminserver.cpp | 2 +- src/main/gadminserver.h | 6 +- src/main/gclientprotocol.cpp | 47 +- src/main/gclientprotocol.h | 17 +- src/main/gfilestore.cpp | 226 ++++ src/main/gfilestore.h | 116 ++ src/main/gmessagestore.cpp | 680 +---------- src/main/gmessagestore.h | 110 +- src/main/gnewfile.cpp | 207 ++++ src/main/gnewfile.h | 81 ++ .../gpid_win32.cpp => main/gnewmessage.cpp} | 59 +- src/{glib/gpid.h => main/gnewmessage.h} | 63 +- src/main/gprotocolmessage.cpp | 139 +-- src/main/gprotocolmessage.h | 67 +- src/main/gprotocolmessageforward.cpp | 143 +++ src/main/gprotocolmessageforward.h | 91 ++ src/main/gprotocolmessagestore.cpp | 126 ++ src/main/gprotocolmessagestore.h | 80 ++ src/main/gserverprotocol.cpp | 121 +- src/main/gserverprotocol.h | 68 +- src/main/gsmtpclient.cpp | 98 +- src/main/gsmtpclient.h | 38 +- src/main/gsmtpserver.cpp | 31 +- src/main/gsmtpserver.h | 25 +- src/main/gstoredfile.cpp | 262 +++++ src/main/gstoredfile.h | 119 ++ .../gpid_unix.cpp => main/gstoredmessage.cpp} | 59 +- src/main/gstoredmessage.h | 77 ++ src/main/gverifier.cpp | 66 ++ src/main/gverifier.h | 64 + src/main/icon-32.ico | Bin 0 -> 766 bytes src/main/mailrelay.cpp | 90 +- src/main/poke.c | 28 +- 98 files changed, 4818 insertions(+), 2398 deletions(-) rename bin/{emailrelay-filter.sh_ => emailrelay-doxygen-filter.sh_} (100%) create mode 100644 bin/emailrelay-process.sh_ mode change 100644 => 100755 doc/Makefile.am create mode 100644 doc/doxygen_header.html create mode 100644 doc/graphics/bullet.gif mode change 100644 => 100755 doc/index.html create mode 100644 emailrelay.spec create mode 100644 src/glib/gprocess.h create mode 100644 src/glib/gprocess_unix.cpp create mode 100644 src/glib/gprocess_win32.cpp create mode 100644 src/main/emailrelay.rc create mode 100644 src/main/gfilestore.cpp create mode 100644 src/main/gfilestore.h create mode 100644 src/main/gnewfile.cpp create mode 100644 src/main/gnewfile.h rename src/{glib/gpid_win32.cpp => main/gnewmessage.cpp} (52%) rename src/{glib/gpid.h => main/gnewmessage.h} (53%) create mode 100644 src/main/gprotocolmessageforward.cpp create mode 100644 src/main/gprotocolmessageforward.h create mode 100644 src/main/gprotocolmessagestore.cpp create mode 100644 src/main/gprotocolmessagestore.h create mode 100644 src/main/gstoredfile.cpp create mode 100644 src/main/gstoredfile.h rename src/{glib/gpid_unix.cpp => main/gstoredmessage.cpp} (50%) create mode 100644 src/main/gstoredmessage.h create mode 100644 src/main/gverifier.cpp create mode 100644 src/main/gverifier.h create mode 100644 src/main/icon-32.ico diff --git a/ChangeLog b/ChangeLog index c6b2ad8..92d852a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ Change Log ========== +0.9.2 -> 0.9.3 +-------------- +* Proxy mode (--immediate and --as-proxy) +* Message preprocessing (--filter) +* Message store classes better separated using abstract interfaces +* Improved notification script, with MIME encoding +* Builds with old 2.91 version of gcc + 0.9.1 -> 0.9.2 -------------- * Better autoconf detection. (Now builds on all SourceForge's diff --git a/INSTALL b/INSTALL index fad2a08..e8ae933 100644 --- a/INSTALL +++ b/INSTALL @@ -5,7 +5,8 @@ Introduction standard GNU "./configure; make; make install" installation from source. The E-MailRelay userguide describes what you have to do after the "make install" (under GNU/Linux) in order to get the emailrelay daemon to start -up at boot-time and automatically forward e-mail to your ISP. +up at boot-time, automatically forward e-mail to your ISP when connected, +and bounce failed mail. Basic Installation ================== diff --git a/Makefile.am b/Makefile.am index 0e7bb85..3014393 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,2 +1,2 @@ -EXTRA_DIST = +EXTRA_DIST = emailrelay.spec SUBDIRS = src bin lib doc diff --git a/Makefile.in b/Makefile.in index dfdae08..50c57b3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,7 +69,7 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ -EXTRA_DIST = +EXTRA_DIST = emailrelay.spec SUBDIRS = src bin lib doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -276,6 +276,7 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + info-am: info: info-recursive dvi-am: diff --git a/NEWS b/NEWS index 158be8d..c6b9fd5 100644 --- a/NEWS +++ b/NEWS @@ -1,10 +1,2 @@ - -To do -===== - -from 0.9.1 ----------- -Better use of autoconf -Port to BSD & solaris -test IPv6 +no news diff --git a/README b/README index 46a612f..4ae2628 100644 --- a/README +++ b/README @@ -1,27 +1,37 @@ -E-MailRelay -=========== +E-MailRelay Readme +================== Abstract -------- -E-MailRelay is a simple store-and-forward SMTP MTA, designed for standalone -machines with an intermittent (dial-up) connection to the wider Internet. -In most situations the only configuration required is to specify the mail -gateway address on the command line. +E-MailRelay is a simple SMTP store-and-forward message transfer agent (MTA). +It runs as an SMTP server, storing incoming e-mail in a local spool directory, +and then forwarding the stored messages to a downstream SMTP server on request. +It can also run as a proxy server, forwarding (and optionally pre-processing) +incoming e-mail as soon as it is received. It does not do any message routing, +other than to a local postmaster. Because of this functional simplicity it is +extremely easy to configure, typically only requiring the address of the +downstream SMTP server to be put on the command line. -C++ source code is available for Linux and Windows. Distribution is under -the GNU General Public License. +C++ source code is available for Linux, FreeBSD and Windows. Distribution is +under the GNU General Public License. Quick start ----------- -The "emailrelay" program can be run as an SMTP server daemon using the -command "emailrelay --as-server", and stored mail can be forwarded by -running the command "emailrelay --as-client :smtp". +E-MailRelay can be built and installed from source using the ususal +"./configure ; make ; make install" incantation. The program runs as an SMTP +server daemon using the "emailrelay --as-server" command, and stored mail is +forwarded to a downstream server by running "emailrelay --as-client :smtp". -The "--as-server" command is typically run automatically at boot time, -using the boot scripts under "/etc/init.d" or "/sbin/init.d", while the -"--as-client" command is normally put into pppd's "ip-up" script ("/etc/ppp/ip-up") +The "--as-server" command is typically run automatically at boot time, using +the boot scripts under "/etc/init.d" or "/sbin/init.d", while the "--as-client" +command is normally put into pppd's "ip-up" script ("/etc/ppp/ip-up") in place of "sendmail -q". +The program can also run as a proxy server ("--as-proxy") so that e-mail +messages are forwarded immediately to a downstream server -- usually the local +system's default MTA. This can be usefully combined with a mail pre-processor +program by using the "--filter" switch. + The program requires a writeable spool directory to store e-mail messages. The directory defaults to "/usr/local/var/spool/emailrelay", but it can be changed by using the "--spool-dir" switch. @@ -31,8 +41,8 @@ server is running then it will fail to start up, with a "cannot bind" error message. The port number can be changed by using the "--port" switch. To test the program out without a full installation: -(1) run the server as "emailrelay --no-daemon --no-syslog --log --spool-dir ${HOME} --port 10001 &" -(2) reconfigure your e-mail client to use port 10001 rather than 25 ("smtp") +(1) run the server as "emailrelay --no-daemon --no-syslog --log --spool-dir ${HOME} --port 10025 &" +(2) reconfigure your e-mail client to use port 10025 rather than 25 ("smtp") (3) send some test messages to addressees on the Internet (4) connect to the Internet (5) forward the stored messages using "emailrelay --spool-dir ${HOME} --as-client :smtp" @@ -41,17 +51,19 @@ To test the program out without a full installation: Documentation ------------- The following documentation is provided: -* README -- this document -* COPYING -- the GNU General Public License -* INSTALL -- build & install instructions (based on generic GNU text) -* doc/userguide.txt -- user guide -* doc/reference.txt -- reference document -* doc/developer.txt -- developer guide +* README -- this document +* COPYING -- the GNU General Public License +* INSTALL -- build & install instructions (based on generic GNU text) +* doc/userguide.txt -- user guide +* doc/reference.txt -- reference document +* doc/developer.txt -- developer guide +* ChangeLog -- change log for releases And for completeness the following stub documents are also included: * NEWS * AUTHORS -* ChangeLog + +Source code documentation can be generated by using doxygen (www.doxygen.org). Configurations -------------- @@ -65,3 +77,12 @@ The code was developed on SuSE Linux 7.1 using: and ported to Windows 98 using * MSVC 6.0 +The code has also been built successfully on: +* 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 + +(courtesy of SourceForge's compile farm). + diff --git a/bin/Makefile.am b/bin/Makefile.am index 5e910cb..502a8ec 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,7 +1,7 @@ -noinst_SCRIPTS = emailrelay-filter.sh emailrelay-test.sh +noinst_SCRIPTS = emailrelay-doxygen-filter.sh emailrelay-test.sh libexec_SCRIPTS = emailrelay.sh -pkgdata_DATA = emailrelay-notify.sh emailrelay-deliver.sh -EXTRA_DIST = emailrelay-filter.sh_ emailrelay-test.sh_ emailrelay.sh_ txt2html.sh_ emailrelay-notify.sh_ emailrelay-deliver.sh_ +pkgdata_DATA = emailrelay-notify.sh emailrelay-deliver.sh emailrelay-process.sh +EXTRA_DIST = emailrelay-doxygen-filter.sh_ emailrelay-test.sh_ emailrelay.sh_ txt2html.sh_ emailrelay-notify.sh_ emailrelay-deliver.sh_ emailrelay-process.sh_ CLEANFILES = $(noinst_SCRIPTS) $(libexec_SCRIPTS) $(pkgdata_DATA) TESTS = emailrelay-test.sh SUFFIXES = .sh_ .sh diff --git a/bin/Makefile.in b/bin/Makefile.in index 47248e0..12bd3f4 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -69,10 +69,10 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ -noinst_SCRIPTS = emailrelay-filter.sh emailrelay-test.sh +noinst_SCRIPTS = emailrelay-doxygen-filter.sh emailrelay-test.sh libexec_SCRIPTS = emailrelay.sh -pkgdata_DATA = emailrelay-notify.sh emailrelay-deliver.sh -EXTRA_DIST = emailrelay-filter.sh_ emailrelay-test.sh_ emailrelay.sh_ txt2html.sh_ emailrelay-notify.sh_ emailrelay-deliver.sh_ +pkgdata_DATA = emailrelay-notify.sh emailrelay-deliver.sh emailrelay-process.sh +EXTRA_DIST = emailrelay-doxygen-filter.sh_ emailrelay-test.sh_ emailrelay.sh_ txt2html.sh_ emailrelay-notify.sh_ emailrelay-deliver.sh_ emailrelay-process.sh_ CLEANFILES = $(noinst_SCRIPTS) $(libexec_SCRIPTS) $(pkgdata_DATA) TESTS = emailrelay-test.sh SUFFIXES = .sh_ .sh diff --git a/bin/emailrelay-deliver.sh_ b/bin/emailrelay-deliver.sh_ index ea0aada..8c42333 100644 --- a/bin/emailrelay-deliver.sh_ +++ b/bin/emailrelay-deliver.sh_ @@ -21,12 +21,22 @@ # # emailrelay-deliver.sh # -# An example script which looks for local mail in the MailRelay +# An example script which looks for local mail in the E-MailRelay # spool directory, and delivers it using 'procmail'. # +# usage: emailrelay-deliver.sh [] +# +# Note that (1) E-MailRelay will only accept mail to a local recipient +# if that recipient is "postmaster", and the (2) by default E-MailRelay +# will only accept connections from local e-mail clients. This means that +# this script is only relevant if you are in the habit of sending +# yourself mail as "postmaster". It is provided for completeness, +# in response to certain requirements in the SMTP specification. +# -store="/var/spool/mailrelay" +store="/usr/local/var/spool/emailrelay" postmaster="root" +procmail="procmail" # parse the command line # @@ -45,7 +55,7 @@ fi # for each e-mail to a local recipient... # -for file in ${store}/mail-relay.*.envelope.local "" +for file in ${store}/emailrelay.*.envelope.local "" do if test -f "${file}" then @@ -62,11 +72,11 @@ do if test -f "${content}" then echo `basename $0`: delivering `basename ${content}` to ${deliver_to} - procmail -d ${deliver_to} < ${content} + ${procmail} -d ${deliver_to} < ${content} rc=$? if test "${rc}" -eq 0 then - echo '' # rm -f "${file}" 2>/dev/null + rm -f "${file}" 2>/dev/null fi fi fi diff --git a/bin/emailrelay-filter.sh_ b/bin/emailrelay-doxygen-filter.sh_ similarity index 100% rename from bin/emailrelay-filter.sh_ rename to bin/emailrelay-doxygen-filter.sh_ diff --git a/bin/emailrelay-notify.sh_ b/bin/emailrelay-notify.sh_ index e627516..ba40840 100644 --- a/bin/emailrelay-notify.sh_ +++ b/bin/emailrelay-notify.sh_ @@ -21,16 +21,30 @@ # # emailrelay-notify.sh # -# An example script which looks for failed mail in the MailRelay spool +# An example script which looks for failed mail in the E-MailRelay spool # directory, and sends failure notification messages using 'procmail'. # +# usage: emailrelay-notify.sh [] +# +# Notification of failed e-mail by means of e-mail messages is a +# requirement imposed by the SMTP specification. However, a simpler +# approach might be more appropriate -- for example, a line like this in +# a ".profile" script: +# +# if test -f /usr/local/var/spool/emailrelay/*.envelope.bad ; then echo Failed mail >&2 ; fi +# +# or perhaps a cron entry like this (since output from a cron job gets sent as mail): +# +# 0 0 * * * /bin/cat /usr/local/var/spool/emailrelay/*.envelope.bad 2>/dev/null +# tmp="/tmp/`basename $0`.$$.tmp" trap "rm -f ${tmp} 2>/dev/null ; exit 0" 0 1 2 3 13 15 +procmail="procmail" # parse the command line # -store="/var/spool/mailrelay" +store="/usr/local/var/spool/emailrelay" if test $# -ge 1 then store="${1}" @@ -46,10 +60,12 @@ fi # for each failed e-mail... # -for file in ${store}/mail-relay.*.envelope.bad "" +for file in ${store}/emailrelay.*.envelope.bad "" do if test -f "${file}" then + # parse out the failure reason and the original sender + # content="`echo ${file} | sed 's/envelope/content/' | sed 's/.bad//'`" reason="`fgrep MailRelay-Reason ${file} | sed 's/X-[^ ]*Reason: //' | tr -d '\015'`" from="`fgrep MailRelay-From ${file} | sed 's/X-MailRelay-From: //' | tr -d '\015'`" @@ -61,33 +77,53 @@ do # create a notification message header # + boundary="--------------`basename ${file}`.$$" echo "To: ${deliver_to}" > ${tmp} echo "From: postmaster" >> ${tmp} echo "Subject: Your e-mail could not be delivered" >> ${tmp} - echo " " >> ${tmp} + echo "MIME-Version: 0.1" >> ${tmp} + echo "Content-Type: multipart/mixed; boundary=\"${boundary}\"" >> ${tmp} + echo "" >> ${tmp} - # add the message content + # add the message text # + echo "" >> ${tmp} + echo "--${boundary}" >> ${tmp} + echo "Content-Type: text/plain; charset=us-ascii" >> ${tmp} + echo "" >> ${tmp} + if test -f "${content}" + then + egrep -i '^To:|^Subject:' ${content} >> ${tmp} + fi if test "${reason}" != "" then echo "Reason: ${reason}" >> ${tmp} fi + + # add the message attachment + # if test -f "${content}" then - egrep -i '^To:|^Subject:' ${content} >> ${tmp} - echo " " >> ${tmp} - echo "The original mail is saved as \"${content}\"." >> ${tmp} - echo "You should make a copy of this file if necessary and then delete it." >> ${tmp} + echo "--${boundary}" >> ${tmp} + echo "Content-Type: message/rfc822" >> ${tmp} + echo "Content-Transfer-Encoding: 8bit" >> ${tmp} + echo "Content-Description: `basename ${content}`" >> ${tmp} + echo "" >> ${tmp} + cat ${content} >> ${tmp} fi + echo "--${boundary}--" >> ${tmp} # deliver the notification using procmail # echo `basename $0`: delivering `basename ${content}` to ${deliver_to} - procmail -d ${deliver_to} < ${tmp} + ${procmail} -d ${deliver_to} < ${tmp} rc=$? + + # clean up + # if test "${rc}" -eq 0 then - rm -f "${file}" 2>/dev/null + rm -f "${file}" "${content}" 2>/dev/null fi fi done diff --git a/bin/emailrelay-process.sh_ b/bin/emailrelay-process.sh_ new file mode 100644 index 0000000..d851dd4 --- /dev/null +++ b/bin/emailrelay-process.sh_ @@ -0,0 +1,146 @@ +#!/bin/sh +# +# Copyright (C) 2001 Graeme Walker +# +# 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. +# +# === +# +# emailrelay-process.sh +# +# An example pre-processing script for the E-MailRelay +# system which does rot-13 masking. +# + +awk="awk" +tmp="/tmp/`basename $0`.$$.tmp" +log="/tmp/`basename $0`.$$.out" +trap "rm -f ${tmp} >/dev/null 2>&1 ; exit" 0 1 2 3 13 15 + +### +# ProcessContent() +# Processes the content part of an RFC822 message. This +# implementation does rot13 masking. +# +ProcessContent() +{ + ${awk} ' + BEGIN { + map_upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + map_lower = tolower(map_upper) + in_header = 1 + } + + function rot( n , c , map ) + { + return index(map,c) ? substr(map,((index(map,c)+n-1)%length(map))+1,1) : c + } + + function rot_c( n , c ) + { + return rot(n,rot(n,c,map_upper),map_lower) + } + + function rot_s( n , string ) + { + result = "" + for( i = 1 ; i <= length(string) ; i++ ) + result = result rot_c(n,substr(string,i,1)) + return result + } + + { + is_blank = match($0,"^[[:space:]]*$") + if( in_header && is_blank ) + in_header = 0 + + if( in_header ) + print + else + print rot_s(13,$0) + } + ' +} + +### +# Wrap() +# Processes an RCF822 message so that the original content +# appears as an attachment. +# +Wrap() +{ + ${awk} -v boundary="-----`basename $0`.$$" -v message="$@" ' + BEGIN { + in_header = 1 + n = 1 + } + { + is_blank = match($0,"^[[:space:]]*$") + if( in_header && is_blank ) + { + printf( "Content-Type: multipart/mixed; boundary=\"%s\"\r\n" , boundary ) + printf( "\r\n" ) + printf( "\r\n" ) + printf( "--%s\r\n" , boundary ) + printf( "Content-Type: text/plain; charset=us-ascii\r\n" ) + printf( "\r\n" ) + printf( "%s\r\n" , message ) + printf( "\r\n" ) + printf( "--%s\r\n" , boundary ) + printf( "Content-Type: message/rfc822\r\n" ) + printf( "Content-Transfer-Encoding: 8bit\r\n" ) + printf( "Content-Description: encrypted message\r\n" ) + printf( "\r\n" ) + for( i = 1 ; i < n ; i++ ) + print header[i] + } + + if( in_header && is_blank ) + in_header = 0 + + if( in_header ) + { + header[n++] = $0 + + is_mime_content = match($0,"^Content-") + is_continuation = match($0,"^[[:space:]][[:space:]]*[^[:space:]]") + block = is_mime_content || (was_mime_content && is_continuation) + was_mime_content = block + + if( ! block ) + print + } + else + { + print + } + } + END { + printf( "--%s--\r\n" , boundary ) + printf( "\r\n" ) + } + ' +} + +Main() +{ + cat "${1}" | ProcessContent | Wrap "The original message has been encrypted..." > ${tmp} + cp ${tmp} "${1}" +} + +# Main $@ > ${log} 2>&1 +Main $@ + diff --git a/bin/emailrelay-test.sh_ b/bin/emailrelay-test.sh_ index cdc8756..6fd9aac 100644 --- a/bin/emailrelay-test.sh_ +++ b/bin/emailrelay-test.sh_ @@ -23,11 +23,14 @@ # # Test the E-MailRelay system. # -# Creates three temporary spool directories under /tmp and runs -# three emailrelay servers to bucket-brigade a test message from one to -# the next. The test succeeds if the message gets into the third +# Creates four temporary spool directories under /tmp and runs +# four emailrelay servers to bucket-brigade a test message from one to +# the next. The test succeeds if the message gets into the final # spool directory. # +# Once all the servers have been killed the separate log files are +# concatenated into the summary log file "/tmp/emailrelay-test.out". +# # If this test takes more than a second or two then it has failed. # @@ -42,7 +45,8 @@ Cleanup() kill `cat ${base_dir}/pid-* 2>/dev/null` 2>/dev/null if test -d ${base_dir} then - grep "." ${base_dir}/log-? > /tmp/`basename $0`.out 2>/dev/null + grep "MailRelay-Reason" ${base_dir}/*/*envelope*bad > /tmp/`basename $0`.out 2>/dev/null + grep "." ${base_dir}/log-? >> /tmp/`basename $0`.out 2>/dev/null fi rm -rf ${base_dir} 2>/dev/null } @@ -113,7 +117,7 @@ CrLf() CheckResults() { - if test -f ${base_dir}/store-3/*.envelope -a -f ${base_dir}/store-3/*.content + if test -f ${base_dir}/store-4/*.envelope -a -f ${base_dir}/store-4/*.content then exit_code="0" echo `basename $0`: succeeded @@ -139,10 +143,11 @@ trap "Trap 0 ; exit" 0 StartTimer RunServer ${pp}1 store-2 log-1 pid-1 -RunServer ${pp}2 store-2 log-2 pid-2 "--admin ${pp}4 --forward-to localhost:${pp}3" -RunServer ${pp}3 store-3 log-3 pid-3 +RunServer ${pp}2 store-2 log-2 pid-2 "--admin ${pp}9 --forward-to localhost:${pp}3" +RunServer ${pp}3 store-3 log-3 pid-3 "--immediate --forward-to localhost:${pp}4 --filter /bin/touch" +RunServer ${pp}4 store-4 log-4 pid-4 CreateMessages -RunClient localhost:${pp}1 store-1 log-c pid-4 -RunPoke ${pp}4 log-p +RunClient localhost:${pp}1 store-1 log-c pid-5 +RunPoke ${pp}9 log-p CheckResults diff --git a/bin/emailrelay.sh_ b/bin/emailrelay.sh_ index 704f3c8..684e504 100644 --- a/bin/emailrelay.sh_ +++ b/bin/emailrelay.sh_ @@ -24,14 +24,19 @@ # A shell-script wrapper for E-MailRelay designed for # use in the SysV-init system (/etc/init.d). # -# usage: emailrelay.sh { start | stop } +# usage: emailrelay.sh { start [] | stop } # # configuration # var_run="/var/run" +emailrelay="/usr/local/sbin/emailrelay" +switches="" + +# configuration fallback +# if test \! -d "${var_run}" ; then var_run="/tmp" ; fi -params="" +if test \! -x "${emailrelay}" ; then emailrelay="emailrelay" ; fi # initialisation # @@ -52,8 +57,9 @@ if test "${1}" = "start" then # "start" # + shift rm -f "${pid_file}" 2>/dev/null - emailrelay --as-server --pid-file "${pid_file}" ${params} $@ + ${emailrelay} --as-server --pid-file "${pid_file}" ${switches} $@ elif test "${1}" = "stop" then diff --git a/bin/txt2html.sh_ b/bin/txt2html.sh_ index 695ed61..26c6fe9 100644 --- a/bin/txt2html.sh_ +++ b/bin/txt2html.sh_ @@ -21,10 +21,20 @@ # # txt2html.sh # -# usage: txt2html.sh [-a ] +# Converts plain-text to html. The plain-text has to use special +# formating conventions (see "function process()", Anchorise_1() etc). +# +# Embeds comments in the html output which can be used by "index.sh" +# to create a document index. +# +# Definition lists require a bullet graphic, "graphics/bullet.gif". +# +# usage: txt2html.sh [-a ] [-x] [] +# +# The -x switch excludes header and footer stuff. # -awk="awk" +awk="gawk" if test "${1}" = "-a" then shift @@ -35,6 +45,13 @@ then shift fi +full="1" +if test "${1}" = "-x" +then + shift + full="0" +fi + file="${1}" if test "${file}" = "" then @@ -48,23 +65,58 @@ then exit 1 fi -title="`basename ${file}`" +title="`grep -v '^[[:space:]]*$' ${file} | head -1`" if test "${2}" != "" then title="${2}" fi # === +# Include() +# +# Expands #include# directives. Included text is then processed +# as plain text, just like the top-level file. An include directive +# within a line (ie. not on the lhs) is treated as an inline +# sustitution, like shell backticks. +# +Include() +{ +${awk} -v cat="${awk} '{print}'" ' +{ + line = $0 + if( match(line,"^#include#[^#]*#") ) + { + path = substr(line,10,RLENGTH-10) + system( cat " " path ) + } + else + { + print line + } +} +' +} +# === +# Main() +# +# Does the bulk of the conversion. +# Main() { -${awk} -v title="${1}" ' +${awk} -v title="${1}" -v full="${2}" -v colour="${3}" ' BEGIN { - printf( "<html>\n" ) - printf( "<head>\n" ) - printf( "<title>%s\n" , title ) - printf( "\n" ) - printf( "\n" ) + if( full ) + { + dtd = "-//W3C//DTD HTML 4.01 Transitional//EN" + printf( "\n" , dtd ) + printf( "\n" ) + printf( "\n" ) + printf( "%s\n" , title ) + printf( "\n" ) + printf( "\n" , colour ) + printf( "\n" , title ) + } } function escape( line ) @@ -103,33 +155,53 @@ function tagOutput( line , tag ) function process( line , next_ ) { - is_blank = match( line , "^[[:space:]]*$" ) - is_sub_para = match( line , "^[[:space:]][[:space:]][^[:space:]]" ) - is_code = match( line , "^[[:space:]]" ) && !is_sub_para - is_heading = match( next_ , "^==*[[:space:]]*$" ) - is_sub_heading = match( next_ , "^--*[[:space:]]*$" ) + tab = " " + is_blank = match( line , "^ *$" ) + is_heading = match( next_ , "^==* *$" ) + is_sub_heading = match( next_ , "^--* *$" ) is_list_item = match( line , "^\\* " ) + is_definition_term = match( line , "^\\# " ) + is_definition_text = match( line , "^ [^- ]" ) + is_outer_list_item = match( line , "^+ " ) + is_inner_list_item = match( line , "^ - " ) + is_sub_list_item = match( line , "^ + " ) is_numbered_item = match( line , "^\\([[:digit:]][[:digit:]]*\\)" ) - is_heading_line = match( line , "^==*[[:space:]]*$" ) - is_sub_heading_line = match( line , "^--*[[:space:]]*$" ) + is_heading_line = match( line , "^==* *$" ) + is_sub_heading_line = match( line , "^--* *$" ) + is_code = match( line , "^" tab ) if( is_blank ) { - printf( "


\n" ) + printf( "

\n" ) } else if( is_code ) { tagOutput( line , "pre" ) } - else if( is_sub_para ) + else if( is_definition_term ) { - tagOutput( line , "sub" ) + gsub( "^# " , "" , line ) + tagOutput( line , "dt" ) + } + else if( is_definition_text ) + { + tagOutput( line , "dd" ) } else if( is_list_item ) { gsub( "^\\* " , "" , line ) tagOutput( line , "li" ) } + else if( is_outer_list_item ) + { + gsub( "^+ " , "" , line ) + tagOutput( line , "Li" ) + } + else if( is_inner_list_item ) + { + gsub( "^ - " , "" , line ) + tagOutput( line , "lI" ) + } else if( is_numbered_item ) { gsub( "^\\([[:digit:]][[:digit:]]*\\) " , "" , line ) @@ -137,11 +209,16 @@ function process( line , next_ ) } else if( is_heading ) { - printf( "

%s

\n" , line ) + major += 1 + minor = 0 + printf( "

%s

" , major , line ) + printf( "\n" , major , line ) } else if( is_sub_heading ) { - printf( "

%s

\n" , line ) + minor += 1 + printf( "

%s

" , major , minor , line ) + printf( "\n" , major , minor , line ) } else if( !is_heading_line && !is_sub_heading_line ) { @@ -157,32 +234,57 @@ function process( line , next_ ) END { process( previous , "" ) - printf( "\n" ) - printf( "\n" ) + if( full ) + { + printf( "\n" ) + printf( "\n" ) + } } ' } -# == - +# === +# AugmentLists() +# +# Adds list begin/end tags around a set of list items. +# AugmentLists() { -${awk} -v item_tag="${1}" -v list_tag="${2}" ' +${awk} -v item_tag="${1}" -v list_tag="${2}" -v ignore_1_re="${3}" -v ignore_2_re="${4}" ' { line = $0 - is_list_item = match( line , "^<" item_tag ">.*$" ) + ignore_1 = length(ignore_1_re) && match( line , ignore_1_re ) + ignore_2 = length(ignore_2_re) && match( line , ignore_2_re ) + ignore = ignore_1 || ignore_2 + if( ignore ) + { + print + } + else + { + is_list_item = match( line , "^<" item_tag ">.*$" ) - if( is_list_item && !in_list ) - printf( "<%s>\n" , list_tag ) - else if( in_list && !is_list_item ) - printf( "\n" , list_tag ) + if( is_list_item && !in_list ) + printf( "<%s>\n" , list_tag ) + else if( in_list && !is_list_item ) + printf( "\n" , list_tag ) - print - in_list = is_list_item + print + in_list = is_list_item + } } ' } -# == - +# === +# Elide() +# +# Converts repeated lines of lineN into +# +# line1 +# line2 +# +# +# Useful for 
 and .
+#
 Elide()
 {
 ${awk} -v tag="${1}" '
@@ -205,21 +307,47 @@ ${awk} -v tag="${1}" '
 } '
 }
 
-# ==
+# ===
+# Decorate()
+#
+# Adds additional stuff after a given opening tag.
+# The tag is expected to be at the start of the line.
+#
+Decorate()
+{
+${awk} -v tag="${1}" -v decoration="${2}" '
+{
+	line = $0
+	sub( "^<" tag ">" , "<" tag ">" decoration , line )
+	print line
+} '
+}
 
+# ===
+# Compress()
+#
+# Removes blank lines near to headings (etc).
+#
 Compress()
 {
 ${awk} '
 function process( previous , line , next_ )
 {
-	re_blank = "^

$"
+	re_blank = "^

$"
 	re_heading = "^<[Hh][[:digit:]]>"
+	re_dd = "^
"
 	re_pre_start = "^
"
 	re_pre_end = "
$"
-	if( match(line,re_blank) && ( match(next_,re_heading) || match(previous,re_heading) ) )
+
+	this_is_blank = match(line,re_blank)
+	next_is_special = match(next_,re_heading) || match(next_,re_dd)
+	previous_is_special = match(previous,re_heading) || match(previous,re_dd)
+	next_is_pre_start = match(next_,re_pre_start)
+
+	if( this_is_blank && ( next_is_special || previous_is_special ) )
 	{
 	}
-	else if( match(line,re_blank) && match(next_,re_pre_start) )
+	else if( this_is_blank && next_is_pre_start )
 	{
 	}
 	else
@@ -240,7 +368,84 @@ END {
 '
 }
 
+# ===
+# Anchorise_1()
+#
+# Converts [[-foo-bar-]] to bar.
+#
+Anchorise_1()
+{
+	sed 's/\[\[-\([^-]*\)-\([^-]*\)-\]\]/\2<\/a>/g'
+}
+
+# ===
+# Anchorise_2()
+#
+# Converts [[foo]] to foo.
+#
+Anchorise_2()
+{
+	sed 's/\[\[\([^\]*\)\]\]/\1<\/a>/g'
+}
+
+# ===
+# Cat()
+#
+# An awk version of "cat" (cygwin cat is
+# broken).
+#
+Cat()
+{
+	${awk} '{print}' $@ | tr -d '\015'
+}
+
+# ===
+# MoveIndex()
+#
+# Moves the index comments to a line before
+# the header, rather than at the end of the
+# header line.
+#
+MoveIndex()
+{
+	${awk} '
+	{
+		line = $0
+		re = "