** complete copyright information.
*/
+#include <sysexits.h>
#include <h/mh.h>
#include <h/utils.h>
};
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 },
- { "faceproc", &faceproc },
- { "fileproc", &fileproc },
- { "incproc", &incproc },
- { "installproc", &installproc },
- { "lproc", &lproc },
- { "mailproc", &mailproc },
- { "mhlproc", &mhlproc },
- { "moreproc", &moreproc },
- { "packproc", &packproc },
- { "postproc", &postproc },
- { "rmfproc", &rmfproc },
- { "rmmproc", &rmmproc },
+ { "listproc", &listproc },
{ "sendmail", &sendmail },
- { "sendproc", &sendproc },
- { "showmimeproc", &showmimeproc },
- { "showproc", &showproc },
+ { "trash-folder", &trashfolder },
{ "whatnowproc", &whatnowproc },
{ NULL, 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;
- char name[NAMESZ], field[BUFSIZ];
- register struct node *np;
- register struct procstr *ps;
+ enum state state;
+ struct field f = {{0}};
+ struct node *np;
+ 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)) {
- 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 LENERR2:
+ state = FLD2;
+ /* FALL */
+ case FLD2:
+ np = mh_xcalloc(1, sizeof(*np));
+ *npp = np;
+ *(npp = &np->n_next) = NULL;
+ np->n_name = mh_xstrdup(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 (strcmp (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 FMTERR2:
+ advise(NULL, "%s is poorly formatted", file);
+ state = FLD2;
+ continue;
+ case BODY2:
+ adios(EX_CONFIG, NULL, "no blank lines are permitted in %s",
+ file);
- case BODY:
- case BODYEOF:
- adios (NULL, "no blank lines are permitted in %s", file);
+ case FILEEOF2:
+ break;
- case FILEEOF:
- break;
+ case IOERR2:
+ adios(EX_IOERR, NULL, "m_getfld2", "some error happened");
+ break;
- default:
- adios (NULL, "%s is poorly formatted", file);
+ default:
+ adios(EX_CONFIG, NULL, "%s is poorly formatted", file);
}
break;
}