X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Freadconfig.c;h=72123038b980cf295a54dce3be890afd7272e17d;hp=1dfd99d89379674696939de6fb67b73533717700;hb=8e5be81f784682822f5e868c1bf3c8624682bd23;hpb=18017df38ebb626f6eed6f339641fd1298c326e7

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 1dfd99d..7212303 100644
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -1,11 +1,11 @@
 /*
- * readconfig.c -- base routine to read nmh configuration files
- *              -- such as nmh profile, context file, or mhn.defaults.
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** readconfig.c -- base routine to read nmh configuration files
+**              -- such as nmh profile, context file, or mhn.defaults.
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 #include <h/utils.h>
@@ -19,19 +19,16 @@ static struct procstr procs[] = {
 	{ "context",       &context },
 	{ "mh-sequences",  &mh_seq },
 	{ "backup-prefix", &backup_prefix },
+	{ "draft-folder",  &draftfolder },
 	{ "altmsg-link",   &altmsglink },
 	{ "buildmimeproc", &buildmimeproc },
-	{ "faceproc",      &faceproc },
 	{ "fileproc",      &fileproc },
 	{ "incproc",       &incproc },
-	{ "installproc",   &installproc },
 	{ "lproc",         &lproc },
 	{ "mailproc",      &mailproc },
 	{ "mhlproc",       &mhlproc },
 	{ "moreproc",      &moreproc },
-	{ "packproc",      &packproc },
 	{ "postproc",      &postproc },
-	{ "rmfproc",       &rmfproc },
 	{ "rmmproc",       &rmmproc },
 	{ "sendmail",      &sendmail },
 	{ "sendproc",      &sendproc },
@@ -45,7 +42,7 @@ static struct node **opp = NULL;
 
 
 void
-readconfig (struct node **npp, FILE *ib, char *file, int ctx)
+readconfig(struct node **npp, FILE *ib, char *file, int ctx)
 {
 	register int state;
 	register char *cp;
@@ -54,38 +51,39 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
 	register struct procstr *ps;
 
 	if (npp == NULL && (npp = opp) == NULL) {
-		admonish (NULL, "bug: readconfig called but pump not primed");
+		admonish(NULL, "bug: readconfig called but pump not primed");
 		return;
 	}
 
 	for (state = FLD;;) {
-		switch (state = m_getfld (state, name, field, sizeof(field), ib)) {
+		switch (state = m_getfld(state, name, field, sizeof(field), ib)) {
 			case FLD:
 			case FLDPLUS:
 			case FLDEOF:
-				np = (struct node *) mh_xmalloc (sizeof(*np));
+				np = (struct node *) mh_xmalloc(sizeof(*np));
 				*npp = np;
 				*(npp = &np->n_next) = NULL;
-				np->n_name = getcpy (name);
+				np->n_name = getcpy(name);
 				if (state == FLDPLUS) {
-					cp = getcpy (field);
+					cp = getcpy(field);
 					while (state == FLDPLUS) {
-						state = m_getfld (state, name, field, sizeof(field), ib);
-						cp = add (field, cp);
+						state = m_getfld(state, name, field, sizeof(field), ib);
+						cp = add(field, cp);
 					}
-					np->n_field = trimcpy (cp);
-					free (cp);
+					np->n_field = trimcpy(cp);
+					free(cp);
 				} else {
-					np->n_field = trimcpy (field);
+					np->n_field = trimcpy(field);
 				}
 				np->n_context = ctx;
 
 				/*
-				 * Now scan the list of `procs' and link in the
-				 * field value to the global variable.
-				 */
+				** Now scan the list of `procs' and link in
+				** the field value to the global variable.
+				*/
 				for (ps = procs; ps->procname; ps++)
-					if (strcmp (np->n_name, ps->procname) == 0) {
+					if (mh_strcasecmp(np->n_name,
+							ps->procname) == 0) {
 						*ps->procnaddr = np->n_field;
 						break;
 					}
@@ -95,13 +93,13 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
 
 			case BODY:
 			case BODYEOF:
-				adios (NULL, "no blank lines are permitted in %s", file);
+				adios(NULL, "no blank lines are permitted in %s", file);
 
 			case FILEEOF:
 				break;
 
 			default:
-				adios (NULL, "%s is poorly formatted", file);
+				adios(NULL, "%s is poorly formatted", file);
 		}
 		break;
 	}