From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Thu, 12 Nov 2015 11:20:59 +0000 (+0100)
Subject: Add -bP config_file
X-Git-Tag: exim-4_87_RC1~48
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/44f6c01d79710b030a8a73c25fe9620b41c8b0e4?hp=bf3c2c6b76cf8cf582dc2c33bd3d50cd4db25e2c

Add -bP config_file

The -bP configure_file is still supported, but should fade out
eventually. config_file matches better the expansion $config_file.
---

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index b5c07d55d..f32fcbe17 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -3110,8 +3110,9 @@ mysql_servers = <value not displayable>
 If &%config%& is given as an argument, the config is
 output, as it was parsed, any include file resolved, any comment removed.
 
-If &%configure_file%& is given as an argument, the name of the run time
-configuration file is output.
+If &%config_file%& is given as an argument, the name of the run time
+configuration file is output. (&%configure_file%& works too, for
+backward compatibility.)
 If a list of configuration files was supplied, the value that is output here
 is the name of the file that was actually used.
 
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 10ebc5e17..6767465a0 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -2534,7 +2534,9 @@ causes the value of any main configuration variable to be output if the
 second argument is NULL. There are some special values:
 
   all                print all main configuration options
-  configure_file     print the name of the configuration file
+  config_file        print the name of the configuration file
+                     (configure_file will still work, for backward
+                     compatibility)
   routers            print the routers' configurations
   transports         print the transports' configuration
   authenticators     print the authenticators' configuration
@@ -2602,7 +2604,8 @@ if (type == NULL)
     return;
     }
 
-  if (Ustrcmp(name, "configure_file") == 0)
+  if ( Ustrcmp(name, "configure_file") == 0
+     ||Ustrcmp(name, "config_file") == 0)
     {
     printf("%s\n", CS config_main_filename);
     return;