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

[nmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index b2a4c0da5736b7153c2cc9f692b753b932031383..fea408357733dd72aa9312442f25821c53fe0554 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -1,6 +1,4 @@
-
-/*
- * mhshow.c -- display the contents of MIME messages
+/* mhshow.c -- display the contents of MIME messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -13,10 +11,16 @@
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
+#include <h/fmt_scan.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "mhmisc.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_popen.h"
+#include "mhfree.h"
+#include "mhshowsbr.h"
 
 #define MHSHOW_SWITCHES \
     X("check", 0, CHECKSW) \
@@ -38,6 +42,7 @@
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
     X("prefer content", 0, PREFERSW) \
+    X("noprefer", 0, NPREFERSW) \
     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("version", 0, VERSIONSW) \
@@ -63,50 +68,11 @@ DEFINE_SWITCH_ARRAY(MHSHOW, switches);
 #undef X
 
 
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
-/* mhshowsbr.c */
-extern char *progsw;
-extern int nomore;     /* flags for moreproc/header display */
-extern char *formsw;
-extern char *folder;
-extern char *headerform;
-extern char *markerform;
-extern int headersw;
-
-/* mhmisc.c */
-extern int npart;
-extern int ntype;
-extern char *parts[NPARTS + 1];
-extern char *types[NTYPES + 1];
-extern int userrs;
-
-/* mhparse.c */
-extern char *preferred_types[];
-extern  char *preferred_subtypes[];
-extern int npreferred;
-
 int debugsw = 0;
 int verbosw = 0;
 
 #define        quitser pipeser
 
-/* mhparse.c */
-CT parse_mime (char *);
-
-/* mhmisc.c */
-int part_ok (CT);
-int type_ok (CT, int);
-void flush_errors (void);
-
-/* mhfree.c */
-extern CT *cts;
-void freects_done (int) NORETURN;
-
 /*
  * static prototypes
  */
@@ -161,9 +127,9 @@ main (int argc, char **argv)
 do_cache:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
-               switch (*icachesw = smatch (cp, caches)) {
+               switch (*icachesw = smatch (cp, cache_policy)) {
                case AMBIGSW:
-                   ambigsw (cp, caches);
+                   ambigsw (cp, cache_policy);
                    done (1);
                case UNKWNSW:
                    adios (NULL, "%s unknown", cp);
@@ -222,10 +188,14 @@ do_cache:
                if (npreferred >= NPREFS)
                    adios (NULL, "too many preferred types (starting with %s), %d max",
                           cp, NPREFS);
-               preferred_types[npreferred] = cp;
+               mime_preference[npreferred].type = cp;
                cp = strchr(cp, '/');
                if (cp) *cp++ = '\0';
-               preferred_subtypes[npreferred++] = cp;
+               mime_preference[npreferred++].subtype = cp;
+               continue;
+
+           case NPREFERSW:
+               npreferred = 0;
                continue;
 
            case FILESW:
@@ -237,8 +207,7 @@ do_cache:
            case FORMSW:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
-               if (formsw)
-                   free (formsw);
+                free(formsw);
                formsw = getcpy (etcpath (cp));
                continue;
 
@@ -290,8 +259,7 @@ do_cache:
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }
@@ -317,7 +285,7 @@ do_cache:
      */
     if ((cp = getenv ("MHSHOW"))) {
        if ((fp = fopen (cp, "r"))) {
-           readconfig ((struct node **) 0, fp, cp, 0);
+           readconfig(NULL, fp, cp, 0);
            fclose (fp);
        } else {
            admonish ("", "unable to read $MHSHOW profile (%s)", cp);
@@ -328,7 +296,7 @@ do_cache:
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
-       readconfig ((struct node **) 0, fp, cp, 0);
+       readconfig(NULL, fp, cp, 0);
        fclose (fp);
     }
 
@@ -351,8 +319,7 @@ do_cache:
      * check if message is coming from file
      */
     if (file) {
-       if (!(cts = (CT *) mh_xcalloc ((size_t) 2, sizeof(*cts))))
-           adios (NULL, "out of memory");
+       cts = mh_xcalloc(2, sizeof *cts);
        ctp = cts;
 
        if ((ct = parse_mime (file)))
@@ -397,8 +364,7 @@ do_cache:
        seq_setprev (mp);       /* set the Previous-Sequence */
        seq_setunseen (mp, 1);  /* unset the Unseen-Sequence */
 
-       if (!(cts = (CT *) mh_xcalloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
-           adios (NULL, "out of memory");
+       cts = mh_xcalloc(mp->numsel + 1, sizeof *cts);
        ctp = cts;
 
        /*
@@ -457,7 +423,7 @@ do_cache:
     for (ctp = cts; *ctp; ctp++)
        free_content (*ctp);
 
-    free ((char *) cts);
+    free(cts);
     cts = NULL;
 
     if (concatsw)