X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/703b7d98727c1f7e1e76434a04a3125d76d7d168..23816efd3e8e294e8f1c1ce811ac3a1cd15d334e:/sbr/readconfig.c diff --git a/sbr/readconfig.c b/sbr/readconfig.c index 56749266..3efd4f72 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,16 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "sbr/context_find.h" +#include "m_getfld.h" +#include "trimcpy.h" +#include "getcpy.h" +#include "readconfig.h" +#include "error.h" +#include "h/utils.h" + +static void checkconfig(); struct procstr { char *procname; @@ -20,23 +26,19 @@ static struct procstr procs[] = { { "context", &context }, { "mh-sequences", &mh_seq }, { "buildmimeproc", &buildmimeproc }, - { "faceproc", &faceproc }, { "fileproc", &fileproc }, { "formatproc", &formatproc }, { "incproc", &incproc }, - { "installproc", &installproc }, { "lproc", &lproc }, { "mailproc", &mailproc }, { "mhlproc", &mhlproc }, { "moreproc", &moreproc }, - { "mshproc", &mshproc }, { "packproc", &packproc }, { "postproc", &postproc }, { "rmmproc", &rmmproc }, { "sendproc", &sendproc }, { "showmimeproc", &showmimeproc }, { "showproc", &showproc }, - { "vmhproc", &vmhproc }, { "whatnowproc", &whatnowproc }, { "whomproc", &whomproc }, { NULL, NULL } @@ -46,32 +48,35 @@ static struct node **opp = NULL; void -readconfig (struct node **npp, FILE *ib, char *file, int ctx) +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; + 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; } - for (state = FLD;;) { - switch (state = m_getfld (state, name, field, sizeof(field), ib)) { + gstate = m_getfld_state_init(ib); + for (;;) { + int fieldsz = sizeof field; + switch (state = m_getfld2(&gstate, name, field, &fieldsz)) { case FLD: case FLDPLUS: - case FLDEOF: - 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) { - state = m_getfld (state, name, field, sizeof(field), ib); + fieldsz = sizeof field; + state = m_getfld2(&gstate, name, field, &fieldsz); cp = add (field, cp); } np->n_field = trimcpy (cp); @@ -90,22 +95,113 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx) *ps->procnaddr = np->n_field; break; } - if (state == FLDEOF) - break; continue; case BODY: - case BODYEOF: - 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; } + m_getfld_state_destroy (&gstate); + + /* + * Special handling for the pager processes: lproc and moreproc. + * + * If they are not set by the profile, use the callers $PAGER if + * available, otherwise set them to DEFAULT_PAGER. + */ + if (lproc == NULL) { + lproc = getenv("PAGER"); + if (lproc == NULL || lproc[0] == '\0') + lproc = DEFAULT_PAGER; + } + if (moreproc == NULL) { + moreproc = getenv("PAGER"); + if (moreproc == NULL || moreproc[0] == '\0') + moreproc = DEFAULT_PAGER; + } + + if (opp == NULL) { + checkconfig(); + } opp = npp; } + + +void +add_profile_entry (const char *key, const char *value) +{ + 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; + newnode->n_next = m_defs; + m_defs = newnode; +} + + +/* Check profile for issues to warn about. */ +void +checkconfig() { + /* Check for duplicated non-null profile entries. Except + allow multiple profile entries named "#", because that's + 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 + mhn.defaults can be overridden without triggering + warnings. + + Note that mhn.defaults, $MHN, $MHBUILD, $MHSHOW, and + $MHSTORE all put their entries into just one list, m_defs, + the same list that the profile uses. */ + struct node *np; + bool has_post = false; + bool post_warning_disabled = false; + for (np = m_defs; np; np = np->n_next) { + if (*np->n_name) { + if (isatty(fileno(stderr))) { + /* Check for post component in profile. */ + if (strcasecmp(np->n_name, "post") == 0) { + has_post = true; + } else if (strcasecmp(np->n_name, "postproc") == 0 && + np->n_field != NULL) { + post_warning_disabled = true; + } + } + + if (strcmp("#", np->n_name)) { + /* Yes, this is O(N^2). The profile should be small enough so + that's not a performance problem. */ + struct node *np2; + for (np2 = np->n_next; np2; np2 = np2->n_next) { + if (! strcasecmp (np->n_name, np2->n_name)) { + inform("multiple \"%s\" profile components in %s, " + "ignoring \"%s\", continuing...", + np->n_name, defpath, np2->n_field); + } + } + } + } + } + + if (has_post && ! post_warning_disabled) { + inform("post profile component will be ignored. To suppress " + "this warning,\n" + "either remove it, comment it with #:, or " + "add the following to %s:\npostproc: %s\n", + defpath, postproc); + } +}