* src/mailfromd.h (enum mf_status_code): Add a comma and a count

definition, needed for make check-exceptions in docs.
* src/status.mfi (m4_ifdef): Use OLD_EXCEPTION_CODES instead of
COMPAT_4_3.
* src/main.c: New command line options: -D (--define), and -U
(--undefine).
* mflib/match_dnsbl.mf (match_dnsbl): Use LAZY_MATCH_RBL instead of
COMPAT_4_3.
Throw e_invip if address is invalid.
* mflib/match_rhsbl.mf (match_rhsbl): Use LAZY_MATCH_RBL instead
of COMPAT_4_3.
* doc/mailfromd.texi: Document variable shadowing and new
features.
* doc/Makefile.am (check-exceptions): Update the rule.
* NEWS: Update.


git-svn-id: file:///svnroot/mailfromd/branches/release_4_3_patches@1630 7a8a7f39-df28-0410-adc6-e0d955640f24

9 files changed, 534 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index 239eda1c..9972d196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2008-03-10  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+        * src/mailfromd.h (enum mf_status_code): Add a comma and a count
+        definition, needed for make check-exceptions in docs.
+        * src/status.mfi (m4_ifdef): Use OLD_EXCEPTION_CODES instead of
+        COMPAT_4_3.
+        * src/main.c: New command line options: -D (--define), and -U
+        (--undefine).
+        * mflib/match_dnsbl.mf (match_dnsbl): Use LAZY_MATCH_RBL instead of
+        COMPAT_4_3.
+        Throw e_invip if address is invalid.
+        * mflib/match_rhsbl.mf (match_rhsbl): Use LAZY_MATCH_RBL instead
+        of COMPAT_4_3.
+        * doc/mailfromd.texi: Document variable shadowing and new
+        features.
+        * doc/Makefile.am (check-exceptions): Update the rule.
+        * NEWS: Update.
+
 2008-03-09  Sergey Poznyakoff  <gray@gnu.org.ua>
 
         Fix the test suite. The file status.mfh now contains m4 statements,
@@ -69,6 +87,10 @@
         tests/etc/catch01.rc: Use new exception codes.
 
 2008-03-01  Sergey Poznyakoff  <gray@gnu.org.ua>
+        
+        -= Release 4.3.1 =-
+        
+2008-03-01  Sergey Poznyakoff  <gray@gnu.org.ua>
 
         * src/prog.c, src/prog.h (advance_pc): Fix type of the 2nd
         argument.
diff --git a/NEWS b/NEWS
index 25ba9d4d..09dbea34 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Mailfromd NEWS -- history of user-visible changes. 2008-03-09
+Mailfromd NEWS -- history of user-visible changes. 2008-03-10
 Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff
 See the end of file for copying conditions.
 
@@ -7,6 +7,66 @@ Please send mailfromd bug reports to <bug-mailfromd@gnu.org.ua>
 
 Version 4.3.90 (SVN)
 
