X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Freadconfig.c;h=ef43bdee7c577fd062da9bb7d7ac743193183b60;hb=8529829823bebf483ab22fe8d24c96394647a298;hp=46644ebbdb835f9da055faabaa09ce139dfceaa3;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1;p=mmh diff --git a/sbr/readconfig.c b/sbr/readconfig.c index 46644eb..ef43bde 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 #include @@ -19,6 +19,7 @@ static struct procstr procs[] = { { "context", &context }, { "mh-sequences", &mh_seq }, { "backup-prefix", &backup_prefix }, + { "draft-folder", &draftfolder }, { "altmsg-link", &altmsglink }, { "buildmimeproc", &buildmimeproc }, { "faceproc", &faceproc }, @@ -38,7 +39,6 @@ static struct procstr procs[] = { { "showmimeproc", &showmimeproc }, { "showproc", &showproc }, { "whatnowproc", &whatnowproc }, - { "whomproc", &whomproc }, { NULL, NULL } }; @@ -46,7 +46,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; @@ -55,38 +55,38 @@ 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 (strcmp(np->n_name, ps->procname) == 0) { *ps->procnaddr = np->n_field; break; } @@ -96,13 +96,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; }