X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparam.c;h=4cad041bb91cea48c89127373c71963a849bac43;hp=f92a3ecd85a09d81823a564109a0c12d65c238cf;hb=5ee5d678d59cf1deea31126bc886333f1be4571d;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/mhparam.c b/uip/mhparam.c
index f92a3ec..4cad041 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -11,9 +11,6 @@
 
 #include <h/mh.h>
 
-extern char *mhlibdir;
-extern char *mhetcdir;
-
 static struct swit switches[] = {
 #define COMPSW  0
 	{ "components", 0 },
@@ -36,36 +33,29 @@ struct proc {
 };
 
 static struct proc procs [] = {
-	 { "context",       &context },
-	 { "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 },
-	 { "showmimeproc",  &showmimeproc },
-	 { "showproc",      &showproc },
-	 { "version",       &version_num },
-	 { "whatnowproc",   &whatnowproc },
-	 { "etcdir",        &mhetcdir },
-	 { "libdir",        &mhlibdir },
-	 { "backup-prefix", &backup_prefix },
-	 { "altmsg-link",   &altmsglink },
-	 { "draft-folder",  &draftfolder },
-	 { NULL,            NULL },
+	{ "attachment-header",  &attach_hdr },
+	{ "context",       &context },
+	{ "mh-sequences",  &mh_seq },
+	{ "editor",        &defaulteditor },
+	{ "fileproc",      &fileproc },
+	{ "foldprot",      &foldprot },
+	{ "listproc",      &listproc },
+	{ "mailproc",      &mailproc },
+	{ "mhlproc",       &mhlproc },
+	{ "mimetypequeryproc", &mimetypequeryproc },
+	{ "msgprot",       &msgprot },
+	{ "pager",         &defaultpager },
+	{ "postproc",      &postproc },
+	{ "rmmproc",       &rmmproc },
+	{ "sendmail",      &sendmail },
+	{ "sendproc",      &sendproc },
+	{ "version",       &version_num },
+	{ "whatnowproc",   &whatnowproc },
+	{ "etcdir",        &mhetcdir },
+	{ "backup-prefix", &backup_prefix },
+	{ "altmsg-link",   &altmsglink },
+	{ "draft-folder",  &draftfolder },
+	{ NULL,            NULL },
 };
 
 
@@ -84,46 +74,45 @@ 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)) {
-				case AMBIGSW:
-					ambigsw (cp, switches);
-					done (1);
-				case UNKWNSW:
-					adios (NULL, "-%s unknown", cp);
-
-				case HELPSW:
-					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);
-
-				case COMPSW:
-					components = 1;
-					break;
-				case NCOMPSW:
-					components = 0;
-					break;
-
-				case ALLSW:
-					all = 1;
-					break;
-
-				case DEBUGSW:
-					debug = 1;
-					break;
+			switch (smatch(++cp, switches)) {
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				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);
+
+			case COMPSW:
+				components = 1;
+				break;
+			case NCOMPSW:
+				components = 0;
+				break;
+
+			case ALLSW:
+				all = 1;
+				break;
+
+			case DEBUGSW:
+				debug = 1;
+				break;
 			}
 		} else {
 			comps[compp++] = cp;
@@ -138,7 +127,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 +142,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 +152,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 +165,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	done (missed);
+	done(missed);
 	return 1;
 }
 
@@ -187,7 +176,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;