X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e04b8ea0e57e411665aa6a8814ff65db0d4cd2b..2b60a54adb3b0bf5a9b927708085492b816a6015:/sbr/readconfig.c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 5d116893..d737a2a0 100644
--- 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
@@ -44,32 +42,33 @@ static struct node **opp = NULL;
 void
 readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
 {
-    register int state;
-    register char *cp;
-    char name[NAMESZ], field[BUFSIZ];
-    register struct node *np;
-    register struct procstr *ps;
-    m_getfld_state_t gstate = 0;
+    int state;
+    char *cp;
+    char name[NAMESZ], field[NMH_BUFSIZ];
+    struct node *np;
+    struct procstr *ps;
+    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:
-		np = (struct node *) mh_xmalloc (sizeof(*np));
+		NEW(np);
 		*npp = np;
 		*(npp = &np->n_next) = NULL;
-		np->n_name = getcpy (name);
+		np->n_name = mh_xstrdup(name);
 		if (state == FLDPLUS) {
-		    cp = getcpy (field);
+		    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);
@@ -138,13 +137,13 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
 	for (np = m_defs; np; np = np->n_next) {
 	    /* Yes, this is O(N^2).  The profile should be small enough so
 	       that's not a performance problem. */
-	    if (strlen (np->n_name) > 0	 &&  strcmp ("#", np->n_name)) {
+	    if (*np->n_name && strcmp("#", np->n_name)) {
 		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);
 		    }
 		}
 	    }
@@ -157,11 +156,12 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
 
 void
 add_profile_entry (const char *key, const char *value) {
-    struct node *newnode = (struct node *) mh_xmalloc (sizeof *newnode);
+    struct node *newnode;
 
     /* This inserts the new node at the beginning of m_defs because
        that doesn't require traversing it or checking to see if it's
        empty. */
+    NEW(newnode);
     newnode->n_name = getcpy (key);
     newnode->n_field = getcpy (value);
     newnode->n_context = 0;