Allow -clobber with mhstore -outfile.

[nmh] / sbr / readconfig.c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index b8b1b35753188290e715aad049ce47d033116f0a..866747a2ab6ce1bb50e424547076ef638eaf5294 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -23,7 +23,6 @@ static struct procstr procs[] = {
     { "fileproc",      &fileproc },
     { "formatproc",    &formatproc },
     { "incproc",       &incproc },
-    { "installproc",   &installproc },
     { "lproc",         &lproc },
     { "mailproc",      &mailproc },
     { "mhlproc",       &mhlproc },
@@ -52,15 +51,16 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
     char name[NAMESZ], field[BUFSIZ];
     register struct node *np;
     register struct procstr *ps;
+    m_getfld_state_t gstate = 0;
 
     if (npp == NULL && (npp = opp) == NULL) {
        admonish (NULL, "bug: readconfig called but pump not primed");
        return;
     }
 
-    for (state = FLD;;) {
+    for (;;) {
        int fieldsz = sizeof field;
-       switch (state = m_getfld (state, name, field, &fieldsz, ib)) {
+       switch (state = m_getfld (&gstate, name, field, &fieldsz, ib)) {
            case FLD:
            case FLDPLUS:
                np = (struct node *) mh_xmalloc (sizeof(*np));
@@ -71,7 +71,7 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
                    cp = getcpy (field);
                    while (state == FLDPLUS) {
                        fieldsz = sizeof field;
-                       state = m_getfld (state, name, field, &fieldsz, ib);
+                       state = m_getfld (&gstate, name, field, &fieldsz, ib);
                        cp = add (field, cp);
                    }
                    np->n_field = trimcpy (cp);
@@ -103,6 +103,7 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
        }
        break;
     }
+    m_getfld_state_destroy (&gstate);
 
     /*
      * Special handling for the pager processes: lproc and moreproc.
@@ -142,7 +143,7 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
            if (strlen (np->n_name) > 0  &&  strcmp ("#", np->n_name)) {
                struct node *np2;
                for (np2 = np->n_next; np2; np2 = np2->n_next) {
-                   if (! mh_strcasecmp (np->n_name, np2->n_name)) {
+                   if (! strcasecmp (np->n_name, np2->n_name)) {
                        admonish (NULL, "multiple \"%s\" profile components "
                                        "in %s, ignoring \"%s\"",
                                  np->n_name, defpath, np2->n_field);