From: Ken Hornstein <kenh@pobox.com>
Date: Fri, 14 Mar 2014 16:31:23 +0000 (-0400)
Subject: Add support for printing iconv and localmbox.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/0931b38db89da7e4a80294641f9ef66ed653ce7e?hp=b4d285e8d8e0f106c23df393ea5983a25e4b6ea5

Add support for printing iconv and localmbox.
---

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 325a1a34..33f06574 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -11,6 +11,7 @@
  */
 
 #include <h/mh.h>
+#include <h/mts.h>
 
 #define MHPARAM_SWITCHES \
     X("components", 0, COMPSW) \
@@ -31,40 +32,48 @@ DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 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;
 
-char *sasl =
+static char *sasl =
 #ifdef CYRUS_SASL
     "cyrus_sasl";
 #else
     "";
 #endif
 
-char *tls =
+static char *tls =
 #ifdef TLS_SUPPORT
     "tls";
 #else
     "";
 #endif
 
-char *mimetypeproc =
+static char *mimetypeproc =
 #ifdef MIMETYPEPROC
     MIMETYPEPROC;
 #else
     "";
 #endif
 
-char *mimeencodingproc =
+static char *mimeencodingproc =
 #ifdef MIMEENCODINGPROC
     MIMEENCODINGPROC;
 #else
     "";
 #endif
 
+static char *iconv =
+#ifdef HAVE_ICONV
+    "iconv";
+#else
+    "";
+#endif
+
 struct proc {
     char *p_name;
     char **p_field;
@@ -98,9 +107,11 @@ static struct proc procs [] = {
      { "whomproc",         &whomproc },
      { "etcdir",           &mhetcdir },
      { "libdir",           &mhlibdir },
+     { "localmbox",	   &localmbox },
      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
      { "spoollocking",     &spoollocking },
+     { "iconv",		   &iconv },
      { "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; }
 
+	/* Also set localmbox here */
+	localmbox = getlocalmbox();
+
 	/*
 	 * Print the current value of everything in
 	 * procs array.  This will show their current