Split assignment and export of shell variable.

[nmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 33f0657477adecbf6816e8c8ca23f331fe6eeb08..bb2f7d2fea64fae48670d33166c409146bd1741a 100644 (file)
--- 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;
+           }
        }
     }
 
@@ -197,7 +200,10 @@ main(int argc, char **argv)
        if ((cp = context_find("datalocking"))) { datalocking = cp; }
 
        /* Also set localmbox here */
-       localmbox = getlocalmbox();
+       if (! localmbox_primed) {
+           localmbox = getlocalmbox();
+           localmbox_primed = 1;
+       }
 
        /*
         * Print the current value of everything in