X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1e0b1d40a6285c532b722f4584fa7ddde220deff..7ec0c9a0229aa160d7419922d2f4ba7e87480cd6:/uip/mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index c8343763..427b14ce 100644
--- 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
@@ -31,6 +29,9 @@
     X("noinlineonly", 0, NINLINESW) \
     X("file file", 0, FILESW) \
     X("form formfile", 0, FORMSW) \
+    X("header", 0, HEADSW) \
+    X("noheader", 0, NHEADSW) \
+    X("headerform formfile", 0, HEADFORMSW) \
     X("markform formfile", 0, MARKFORMSW) \
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
@@ -70,6 +71,10 @@ extern char *cache_private;
 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;
@@ -110,7 +115,7 @@ int
 main (int argc, char **argv)
 {
     int msgnum, *icachesw, concatsw = -1, textonly = -1, inlineonly = -1;
-    char *cp, *file = NULL, *folder = NULL, *markform = NULL;
+    char *cp, *file = NULL;
     char *maildir, buf[100], **argp;
     char **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
@@ -131,13 +136,13 @@ main (int argc, char **argv)
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, switches)) {
-	    case AMBIGSW: 
+	    case AMBIGSW:
 		ambigsw (cp, switches);
 		done (1);
-	    case UNKWNSW: 
+	    case UNKWNSW:
 		adios (NULL, "-%s unknown", cp);
 
-	    case HELPSW: 
+	    case HELPSW:
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		print_help (buf, switches, 1);
@@ -230,13 +235,24 @@ do_cache:
 	    case FORMSW:
 		if (!(cp = *argp++) || *cp == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
-		if (formsw)
-		    free (formsw);
+                mh_xfree(formsw);
 		formsw = getcpy (etcpath (cp));
 		continue;
 
+	    case HEADSW:
+		headersw = 1;
+		continue;
+	    case NHEADSW:
+		headersw = 0;
+		continue;
+
+	    case HEADFORMSW:
+		if (!(headerform = *argp++) || *headerform == '-')
+		    adios (NULL, "missing argument to %s", argp[-2]);
+		continue;
+
 	    case MARKFORMSW:
-		if (!(markform = *argp++) || *markform == '-')
+		if (!(markerform = *argp++) || *markerform == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
 		continue;
 
@@ -257,10 +273,10 @@ do_cache:
 		    adios (NULL, "missing argument to %s", argp[-2]);
 		continue;
 
-	    case VERBSW: 
+	    case VERBSW:
 		verbosw = 1;
 		continue;
-	    case NVERBSW: 
+	    case NVERBSW:
 		verbosw = 0;
 		continue;
 	    case DEBUGSW:
@@ -332,12 +348,13 @@ 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)))
 	    *ctp++ = ct;
+
+	headersw = 0;
     } else {
 	/*
 	 * message(s) are coming from a folder
@@ -376,8 +393,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;
 
 	/*
@@ -430,13 +446,13 @@ do_cache:
     /*
      * Show the message content
      */
-    show_all_messages (cts, concatsw, textonly, inlineonly, markform);
+    show_all_messages (cts, concatsw, textonly, inlineonly);
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
 	free_content (*ctp);
 
-    free ((char *) cts);
+    free(cts);
     cts = NULL;
 
     if (concatsw)