X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b39f4c8121d05424ba133603f843b155bdf8d7f4..c525020c77134b8832587755b7c05764a0516d80:/uip/mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index a3f4d78c..55ac3c31 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -29,8 +29,10 @@ DEFINE_SWITCH_ENUM(MHPARAM);
 DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 
-extern char *mhetcdir;
+extern char *mhbindir;
 extern char *mhlibexecdir;
+extern char *mhetcdir;
+extern char *mhdocdir;
 
 static char *sbackup = BACKUP_PREFIX;
 
@@ -111,9 +113,11 @@ static struct proc procs [] = {
      { "version",          &version_num },
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
-     { "etcdir",           &mhetcdir },
-     { "libdir",           &mhlibexecdir },
+     { "bindir",           &mhbindir },
      { "libexecdir",       &mhlibexecdir },
+     { "libdir",           &mhlibexecdir },
+     { "etcdir",           &mhetcdir },
+     { "docdir",           &mhdocdir },
      { "localmbox",	   &localmbox },
      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
@@ -141,7 +145,7 @@ main(int argc, char **argv)
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -210,7 +214,7 @@ main(int argc, char **argv)
 	if ((cp = context_find("datalocking"))) { datalocking = cp; }
 
 	/* In case spoollocking was set in mts.conf. */
-	mts_init(invo_name);
+	mts_init();
 
 	/* Also set localmbox here */
 	if (! localmbox_primed) {
@@ -231,11 +235,11 @@ main(int argc, char **argv)
 	    components = compp > 1;
 
 	for (i = 0; i < compp; i++)  {
-	    register char *value;
+	    char *value;
 
 	    if (! strcmp ("spoollocking", comps[i])) {
 		/* In case spoollocking was set in mts.conf. */
-		mts_init(invo_name);
+		mts_init();
             }
 
 	    value = context_find (comps[i]);
@@ -261,8 +265,10 @@ p_find(char *str)
 {
     struct proc *ps;
 
+    if (!str)
+        str = "";
     for (ps = procs; ps->p_name; ps++)
-	if (!strcasecmp (ps->p_name, str ? str : ""))
+	if (!strcasecmp (ps->p_name, str))
 	    return (*ps->p_field);
 
     return NULL;