X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Freadconfig.c;h=ec97e1e2f0e864f94358d867046be50db1fc57e8;hp=b78eb06e880f1e0321b6ee94311b9a6d0a2f5233;hb=d4c34b4439a9dbd89664de460ed37ecddc260fb1;hpb=8ff284ff9167eff8f5349481529332d59ed913b1

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index b78eb06..ec97e1e 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>
 
@@ -17,24 +18,14 @@ 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 }
 };
@@ -45,11 +36,11 @@ static struct node **opp = NULL;
 void
 readconfig(struct node **npp, FILE *ib, char *file, int ctx)
 {
-	register int state;
-	register char *cp;
+	int state;
+	char *cp;
 	char name[NAMESZ], field[BUFSIZ];
-	register struct node *np;
-	register struct procstr *ps;
+	struct node *np;
+	struct procstr *ps;
 
 	if (npp == NULL && (npp = opp) == NULL) {
 		admonish(NULL, "bug: readconfig called but pump not primed");
@@ -61,8 +52,7 @@ readconfig(struct node **npp, FILE *ib, char *file, int ctx)
 				ib)) {
 		case FLD:
 		case FLDPLUS:
-		case FLDEOF:
-			np = (struct node *) mh_xmalloc(sizeof(*np));
+			np = mh_xcalloc(1, sizeof(*np));
 			*npp = np;
 			*(npp = &np->n_next) = NULL;
 			np->n_name = getcpy(name);
@@ -74,7 +64,7 @@ readconfig(struct node **npp, FILE *ib, char *file, int ctx)
 					cp = add(field, cp);
 				}
 				np->n_field = trimcpy(cp);
-				free(cp);
+				mh_free0(&cp);
 			} else {
 				np->n_field = trimcpy(field);
 			}
@@ -90,20 +80,17 @@ readconfig(struct node **npp, FILE *ib, char *file, int ctx)
 					*ps->procnaddr = np->n_field;
 					break;
 				}
-			if (state == FLDEOF)
-				break;
 			continue;
 
 		case BODY:
-		case BODYEOF:
-			adios(NULL, "no blank lines are permitted in %s",
+			adios(EX_CONFIG, NULL, "no blank lines are permitted in %s",
 					file);
 
 		case FILEEOF:
 			break;
 
 		default:
-			adios(NULL, "%s is poorly formatted", file);
+			adios(EX_CONFIG, NULL, "%s is poorly formatted", file);
 		}
 		break;
 	}