static strings for routers-supported -bV

diff --git a/src/src/drtables.c b/src/src/drtables.c
index 987846bac5c3a0b4cfd339d9fa8180d343fbf013..9225fafe1958f6401d4c01bc932da0849a1213b4 100644 (file)
--- a/src/src/drtables.c
+++ b/src/src/drtables.c
@@ -500,70 +500,67 @@ return string_cat(g, US"\n");
 gstring *
 route_show_supported(gstring * g)
 {
 gstring *
 route_show_supported(gstring * g)
 {

-gstring * b = NULL, * d = NULL;
-

 #ifdef old
 g = string_cat(g, US"Routers:");
 /*XXX these run off the static list as we want them before the conf is read */
 /*XXX lookup_show_supported is in exim.c and just works off the #defines, with hardoded strings */
 for (router_info * rr = routers_available_oldarray; rr->drinfo.driver_name[0]; rr++)
                g = string_fmt_append(g, " %s", rr->drinfo.driver_name);
 #ifdef old
 g = string_cat(g, US"Routers:");
 /*XXX these run off the static list as we want them before the conf is read */
 /*XXX lookup_show_supported is in exim.c and just works off the #defines, with hardoded strings */
 for (router_info * rr = routers_available_oldarray; rr->drinfo.driver_name[0]; rr++)
                g = string_fmt_append(g, " %s", rr->drinfo.driver_name);

+return string_cat(g, US"\n");

 #else
 
 #else
 

-#ifdef ROUTER_ACCEPT
-# if ROUTER_ACCEPT!=2
-  b = string_cat(b, US" accept");
-# else
-  d = string_cat(d, US" cdb");
-# endif
+uschar * b = US""              /* static-build router names */
+#if defined(ROUTER_ACCEPT) && ROUTER_ACCEPT!=2
+  " accept"

 #endif
 #endif

-#ifdef ROUTER_DNSLOOKUP
-# if ROUTER_DNSLOOKUP!=2
-  b = string_cat(g, US" dnslookup");
-# else
-  d = string_cat(g, US" dnslookup");
-# endif
-#endif
-# ifdef ROUTER_IPLITERAL
-# if ROUTER_IPLITERAL!=2
-  b = string_cat(g, US" ipliteral");
-# else
-  d = string_cat(g, US" ipliteral");
-# endif
+#if defined(ROUTER_DNSLOOKUP) && ROUTER_DNSLOOKUP!=2
+  " dnslookup"

 #endif
 #endif

-#ifdef ROUTER_IPLOOKUP
-# if ROUTER_IPLOOKUP!=2
-  b = string_cat(g, US" iplookup");
-# else
-  d = string_cat(g, US" iplookup");
-# endif
+# if defined(ROUTER_IPLITERAL) && ROUTER_IPLITERAL!=2
+  " ipliteral"

 #endif
 #endif

-#ifdef ROUTER_MANUALROUTE
-# if ROUTER_MANUALROUTE!=2
-  b = string_cat(g, US" manualroute");
-# else
-  d = string_cat(g, US" manualroute");
-# endif
+#if defined(ROUTER_IPLOOKUP) && ROUTER_IPLOOKUP!=2
+  " iplookup"

 #endif
 #endif

-#ifdef ROUTER_REDIRECT
-# if ROUTER_REDIRECT!=2
-  b = string_cat(g, US" redirect");
-# else
-  d = string_cat(g, US" redirect");
-# endif
+#if defined(ROUTER_MANUALROUTE) && ROUTER_MANUALROUTE!=2
+  " manualroute"

 #endif
 #endif

-#ifdef ROUTER_QUERYPROGRAM
-# if ROUTER_QUERYPROGRAM!=2
-  b = string_cat(g, US" queryprogram");
-# else
-  d = string_cat(g, US" queryprogram");
-# endif
+#if defined(ROUTER_REDIRECT) && ROUTER_REDIRECT!=2
+  " redirect"
+#endif
+#if defined(ROUTER_QUERYPROGRAM) && ROUTER_QUERYPROGRAM!=2
+  " queryprogram"

 #endif
 #endif

+  ;

 
 

-if (b) g = string_fmt_append(g, "Routers (built-in):%Y\n", b);
-if (d) g = string_fmt_append(g, "Routers (dynamic): %Y\n", d);
+uschar * d = US""              /* dynamic-module router names */
+#if defined(ROUTER_ACCEPT) && ROUTER_ACCEPT==2
+  " accept"

 #endif
 #endif

-return string_cat(g, US"\n");
+#if defined(ROUTER_DNSLOOKUP) && ROUTER_DNSLOOKUP==2
+  " dnslookup"
+#endif
+# if defined(ROUTER_IPLITERAL) && ROUTER_IPLITERAL==2
+  " ipliteral"
+#endif
+#if defined(ROUTER_IPLOOKUP) && ROUTER_IPLOOKUP==2
+  " iplookup"
+#endif
+#if defined(ROUTER_MANUALROUTE) && ROUTER_MANUALROUTE==2
+  " manualroute"
+#endif
+#if defined(ROUTER_REDIRECT) && ROUTER_REDIRECT==2
+  " redirect"
+#endif
+#if defined(ROUTER_QUERYPROGRAM) && ROUTER_QUERYPROGRAM==2
+  " queryprogram"
+#endif
+  ;
+
+if (*b) g = string_fmt_append(g, "Routers (built-in):%s\n", b);
+if (*d) g = string_fmt_append(g, "Routers (dynamic): %s\n", d);
+return g;
+#endif /*!old*/

 }
 
 gstring *
 }
 
 gstring *

diff --git a/test/runtest b/test/runtest
index d73bc393e490de27f02a83277e9fa02612c8d8ee..1d7589a694010826698f1f987c58f5178b437cd3 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1163,7 +1163,7 @@ RESET_AFTER_EXTRA_LINE_READ:
                  | Authenticators:
                  | Lookups(?:\(built-in\))?:
                  | Support\ for:
                  | Authenticators:
                  | Lookups(?:\(built-in\))?:
                  | Support\ for:

-                 | Routers:
+                 | Routers\ \((?:built-in|dynamic)\):

                  | Transports:
                  | Malware:
                  | log\ selectors\ =
                  | Transports:
                  | Malware:
                  | log\ selectors\ =


@@ -3745,12 +3745,13 @@ while (<EXIMINFO>)
     %parm_authenticators = @temp;
     }
 
     %parm_authenticators = @temp;
     }
 

-  elsif (/^Routers: (.*)/)
+  elsif (/^Routers \((?:built-in|dynamic)\):  ?(.*)/)

     {
     print;
     @temp = split /(\s+)/, $1;
     push(@temp, ' ');
     {
     print;
     @temp = split /(\s+)/, $1;
     push(@temp, ' ');

-    %parm_routers = @temp;
+    my %temp_routers= @temp;
+    @parm_routers{keys %temp_routers} = values %temp_routers;

     }
 
   # Some transports have options, e.g. appendfile/maildir. For those, ensure
     }
 
   # Some transports have options, e.g. appendfile/maildir. For those, ensure