X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6bc64765f773ce75454ec1592a86779e3547fe46..c9794733:/uip/mhparam.c?ds=inline

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 8a276f72..bb2f7d2f 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,50 +32,49 @@ DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 extern char *mhlibdir;
 extern char *mhetcdir;
 
-char *sbackup = BACKUP_PREFIX;
-
-char *lockmethod =
-#if defined FCNTL_LOCKING
-    "fcntl"
-#elif defined FLOCK_LOCKING
-    "flock"
-#elif defined LOCKF_LOCKING
-    "lockf"
-#elif defined DOT_LOCKING
-    "dot"
-#else
-    "none"
-#endif
-    ;
+static char *sbackup = BACKUP_PREFIX;
+
+static char *datalocking = "fcntl";
+static char *localmbox = "";
+static int localmbox_primed = 0;
+
+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;
@@ -95,7 +95,6 @@ static struct proc procs [] = {
      { "mimeencodingproc", &mimeencodingproc },
      { "moreproc",         &moreproc },
      { "msgprot",          &msgprot },
-     { "mshproc",          &mshproc },
      { "packproc",         &packproc },
      { "postproc",         &postproc },
      { "rmmproc",          &rmmproc },
@@ -103,13 +102,15 @@ static struct proc procs [] = {
      { "showmimeproc",     &showmimeproc },
      { "showproc",         &showproc },
      { "version",          &version_num },
-     { "vmhproc",          &vmhproc },
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
      { "etcdir",           &mhetcdir },
      { "libdir",           &mhlibdir },
+     { "localmbox",	   &localmbox },
      { "sbackup",          &sbackup },
-     { "lockmethod",       &lockmethod },
+     { "datalocking",      &datalocking },
+     { "spoollocking",     &spoollocking },
+     { "iconv",		   &iconv },
      { "sasl",             &sasl },
      { "tls",              &tls },
      { NULL,               NULL },
@@ -171,6 +172,10 @@ main(int argc, char **argv)
 	    }
 	} else {
 	    comps[compp++] = cp;
+	    if (strcmp("localmbox", cp) == 0 && ! localmbox_primed) {
+		localmbox = getlocalmbox();
+		localmbox_primed = 1;
+	    }
 	}
     }
 
@@ -191,6 +196,15 @@ main(int argc, char **argv)
     } else if (debug) {
 	struct proc *ps;
 
+	/* Need to see if datalocking was set in profile. */
+	if ((cp = context_find("datalocking"))) { datalocking = cp; }
+
+	/* Also set localmbox here */
+	if (! localmbox_primed) {
+	    localmbox = getlocalmbox();
+	    localmbox_primed = 1;
+	}
+
 	/*
 	 * Print the current value of everything in
 	 * procs array.  This will show their current
@@ -218,7 +232,7 @@ main(int argc, char **argv)
 	        missed++;
 	}
     }
-    
+
     done (missed);
     return 1;
 }