X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Freadconfig.c;h=cbeb4811f7f80e69778ad804381827736eed5c9a;hp=280d25b38ec5742fd85506cb664bd77ce6cc6440;hb=d29d0d9cef0620e6a7ed0a18462d33c99ecd9da5;hpb=8edc5aaf86f9f77124664f6801bc6c6cdf258173 diff --git a/sbr/readconfig.c b/sbr/readconfig.c index 280d25b..cbeb481 100644 --- a/sbr/readconfig.c +++ b/sbr/readconfig.c @@ -7,6 +7,7 @@ ** complete copyright information. */ +#include #include #include @@ -17,12 +18,11 @@ 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 }, - { "fileproc", &fileproc }, { "listproc", &listproc }, { "sendmail", &sendmail }, { "trash-folder", &trashfolder }, @@ -36,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"); @@ -87,14 +87,14 @@ readconfig(struct node **npp, FILE *ib, char *file, int ctx) 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; }