Removed call to fpurge() and its platform-specific emulations

[nmh] / sbr / readconfig.c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 5900c375dc4154d296a9ed622ae6f57cf039b3d3..0efc9a5ec057366bd714aea70bb2a6190b366796 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -59,7 +59,8 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
     }
 
     for (state = FLD;;) {
-       switch (state = m_getfld (state, name, field, sizeof(field), ib)) {
+       int fieldsz = sizeof field;
+       switch (state = m_getfld (state, name, field, &fieldsz, ib)) {
            case FLD:
            case FLDPLUS:
            case FLDEOF:
@@ -70,7 +71,8 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
                if (state == FLDPLUS) {
                    cp = getcpy (field);
                    while (state == FLDPLUS) {
-                       state = m_getfld (state, name, field, sizeof(field), ib);
+                       fieldsz = sizeof field;
+                       state = m_getfld (state, name, field, &fieldsz, ib);
                        cp = add (field, cp);
                    }
                    np->n_field = trimcpy (cp);
@@ -106,19 +108,49 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
        break;
     }
 
+    /*
+     * 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) {
-       /* Check for duplicated profile entries.  But only on this
-          very first call from context_read(), when opp is 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.
 
+          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 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;
        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. */
-           struct node *np2;
-           for (np2 = np->n_next; np2; np2 = np2->n_next) {
-               if (!mh_strcasecmp (np->n_name, np2->n_name)) {
-                   admonish (NULL, "multiple \"%s\" profile components "
-                               "in %s, ignoring \"%s\"",
-                             np->n_name, defpath, np2->n_field);
+           if (strlen (np->n_name) > 0  &&  strcmp ("#", np->n_name)) {
+               struct node *np2;
+               for (np2 = np->n_next; np2; np2 = np2->n_next) {
+                   if (! mh_strcasecmp (np->n_name, np2->n_name)) {
+                       admonish (NULL, "multiple \"%s\" profile components "
+                                       "in %s, ignoring \"%s\"",
+                                 np->n_name, defpath, np2->n_field);
+                   }
                }
            }
        }