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

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 7212303..645a9ef 100644
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -7,6 +7,7 @@
 ** complete copyright information.
 */
 
+#include <sysexits.h>
 #include <h/mh.h>
 #include <h/utils.h>
 
@@ -16,24 +17,15 @@ struct procstr {
 };
 
 static struct procstr procs[] = {
+	{ "attachment-header",  &attach_hdr },
+	{ "sign-header",   &sign_hdr },
+	{ "enc-header",    &enc_hdr },
 	{ "context",       &context },
 	{ "mh-sequences",  &mh_seq },
-	{ "backup-prefix", &backup_prefix },
 	{ "draft-folder",  &draftfolder },
-	{ "altmsg-link",   &altmsglink },
-	{ "buildmimeproc", &buildmimeproc },
-	{ "fileproc",      &fileproc },
-	{ "incproc",       &incproc },
-	{ "lproc",         &lproc },
-	{ "mailproc",      &mailproc },
-	{ "mhlproc",       &mhlproc },
-	{ "moreproc",      &moreproc },
-	{ "postproc",      &postproc },
-	{ "rmmproc",       &rmmproc },
+	{ "listproc",      &listproc },
 	{ "sendmail",      &sendmail },
-	{ "sendproc",      &sendproc },
-	{ "showmimeproc",  &showmimeproc },
-	{ "showproc",      &showproc },
+	{ "trash-folder",  &trashfolder },
 	{ "whatnowproc",   &whatnowproc },
 	{ NULL, NULL }
 };
@@ -44,62 +36,48 @@ static struct node **opp = NULL;
 void
 readconfig(struct node **npp, FILE *ib, char *file, int ctx)
 {
-	register int state;
-	register char *cp;
-	char name[NAMESZ], field[BUFSIZ];
-	register struct node *np;
-	register struct procstr *ps;
+	enum state state;
+	struct field f = free_field;
+	struct node *np;
+	struct procstr *ps;
 
 	if (npp == NULL && (npp = opp) == NULL) {
 		admonish(NULL, "bug: readconfig called but pump not primed");
 		return;
 	}
 
-	for (state = FLD;;) {
-		switch (state = m_getfld(state, name, field, sizeof(field), ib)) {
-			case FLD:
-			case FLDPLUS:
-			case FLDEOF:
-				np = (struct node *) mh_xmalloc(sizeof(*np));
-				*npp = np;
-				*(npp = &np->n_next) = NULL;
-				np->n_name = getcpy(name);
-				if (state == FLDPLUS) {
-					cp = getcpy(field);
-					while (state == FLDPLUS) {
-						state = m_getfld(state, name, field, sizeof(field), ib);
-						cp = add(field, cp);
-					}
-					np->n_field = trimcpy(cp);
-					free(cp);
-				} else {
-					np->n_field = trimcpy(field);
-				}
-				np->n_context = ctx;
+	for (state = FLD2;;) {
+		switch (state = m_getfld2(state, &f, ib)) {
+		case FLD2:
+			np = (struct node *) mh_xmalloc(sizeof(*np));
+			*npp = np;
+			*(npp = &np->n_next) = NULL;
+			np->n_name = getcpy(f.name);
+			np->n_field = trimcpy(f.value);
+			np->n_context = ctx;
 
-				/*
-				** Now scan the list of `procs' and link in
-				** the field value to the global variable.
-				*/
-				for (ps = procs; ps->procname; ps++)
-					if (mh_strcasecmp(np->n_name,
-							ps->procname) == 0) {
-						*ps->procnaddr = np->n_field;
-						break;
-					}
-				if (state == FLDEOF)
+			/*
+			** Now scan the list of `procs' and link in
+			** the field value to the global variable.
+			*/
+			for (ps = procs; ps->procname; ps++) {
+				if (mh_strcasecmp(np->n_name,
+						ps->procname) == 0) {
+					*ps->procnaddr = np->n_field;
 					break;
-				continue;
+				}
+			}
+			continue;
 
-			case BODY:
-			case BODYEOF:
-				adios(NULL, "no blank lines are permitted in %s", file);
+		case BODY2:
+			adios(EX_CONFIG, NULL, "no blank lines are permitted in %s",
+					file);
 
-			case FILEEOF:
-				break;
+		case FILEEOF2:
+			break;
 
-			default:
-				adios(NULL, "%s is poorly formatted", file);
+		default:
+			adios(EX_CONFIG, NULL, "%s is poorly formatted", file);
 		}
 		break;
 	}