X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8e0f9bd3daae9d05dec58026d5a5924367e4e874..9322ba2854211794c27fae9468768b80b767c211:/uip/mhparam.c?ds=inline

diff --git a/uip/mhparam.c b/uip/mhparam.c
index f6daf9a5..edbefd78 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -30,8 +30,9 @@ DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 
 extern char *mhbindir;
-extern char *mhetcdir;
 extern char *mhlibexecdir;
+extern char *mhetcdir;
+extern char *mhdocdir;
 
 static char *sbackup = BACKUP_PREFIX;
 
@@ -113,9 +114,10 @@ static struct proc procs [] = {
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
      { "bindir",           &mhbindir },
-     { "etcdir",           &mhetcdir },
-     { "libdir",           &mhlibexecdir },
      { "libexecdir",       &mhlibexecdir },
+     { "libdir",           &mhlibexecdir },
+     { "etcdir",           &mhetcdir },
+     { "docdir",           &mhdocdir },
      { "localmbox",	   &localmbox },
      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
@@ -143,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;
@@ -205,14 +207,16 @@ main(int argc, char **argv)
 	for (np = m_defs; np; np = np->n_next)
 	    printf("%s: %s\n", np->n_name, np->n_field);
 
-    } else if (debug) {
+    }
+
+    if (debug) {
 	struct proc *ps;
 
 	/* 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);
+	mts_init();
 
 	/* Also set localmbox here */
 	if (! localmbox_primed) {
@@ -228,16 +232,18 @@ main(int argc, char **argv)
 	for (ps = procs; ps->p_name; ps++)
 	    printf ("%s: %s\n", ps->p_name, *ps->p_field ? *ps->p_field : "");
 
-    } else {
+    }
+
+    if (! all) {
         if (components < 0)
 	    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]);
@@ -247,8 +253,8 @@ main(int argc, char **argv)
 	        if (components)
 		    printf("%s: ", comps[i]);
 
-		printf("%s\n", value);
-	    } else
+		puts(value);
+	    } else if (missed < 120)
 	        missed++;
 	}
     }
@@ -264,7 +270,7 @@ p_find(char *str)
     struct proc *ps;
 
     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;