+* The --domain option is withdrawn.
+
+This option was declared as deprecated in version 4.0.  Now it is
+withdrawn and its short version (-D) is reused for another purpose
+(see -D option, below).
+
+* New command line options -D and -U
+
+Both options work like their m4 counterpars: the `-D' command line
+option defines a preprocessor symbol, the `-U' option undefines it.
+
+* Constant vs. variable shadowing
+
+In previous versions of mailfromd name clashes between constants and
+variables went unnoticed, which sometimes lead to hard-to-diagnose
+errors.  This bug is fixed in this version.  If a constant is defined
+which has the same name as a previously defined variable (the constant
+"shadows" the variable), the compiler prints the following diagnostic
+message: 
+
+<file>:<line>: Warning: Constant name `name' clashes with a variable name
+<file>:<line>: Warning: This is the location of the previous definition
+
+A similar diagnostics is issued if a variable is defined whose name
+coincides with a previously defined constant (the variable "shadows"
+the constant).
+
+In any case, the %NAME notation refers to the last defined symbol, be
+it variable or constant.
+
+If a variable shadows a constant, the scope of the shadowing depends
+on the storage class of the variable.  For automatic variables and
+function parameters, it ends with the final `done' closing the
+function.  For global variables, it lasts up to the end of input.
+
+* Exception names.
+
+To minimize chances of name clashes, all symbolic exception codes has
+been renamed by prefixing them with the `e_', thus, e.g. `divzero'
+became `e_divzero', etc.  The `ioerr' exception code is renamed to
+`e_io'.
+
+For consistency, the following most often used codes are available without
+the `e_' previx: success, not_found, failure, temp_failure.
+
+The use of old exception codes is still possible by defining a
+preprocessor symbol OLD_EXCEPTION_CODES, for example:
+
+  mailfromd -DOLD_EXCEPTION_CODES
+
+* match_dnsbl and match_rhsbl
+
+Both functions malfunctioned in versions from 4.0 up to 4.3.1 due to a
+name clash between the exception code `range' and their third
+argument.  This is fixed.
+
+Additionally, previous versions of match_dnsbl silently ignored
+invalid first argument.  Now, the e_invip exception is signalled in
+this case.
+  
 
 Version 4.3.1, 2008-03-01
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2ac69c35..10cbd2b9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -76,7 +76,7 @@ check-mflib:
 
 check-exceptions:
         @check-docs.sh exceptions \
-     '/typedef enum mf_status_code {/,/^};/s/[ \t]*mf_\(.*\),.*/\1/p' \
+     '/typedef enum mf_exception_code {/,/^};/s/[ \t]*mfe_\(.*\),.*/e_\1/p;/typedef enum mf_status_code {/,/^};/s/[ \t]*mf_\(.*\),.*/\1/p' \
      's/@cindex \([^,][^,]*\), exception type/\1/p'     \
      $(top_srcdir)/src/mailfromd.h -- \
        $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi
index 27ff4c46..9cf4871e 100644
--- a/doc/mailfromd.texi
+++ b/doc/mailfromd.texi
@@ -184,6 +184,7 @@ Mail Filtering Language
 * begin/end::
 * Functions::                   Functions.
 * Expressions::                 Expressions.
+* Shadowing::                   Variable and Constant Shadowing.
 * Statements::                  
 * Conditionals::                Conditional Statements.
 * Loops::                       Loop Statements.
@@ -270,6 +271,7 @@ Command Line Options.
 
 * Operation Modifiers::
 * General Settings::
+* Preprocessor Options::
 * Timeout Control::
 * Logging and Debugging Options::
 * Informational Options::
@@ -1001,7 +1003,31 @@ the corresponding section below.
 @node 43x-440
 @section Upgrading from 4.3.x to 4.4
 @cindex Upgrading from 4.3.x to 4.4
-@UNREVISED{}
+
+  The deprecated @option{--domain} command line option has been
+withdrawn.  The short option @option{-D} now defines a preprocessor
+symbol (@pxref{Preprocessor Options}).
+
+  This version correctly handles name clashes between constants and
+variables, which remained unnoticed in previous releases.
+@xref{variable--constant shadowing}, for a detailed description of it.
+
+  To minimize chances of name clashes, all symbolic exception codes has
+been renamed by prefixing them with the @samp{e_}, thus, e.g. @code{divzero}
+became @code{e_divzero}, etc.  The @code{ioerr} exception code is renamed to
+@code{e_io}.  @xref{status.mfh}, for a full list of the new exception codes.
+
+@cindex @code{OLD_EXCEPTION_CODES}, preprocessor symbol
+  For consistency, the following most often used codes are available without
+the @samp{e_} previx: success, not_found, failure, temp_failure.  This
+makes most existing user scripts suitable for use with version 4.4
+without any modification.  If your script refers to any exception
+codes other than these four, you can still use it by defining a
+preprocessor symbol @code{OLD_EXCEPTION_CODES}, for example:
+
+@smallexample
+$ mailfromd -DOLD_EXCEPTION_CODES
+@end smallexample
 
 @node 420-43x
 @section Upgrading from 4.2 to 4.3.x
@@ -3322,7 +3348,7 @@ done
 @end group
 @end smallexample
 
-  The intent was obviously to reject any mail if it comes from an
+  The intent was obviously to reject any mail that came from an
 address without a proper @code{PTR} record (@pxref{hostname
 function}).  There is a serious error, however: @code{hostname} is not
 a built-in function as it used to be in previous releases@footnote{Up to
@@ -3396,6 +3422,54 @@ echo sprintf ('Mail from %s', $f)
 This does not limit the functionality, since there is no need to fall
 back to variable interpretation in format strings.
 
+@anchor{variable--constant clashes}
+Yet another dangerous feature of the language is the way to refer to
+variable and constant names within literal strings.  To expand a
+variable or a constant the same notation is used: %@var{name}
+(@xref{Variables}, and @pxref{Constants}).  Now, lets consider the
+following code:
+
+@smallexample