X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparam.c;h=6c28e1923fad702d038c069de6a00d1543eba363;hp=f92a3ecd85a09d81823a564109a0c12d65c238cf;hb=8e5be81f784682822f5e868c1bf3c8624682bd23;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/mhparam.c b/uip/mhparam.c
index f92a3ec..6c28e19 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -12,7 +12,6 @@
 #include <h/mh.h>
 
 extern char *mhlibdir;
-extern char *mhetcdir;
 
 static struct swit switches[] = {
 #define COMPSW  0
@@ -40,19 +39,15 @@ static struct proc procs [] = {
 	 { "mh-sequences",  &mh_seq },
 	 { "buildmimeproc", &buildmimeproc },
 	 { "editor",        &defaulteditor },
-	 { "faceproc",      &faceproc },
 	 { "fileproc",      &fileproc },
 	 { "foldprot",      &foldprot },
 	 { "incproc",       &incproc },
-	 { "installproc",   &installproc  },
 	 { "lproc",         &lproc },
 	 { "mailproc",      &mailproc },
 	 { "mhlproc",       &mhlproc },
 	 { "moreproc",      &moreproc },
 	 { "msgprot",       &msgprot },
-	 { "packproc",      &packproc },
 	 { "postproc",      &postproc },
-	 { "rmfproc",       &rmfproc },
 	 { "rmmproc",       &rmmproc },
 	 { "sendmail",      &sendmail },
 	 { "sendproc",      &sendproc },
@@ -84,31 +79,30 @@ main(int argc, char **argv)
 	char *cp, buf[BUFSIZ], **argp;
 	char **arguments, *comps[MAXARGS];
 
-	invo_name = r1bindex (argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
 	context_read();
 
-	arguments = getarguments (invo_name, argc, argv, 1);
+	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
-			switch (smatch (++cp, switches)) {
+			switch (smatch(++cp, switches)) {
 				case AMBIGSW:
-					ambigsw (cp, switches);
-					done (1);
+					ambigsw(cp, switches);
+					done(1);
 				case UNKWNSW:
-					adios (NULL, "-%s unknown", cp);
+					adios(NULL, "-%s unknown", cp);
 
 				case HELPSW:
-					snprintf (buf, sizeof(buf), "%s [profile-components] [switches]",
-						invo_name);
-					print_help (buf, switches, 1);
-					done (1);
+					snprintf(buf, sizeof(buf), "%s [profile-components] [switches]", invo_name);
+					print_help(buf, switches, 1);
+					done(1);
 				case VERSIONSW:
 					print_version(invo_name);
-					done (1);
+					done(1);
 
 				case COMPSW:
 					components = 1;
@@ -138,7 +132,7 @@ main(int argc, char **argv)
 
 		if (components >= 0)
 			advise(NULL, "-%scomponents ignored with -all",
-				   components ? "" : "no");
+					components ? "" : "no");
 
 		/* print all entries in context/profile list */
 		for (np = m_defs; np; np = np->n_next)
@@ -153,7 +147,7 @@ main(int argc, char **argv)
 		** value (as determined after context is read).
 		*/
 		for (ps = procs; ps->p_name; ps++)
-			printf ("%s: %s\n", ps->p_name,
+			printf("%s: %s\n", ps->p_name,
 					*ps->p_field ? *ps->p_field : "");
 
 	} else {
@@ -163,9 +157,9 @@ main(int argc, char **argv)
 		for (i = 0; i < compp; i++)  {
 			register char *value;
 
-			value = context_find (comps[i]);
+			value = context_find(comps[i]);
 			if (!value)
-				value = p_find (comps[i]);
+				value = p_find(comps[i]);
 			if (value) {
 				if (components)
 					printf("%s: ", comps[i]);
@@ -176,7 +170,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	done (missed);
+	done(missed);
 	return 1;
 }
 
@@ -187,7 +181,7 @@ p_find(char *str)
 	struct proc *ps;
 
 	for (ps = procs; ps->p_name; ps++)
-		if (!mh_strcasecmp (ps->p_name, str))
+		if (!mh_strcasecmp(ps->p_name, str))
 			return (*ps->p_field);
 
 	return NULL;