Fix invalid pointer arithmetic.

[nmh] / sbr / readconfig.c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 5b72113cbaeeada81793f788d66e077b6132c91f..5b51a610ef73dfdeb210d4722ba77badfc5f247b 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -1,6 +1,4 @@
-
-/*
- * readconfig.c -- base routine to read nmh configuration files
+/* 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
@@ -46,19 +44,20 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
 {
     int state;
     char *cp;
-    char name[NAMESZ], field[BUFSIZ];
+    char name[NAMESZ], field[NMH_BUFSIZ];
     struct node *np;
     struct procstr *ps;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
 
     if (npp == NULL && (npp = opp) == NULL) {
-       admonish (NULL, "bug: readconfig called but pump not primed");
+       inform("bug: readconfig called but pump not primed, continuing...");
        return;
     }
 
+    gstate = m_getfld_state_init(ib);
     for (;;) {
        int fieldsz = sizeof field;
-       switch (state = m_getfld (&gstate, name, field, &fieldsz, ib)) {
+       switch (state = m_getfld2(&gstate, name, field, &fieldsz)) {
            case FLD:
            case FLDPLUS:
                NEW(np);
@@ -69,7 +68,7 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
                    cp = mh_xstrdup(field);
                    while (state == FLDPLUS) {
                        fieldsz = sizeof field;
-                       state = m_getfld (&gstate, name, field, &fieldsz, ib);
+                       state = m_getfld2(&gstate, name, field, &fieldsz);
                        cp = add (field, cp);
                    }
                    np->n_field = trimcpy (cp);
@@ -123,7 +122,7 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
     if (opp == NULL) {
        /* Check for duplicated non-null profile entries.  Except
           allow multiple profile entries named "#", because that's
-          what the mh-profile man page suggests using for comments.
+          what mh-profile(5) suggests using for comments.
 
           Only do this check on the very first call from
           context_read(), when opp is NULL.  That way, entries in
@@ -142,9 +141,9 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
                struct node *np2;
                for (np2 = np->n_next; np2; np2 = np2->n_next) {
                    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);
+                       inform("multiple \"%s\" profile components in %s, "
+                           "ignoring \"%s\", continuing...",
+                           np->n_name, defpath, np2->n_field);
                    }
                }
            }