X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0931b38db89da7e4a80294641f9ef66ed653ce7e..52391b538640f320acb25a66b673042c51567f61:/uip/mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 33f06574..bd22470c 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -36,6 +36,7 @@ static char *sbackup = BACKUP_PREFIX;
 
 static char *datalocking = "fcntl";
 static char *localmbox = "";
+static int localmbox_primed = 0;
 
 extern char *spoollocking;
 
@@ -94,7 +95,6 @@ static struct proc procs [] = {
      { "mimeencodingproc", &mimeencodingproc },
      { "moreproc",         &moreproc },
      { "msgprot",          &msgprot },
-     { "mshproc",          &mshproc },
      { "packproc",         &packproc },
      { "postproc",         &postproc },
      { "rmmproc",          &rmmproc },
@@ -102,7 +102,6 @@ static struct proc procs [] = {
      { "showmimeproc",     &showmimeproc },
      { "showproc",         &showproc },
      { "version",          &version_num },
-     { "vmhproc",          &vmhproc },
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
      { "etcdir",           &mhetcdir },
@@ -173,6 +172,10 @@ main(int argc, char **argv)
 	    }
 	} else {
 	    comps[compp++] = cp;
+	    if (strcmp("localmbox", cp) == 0 && ! localmbox_primed) {
+		localmbox = getlocalmbox();
+		localmbox_primed = 1;
+	    }
 	}
     }
 
@@ -186,18 +189,25 @@ main(int argc, char **argv)
 	    advise(NULL, "-%scomponents ignored with -all",
 		   components ? "" : "no");
 
-	/* print all entries in context/profile list */
+	/* Print all entries in context/profile list.  That does not
+	   include entries in mts.conf, such as spoollocking. */
 	for (np = m_defs; np; np = np->n_next)
 	    printf("%s: %s\n", np->n_name, np->n_field);
 
     } else if (debug) {
 	struct proc *ps;
 
-	/* Need to see if datalocking was set in profile. */
+	/* In case datalocking was set in profile. */
 	if ((cp = context_find("datalocking"))) { datalocking = cp; }
 
+	/* In case spoollocking was set in mts.conf. */
+	mts_init(invo_name);
+
 	/* Also set localmbox here */
-	localmbox = getlocalmbox();
+	if (! localmbox_primed) {
+	    localmbox = getlocalmbox();
+	    localmbox_primed = 1;
+	}
 
 	/*
 	 * Print the current value of everything in
@@ -214,6 +224,11 @@ main(int argc, char **argv)
 	for (i = 0; i < compp; i++)  {
 	    register char *value;
 
+	    if (! strcmp ("spoollocking", comps[i])) {
+		/* In case spoollocking was set in mts.conf. */
+		mts_init(invo_name);
+            }
+
 	    value = context_find (comps[i]);
 	    if (!value)
 		value = p_find (comps[i]);