Removed the `mhbuild' indirection via `buildmimeproc'.

[mmh] / sbr / readconfig.c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index ef43bde..daa2509 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -16,23 +16,18 @@ struct procstr {
 };
 
 static struct procstr procs[] = {
+       { "attachment-header",  &attach_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 },
        { "sendmail",      &sendmail },
        { "sendproc",      &sendproc },
@@ -60,49 +55,53 @@ readconfig(struct node **npp, FILE *ib, char *file, int ctx)
        }
 
        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);
+               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_context = ctx;
+                               np->n_field = trimcpy(cp);
+                               free(cp);
+                       } else {
+                               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.
-                               */
-                               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;
+                               }
+                       if (state == FLDEOF)
+                               break;
+                       continue;
 
-                       case BODY:
-                       case BODYEOF:
-                               adios(NULL, "no blank lines are permitted in %s", file);
+               case BODY:
+               case BODYEOF:
+                       adios(NULL, "no blank lines are permitted in %s",
+                                       file);
 
-                       case FILEEOF:
-                               break;
+               case FILEEOF:
+                       break;
 
-                       default:
-                               adios(NULL, "%s is poorly formatted", file);
+               default:
+                       adios(NULL, "%s is poorly formatted", file);
                }
                break;
        }