lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 4d8407d1ab96299ac452f71afec466e98861113f..3fc381b8ddc5e294217a06d5ff6b255c2bb8e9c1 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -10,6 +10,7 @@
 
 #include <h/mh.h>
 #include <h/mts.h>
+#include <h/utils.h>
 
 #define MHPARAM_SWITCHES \
     X("components", 0, COMPSW) \
@@ -113,7 +114,6 @@ static struct proc procs [] = {
      { "whomproc",         &whomproc },
      { "bindir",           &mhbindir },
      { "libexecdir",       &mhlibexecdir },
-     { "libdir",           &mhlibexecdir },
      { "etcdir",           &mhetcdir },
      { "docdir",           &mhdocdir },
      { "localmbox",       &localmbox },
@@ -131,13 +131,14 @@ static struct proc procs [] = {
 /*
  * static prototypes
  */
-static char *p_find(char *);
+static char *p_find(char *) PURE;
 
 
 int
 main(int argc, char **argv)
 {
-    int i, compp = 0, missed = 0;
+    int i, compp = 0;
+    bool missed;
     int all = 0, debug = 0;
     int components = -1;
     char *cp, buf[BUFSIZ], **argp;
@@ -228,10 +229,11 @@ main(int argc, char **argv)
         * 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));
 
     }
 
+    missed = false;
     if (! all) {
         if (components < 0)
            components = compp > 1;
@@ -252,13 +254,12 @@ main(int argc, char **argv)
                    printf("%s: ", comps[i]);
 
                puts(value);
-           } else if (missed < 120)
-               missed++;
+           } else
+                missed = true;
        }
     }
 
-    done (missed);
-    return 1;
+    done(missed);
 }