Removed export of most of the variables in test/common.sh.in. The

[nmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index bb2f7d2fea64fae48670d33166c409146bd1741a..acb416c71a4bf41a8f7bbcde0c84cc7a2cb3dedd 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -29,8 +29,8 @@ DEFINE_SWITCH_ENUM(MHPARAM);
 DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 
-extern char *mhlibdir;
 extern char *mhetcdir;
+extern char *mhlibexecdir;
 
 static char *sbackup = BACKUP_PREFIX;
 
@@ -105,7 +105,8 @@ static struct proc procs [] = {
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
      { "etcdir",           &mhetcdir },
-     { "libdir",           &mhlibdir },
+     { "libdir",           &mhlibexecdir },
+     { "libexecdir",       &mhlibexecdir },
      { "localmbox",       &localmbox },
      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
@@ -189,16 +190,20 @@ 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 */
        if (! localmbox_primed) {
            localmbox = getlocalmbox();
@@ -220,6 +225,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]);