Removed ``Face'' support in mhl.

[mmh] / sbr / readconfig.c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index cc8be82..7212303 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -22,17 +22,13 @@ static struct procstr procs[] = {
        { "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 },
@@ -46,7 +42,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 +51,39 @@ 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 (mh_strcasecmp(np->n_name,
+                                                       ps->procname) == 0) {
                                                *ps->procnaddr = np->n_field;
                                                break;
                                        }
@@ -96,13 +93,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;
        }