mhshowsbr.c: Delete single-use global int `nolist'.

[nmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 9b5fa069634f873b28614f6dd71ec1e2a9c9a9ad..65082a0bd353c57ca11978fb757df6970a133b0b 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -1,6 +1,4 @@
-
-/*
- * mhparam.c -- print mh_profile values
+/* mhparam.c -- print mh_profile values

  *
  * Originally contributed by
  * Jeffrey C Honig <Jeffrey_C_Honig@cornell.edu>
  *
  * Originally contributed by
  * Jeffrey C Honig <Jeffrey_C_Honig@cornell.edu>


@@ -10,8 +8,17 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/mts.h>
+#include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/smatch.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/mts.h"
+#include "h/done.h"
+#include "h/utils.h"

 
 #define MHPARAM_SWITCHES \
     X("components", 0, COMPSW) \
 
 #define MHPARAM_SWITCHES \
     X("components", 0, COMPSW) \


@@ -38,7 +45,7 @@ static char *sbackup = BACKUP_PREFIX;
 
 static char *datalocking = "fcntl";
 static char *localmbox = "";
 
 static char *datalocking = "fcntl";
 static char *localmbox = "";

-static int localmbox_primed = 0;
+static bool localmbox_primed;

 
 extern char *spoollocking;
 
 
 extern char *spoollocking;
 


@@ -115,7 +122,6 @@ static struct proc procs [] = {
      { "whomproc",         &whomproc },
      { "bindir",           &mhbindir },
      { "libexecdir",       &mhlibexecdir },
      { "whomproc",         &whomproc },
      { "bindir",           &mhbindir },
      { "libexecdir",       &mhlibexecdir },

-     { "libdir",           &mhlibexecdir },

      { "etcdir",           &mhetcdir },
      { "docdir",           &mhdocdir },
      { "localmbox",       &localmbox },
      { "etcdir",           &mhetcdir },
      { "docdir",           &mhdocdir },
      { "localmbox",       &localmbox },


@@ -133,19 +139,21 @@ static struct proc procs [] = {
 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

-static char *p_find(char *);
+static char *p_find(char *) PURE;

 
 
 int
 main(int argc, char **argv)
 {
 
 
 int
 main(int argc, char **argv)
 {

-    int i, compp = 0, missed = 0;
-    int all = 0, debug = 0;
+    int i, compp = 0;
+    bool missed;
+    bool all = false;
+    bool debug = false;

     int components = -1;
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
 
     int components = -1;
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
 

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -157,7 +165,7 @@ main(int argc, char **argv)
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 

-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);

 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [profile-components] [switches]",
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [profile-components] [switches]",


@@ -176,18 +184,18 @@ main(int argc, char **argv)
                    break;
 
                case ALLSW:
                    break;
 
                case ALLSW:

-                   all = 1;
+                   all = true;

                    break;
 
                case DEBUGSW:
                    break;
 
                case DEBUGSW:

-                   debug = 1;
+                   debug = true;

                    break;
            }
        } else {
            comps[compp++] = cp;
            if (strcmp("localmbox", cp) == 0 && ! localmbox_primed) {
                localmbox = getlocalmbox();
                    break;
            }
        } else {
            comps[compp++] = cp;
            if (strcmp("localmbox", cp) == 0 && ! localmbox_primed) {
                localmbox = getlocalmbox();

-               localmbox_primed = 1;
+               localmbox_primed = true;

            }
        }
     }
            }
        }
     }


@@ -196,10 +204,10 @@ main(int argc, char **argv)
         struct node *np;
 
        if (compp)
         struct node *np;
 
        if (compp)

-           advise(NULL, "profile-components ignored with -all");
+           inform("profile-components ignored with -all");

 
        if (components >= 0)
 
        if (components >= 0)

-           advise(NULL, "-%scomponents ignored with -all",
+           inform("-%scomponents ignored with -all",

                   components ? "" : "no");
 
        /* Print all entries in context/profile list.  That does not
                   components ? "" : "no");
 
        /* Print all entries in context/profile list.  That does not


@@ -207,19 +215,21 @@ main(int argc, char **argv)
        for (np = m_defs; np; np = np->n_next)
            printf("%s: %s\n", np->n_name, np->n_field);
 
        for (np = m_defs; np; np = np->n_next)
            printf("%s: %s\n", np->n_name, np->n_field);
 

-    } else if (debug) {
+    }
+
+    if (debug) {

        struct proc *ps;
 
        /* In case datalocking was set in profile. */
        if ((cp = context_find("datalocking"))) { datalocking = cp; }
 
        /* In case spoollocking was set in mts.conf. */
        struct proc *ps;
 
        /* In case datalocking was set in profile. */
        if ((cp = context_find("datalocking"))) { datalocking = cp; }
 
        /* In case spoollocking was set in mts.conf. */

-       mts_init(invo_name);
+       mts_init();

 
        /* Also set localmbox here */
        if (! localmbox_primed) {
            localmbox = getlocalmbox();
 
        /* Also set localmbox here */
        if (! localmbox_primed) {
            localmbox = getlocalmbox();

-           localmbox_primed = 1;
+           localmbox_primed = true;

        }
 
        /*
        }
 
        /*


@@ -228,18 +238,21 @@ main(int argc, char **argv)
         * value (as determined after context is read).
          */
        for (ps = procs; ps->p_name; ps++)
         * value (as determined after context is read).
          */
        for (ps = procs; ps->p_name; ps++)

-           printf ("%s: %s\n", ps->p_name, *ps->p_field ? *ps->p_field : "");
+           printf ("%s: %s\n", ps->p_name, FENDNULL(*ps->p_field));
+
+    }

 
 

-    } else {
+    missed = false;
+    if (! all) {

         if (components < 0)
            components = compp > 1;
 
        for (i = 0; i < compp; i++)  {
         if (components < 0)
            components = compp > 1;
 
        for (i = 0; i < compp; i++)  {

-           register char *value;
+           char *value;

 
            if (! strcmp ("spoollocking", comps[i])) {
                /* In case spoollocking was set in mts.conf. */
 
            if (! strcmp ("spoollocking", comps[i])) {
                /* In case spoollocking was set in mts.conf. */

-               mts_init(invo_name);
+               mts_init();

             }
 
            value = context_find (comps[i]);
             }
 
            value = context_find (comps[i]);


@@ -249,14 +262,13 @@ main(int argc, char **argv)
                if (components)
                    printf("%s: ", comps[i]);
 
                if (components)
                    printf("%s: ", comps[i]);
 

-               printf("%s\n", value);
+               puts(value);

            } else
            } else

-               missed++;
+                missed = true;

        }
     }
 
        }
     }
 

-    done (missed);
-    return 1;
+    done(missed);

 }
 
 
 }
 
 


@@ -266,8 +278,8 @@ p_find(char *str)
     struct proc *ps;
 
     for (ps = procs; ps->p_name; ps++)
     struct proc *ps;
 
     for (ps = procs; ps->p_name; ps++)

-       if (!strcasecmp (ps->p_name, str ? str : ""))
-           return (*ps->p_field);
+       if (!strcasecmp (ps->p_name, str))
+           return *ps->p_field;

 
     return NULL;
 }
 
     return NULL;
 }