Minor changes.

* doc/upgrade.texi: Document MAILFROMD_DEPRECATION.
* mfd/main.c: Remove spurious semicolon.
* mfd/pp.c (pp_extrn_start): Print debug info on level >= 2.
(preprocess_input): Add missing return.

3 files changed, 15 insertions, 2 deletions

diff --git a/doc/upgrade.texi b/doc/upgrade.texi
index cc432ca1..c21a114b 100644
--- a/doc/upgrade.texi
+++ b/doc/upgrade.texi
@@ -49,6 +49,11 @@ the source.  In version 6.0 the script file is renamed to
 @file{mailfromd.rc} is recognised and parsed.  This ensures backward
 compatibility.
 
+  @command{Mailfromd} version @samp{6.0} will work with unchanged
+scripts from @samp{5.x}.  If the script contains any deprecated
+constructs, @command{mailfromd} will emit warnings for each of them,
+and will create a script for upgrading your filters.
+
   To upgrade your scripts to the new configuration system, follow
 the steps below:
 
@@ -81,6 +86,13 @@ $ rm /tmp/mailfromd-newconf.sh
 @end smallexample
 @end itemize
 
+  If, for some reason, you cannot upgrade your scripts right now, you
+may suppress these warnings by setting the environment variable
+@env{MAILFROMD_DEPRECATION} to @samp{no} before starting
+@command{mailfromd}.  Nonetheless, I recommend to upgrade as soon as
+possible, because the deprecated features will be removed in version
+@samp{6.1}.
+
 @node 500-510
 @appendixsec Upgrading from 5.0 to 5.1
 @cindex Upgrading from 5.0 to 5.1
diff --git a/mfd/main.c b/mfd/main.c
index 6e0218f2..332d20b3 100644
--- a/mfd/main.c
+++ b/mfd/main.c
@@ -2708,7 +2708,7 @@ main(int argc, char **argv)
 		if (script_file[0] != '/')
 			save_cmdline(0, NULL); /* Clear saved command line */
 		if (preprocess_option)
-			exit(preprocess_input());;
+			exit(preprocess_input());
 		if (parse_program(script_file, script_ydebug))
 			exit(EX_CONFIG);
 	}
diff --git a/mfd/pp.c b/mfd/pp.c
index 4008027b..a321c9da 100644
--- a/mfd/pp.c
+++ b/mfd/pp.c
@@ -327,7 +327,7 @@ pp_extrn_start(const char *name, pid_t *ppid)
 	strcat(ppcmd, " ");
 	strcat(ppcmd, name);
 
-	debug1(1, "Running preprocessor: `%s'", ppcmd);
+	debug1(2, "Running preprocessor: `%s'", ppcmd);
 
 	mu_argcv_get(ppcmd, NULL, NULL, &argc, &argv);
 	
@@ -490,5 +490,6 @@ preprocess_input()
 	while ((n = fread(buffer, 1, sizeof buffer, file)) > 0)
 		fwrite(buffer, 1, n, stdout);
 	pp_extrn_shutdown(file, pid);
+	return 0;
 }