X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ec18722d02bd307bd09f30715dc8ba4e1b8a6716..9f1e781a5c2beb9df943c832300a3f5bee1e4ed3:/sbr/readconfig.c?ds=sidebyside diff --git a/sbr/readconfig.c b/sbr/readconfig.c index d737a2a0..5a850b04 100644 --- a/sbr/readconfig.c +++ b/sbr/readconfig.c @@ -6,8 +6,9 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "error.h" +#include "h/utils.h" struct procstr { char *procname; @@ -90,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; } @@ -122,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 @@ -155,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