X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c6f2d14d9c38345075629af3487c2de491584ca1..9f1e781a5c2beb9df943c832300a3f5bee1e4ed3:/sbr/readconfig.c?ds=sidebyside

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 1fe9d036..5a850b04 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
@@ -8,8 +6,9 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "error.h"
+#include "h/utils.h"
 
 struct procstr {
     char *procname;
@@ -46,30 +45,31 @@ 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);
 		*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);
@@ -91,13 +91,13 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
 		continue;
 
 	    case BODY:
-		adios (NULL, "no blank lines are permitted in %s", file);
+		die("no blank lines are permitted in %s", file);
 
 	    case FILEEOF:
 		break;
 
 	    default:
-		adios (NULL, "%s is poorly formatted", file);
+		die("%s is poorly formatted", file);
 	}
 	break;
     }
@@ -123,7 +123,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 +142,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);
 		    }
 		}
 	    }
@@ -156,7 +156,8 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
 
 
 void
-add_profile_entry (const char *key, const char *value) {
+add_profile_entry (const char *key, const char *value)
+{
     struct node *newnode;
 
     /* This inserts the new node at the beginning of m_defs because