Add support for printing iconv and localmbox.

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 325a1a34fdd7782ce5a37e39bfc83f8b26334c79..33f0657477adecbf6816e8c8ca23f331fe6eeb08 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -11,6 +11,7 @@
  */
 
 #include <h/mh.h>
  */
 
 #include <h/mh.h>

+#include <h/mts.h>

 
 #define MHPARAM_SWITCHES \
     X("components", 0, COMPSW) \
 
 #define MHPARAM_SWITCHES \
     X("components", 0, COMPSW) \


@@ -31,40 +32,48 @@ DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 extern char *mhlibdir;
 extern char *mhetcdir;
 
 extern char *mhlibdir;
 extern char *mhetcdir;
 

-char *sbackup = BACKUP_PREFIX;
+static char *sbackup = BACKUP_PREFIX;

 
 

-char *datalocking = "fcntl";
+static char *datalocking = "fcntl";
+static char *localmbox = "";

 
 extern char *spoollocking;
 
 
 extern char *spoollocking;
 

-char *sasl =
+static char *sasl =

 #ifdef CYRUS_SASL
     "cyrus_sasl";
 #else
     "";
 #endif
 
 #ifdef CYRUS_SASL
     "cyrus_sasl";
 #else
     "";
 #endif
 

-char *tls =
+static char *tls =

 #ifdef TLS_SUPPORT
     "tls";
 #else
     "";
 #endif
 
 #ifdef TLS_SUPPORT
     "tls";
 #else
     "";
 #endif
 

-char *mimetypeproc =
+static char *mimetypeproc =

 #ifdef MIMETYPEPROC
     MIMETYPEPROC;
 #else
     "";
 #endif
 
 #ifdef MIMETYPEPROC
     MIMETYPEPROC;
 #else
     "";
 #endif
 

-char *mimeencodingproc =
+static char *mimeencodingproc =

 #ifdef MIMEENCODINGPROC
     MIMEENCODINGPROC;
 #else
     "";
 #endif
 
 #ifdef MIMEENCODINGPROC
     MIMEENCODINGPROC;
 #else
     "";
 #endif
 

+static char *iconv =
+#ifdef HAVE_ICONV
+    "iconv";
+#else
+    "";
+#endif
+

 struct proc {
     char *p_name;
     char **p_field;
 struct proc {
     char *p_name;
     char **p_field;


@@ -98,9 +107,11 @@ static struct proc procs [] = {
      { "whomproc",         &whomproc },
      { "etcdir",           &mhetcdir },
      { "libdir",           &mhlibdir },
      { "whomproc",         &whomproc },
      { "etcdir",           &mhetcdir },
      { "libdir",           &mhlibdir },

+     { "localmbox",       &localmbox },

      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
      { "spoollocking",     &spoollocking },
      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
      { "spoollocking",     &spoollocking },

+     { "iconv",                   &iconv },

      { "sasl",             &sasl },
      { "tls",              &tls },
      { NULL,               NULL },
      { "sasl",             &sasl },
      { "tls",              &tls },
      { NULL,               NULL },


@@ -185,6 +196,9 @@ main(int argc, char **argv)
        /* Need to see if datalocking was set in profile. */
        if ((cp = context_find("datalocking"))) { datalocking = cp; }
 
        /* Need to see if datalocking was set in profile. */
        if ((cp = context_find("datalocking"))) { datalocking = cp; }
 

+       /* Also set localmbox here */
+       localmbox = getlocalmbox();
+

        /*
         * Print the current value of everything in
         * procs array.  This will show their current
        /*
         * Print the current value of everything in
         * procs array.  This will show their current