Remove unused variable, and make sure we free c_dispo_type.

[nmh] / sbr / readconfig.c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 0f38fdfb2a4b01f2efc3bfc5add8ceff553735d8..06a9470b06be4110d35b60c5e389a53136aa453e 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -23,7 +23,6 @@ static struct procstr procs[] = {
     { "fileproc",      &fileproc },
     { "formatproc",    &formatproc },
     { "incproc",       &incproc },
     { "fileproc",      &fileproc },
     { "formatproc",    &formatproc },
     { "incproc",       &incproc },

-    { "installproc",   &installproc },

     { "lproc",         &lproc },
     { "mailproc",      &mailproc },
     { "mhlproc",       &mhlproc },
     { "lproc",         &lproc },
     { "mailproc",      &mailproc },
     { "mhlproc",       &mhlproc },


@@ -52,17 +51,18 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
     char name[NAMESZ], field[BUFSIZ];
     register struct node *np;
     register struct procstr *ps;
     char name[NAMESZ], field[BUFSIZ];
     register struct node *np;
     register struct procstr *ps;

+    m_getfld_state_t gstate = 0;

 
     if (npp == NULL && (npp = opp) == NULL) {
        admonish (NULL, "bug: readconfig called but pump not primed");
        return;
     }
 
 
     if (npp == NULL && (npp = opp) == NULL) {
        admonish (NULL, "bug: readconfig called but pump not primed");
        return;
     }
 

-    for (state = FLD;;) {
-       switch (state = m_getfld (state, name, field, sizeof(field), ib)) {
+    for (;;) {
+       int fieldsz = sizeof field;
+       switch (state = m_getfld (&gstate, name, field, &fieldsz, ib)) {

            case FLD:
            case FLDPLUS:
            case FLD:
            case FLDPLUS:

-           case FLDEOF:

                np = (struct node *) mh_xmalloc (sizeof(*np));
                *npp = np;
                *(npp = &np->n_next) = NULL;
                np = (struct node *) mh_xmalloc (sizeof(*np));
                *npp = np;
                *(npp = &np->n_next) = NULL;


@@ -70,7 +70,8 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
                if (state == FLDPLUS) {
                    cp = getcpy (field);
                    while (state == FLDPLUS) {
                if (state == FLDPLUS) {
                    cp = getcpy (field);
                    while (state == FLDPLUS) {

-                       state = m_getfld (state, name, field, sizeof(field), ib);
+                       fieldsz = sizeof field;
+                       state = m_getfld (&gstate, name, field, &fieldsz, ib);

                        cp = add (field, cp);
                    }
                    np->n_field = trimcpy (cp);
                        cp = add (field, cp);
                    }
                    np->n_field = trimcpy (cp);


@@ -89,12 +90,9 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
                        *ps->procnaddr = np->n_field;
                        break;
                    }
                        *ps->procnaddr = np->n_field;
                        break;
                    }

-               if (state == FLDEOF)
-                   break;

                continue;
 
            case BODY:
                continue;
 
            case BODY:

-           case BODYEOF:

                adios (NULL, "no blank lines are permitted in %s", file);
 
            case FILEEOF:
                adios (NULL, "no blank lines are permitted in %s", file);
 
            case FILEEOF:


@@ -105,23 +103,47 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
        }
        break;
     }
        }
        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) {
 
     if (opp == NULL) {

-       /* Check for duplicated non-null profile entries.  Also ignore
-           profile entries that are just "#", 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. */
+       /* 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. */
            if (strlen (np->n_name) > 0  &&  strcmp ("#", np->n_name)) {
                struct node *np2;
                for (np2 = np->n_next; np2; np2 = np2->n_next) {
        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)) {
                struct node *np2;
                for (np2 = np->n_next; np2; np2 = np2->n_next) {

-                   if (! mh_strcasecmp (np->n_name, np2->n_name)) {
-                       printf ("%d\n", strlen (np->n_name));
+                   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);
                        admonish (NULL, "multiple \"%s\" profile components "
                                        "in %s, ignoring \"%s\"",
                                  np->n_name, defpath, np2->n_field);


@@ -133,3 +155,18 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
 
     opp = npp;
 }
 
     opp = npp;
 }

+
+
+void
+add_profile_entry (const char *key, const char *value) {
+    struct node *newnode = (struct node *) mh_xmalloc (sizeof *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. */
+    newnode->n_name = getcpy (key);
+    newnode->n_field = getcpy (value);
+    newnode->n_context = 0;
+    newnode->n_next = m_defs;
+    m_defs = newnode;
+}