X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d7e260c9a302e465a2c40e75ff8bd506768a7dbf..b0aa8cdb1c264e42d4931ca24968689c73381278:/uip/mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 9fb18e7b..ce2dcaa2 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -25,10 +25,19 @@
     X("noverbose", 0, NVERBSW) \
     X("concat", 0, CONCATSW) \
     X("noconcat", 0, NCONCATSW) \
+    X("textonly", 0, TEXTONLYSW) \
+    X("notextonly", 0, NTEXTONLYSW) \
+    X("inlineonly", 0, INLINESW) \
+    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) \
+    X("prefer content", 0, PREFERSW) \
     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("version", 0, VERSIONSW) \
@@ -64,6 +73,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;
@@ -72,6 +85,11 @@ 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;
 
@@ -81,7 +99,7 @@ int verbosw = 0;
 CT parse_mime (char *);
 
 /* mhmisc.c */
-int part_ok (CT, int);
+int part_ok (CT);
 int type_ok (CT, int);
 void flush_errors (void);
 
@@ -98,8 +116,8 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
-    int msgnum, *icachesw, concatsw = 1, textonly = 1, inlineonly = 1;
-    char *cp, *file = NULL, *folder = NULL;
+    int msgnum, *icachesw, concatsw = -1, textonly = -1, inlineonly = -1;
+    char *cp, *file = NULL;
     char *maildir, buf[100], **argp;
     char **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
@@ -120,13 +138,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);
@@ -167,6 +185,18 @@ do_cache:
 	    case NCONCATSW:
 		concatsw = 0;
 		continue;
+	    case TEXTONLYSW:
+		textonly = 1;
+		continue;
+	    case NTEXTONLYSW:
+		textonly = 0;
+		continue;
+	    case INLINESW:
+		inlineonly = 1;
+		continue;
+	    case NINLINESW:
+		inlineonly = 0;
+		continue;
 
 	    case PARTSW:
 		if (!(cp = *argp++) || *cp == '-')
@@ -186,6 +216,18 @@ do_cache:
 		types[ntype++] = cp;
 		continue;
 
+	    case PREFERSW:
+		if (!(cp = *argp++) || *cp == '-')
+		    adios (NULL, "missing argument to %s", argp[-2]);
+		if (npreferred >= NPREFS)
+		    adios (NULL, "too many preferred types (starting with %s), %d max",
+			   cp, NPREFS);
+		preferred_types[npreferred] = cp;
+		cp = strchr(cp, '/');
+		if (cp) *cp++ = '\0';
+		preferred_subtypes[npreferred++] = cp;
+		continue;
+
 	    case FILESW:
 		if (!(cp = *argp++) || (*cp == '-' && cp[1]))
 		    adios (NULL, "missing argument to %s", argp[-2]);
@@ -195,11 +237,27 @@ 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 (!(markerform = *argp++) || *markerform == '-')
+		    adios (NULL, "missing argument to %s", argp[-2]);
+		continue;
+
 	    /*
 	     * Switches for moreproc/mhlproc
 	     */
@@ -217,10 +275,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:
@@ -247,8 +305,10 @@ do_cache:
      */
 
     if (npart > 0 || ntype > 0) {
-	textonly = 0;
-	inlineonly = 0;
+	if (textonly == -1)
+	    textonly = 0;
+	if (inlineonly == -1)
+	    inlineonly = 0;
     }
 
     /*
@@ -290,12 +350,13 @@ do_cache:
      * check if message is coming from file
      */
     if (file) {
-	if (!(cts = (CT *) calloc ((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
@@ -334,8 +395,7 @@ do_cache:
 	seq_setprev (mp);	/* set the Previous-Sequence */
 	seq_setunseen (mp, 1);	/* unset the Unseen-Sequence */
 
-	if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
-	    adios (NULL, "out of memory");
+	cts = mh_xcalloc(mp->numsel + 1, sizeof *cts);
 	ctp = cts;
 
 	/*
@@ -382,22 +442,22 @@ do_cache:
 	context_save ();		  /* save the context file  */
     }
 
-    if (concat)
+    if (concatsw)
 	m_popen(moreproc, 0);
 
     /*
      * Show the message content
      */
-    show_all_messages (cts, concatsw, textonly, inlineonly, NULL);
+    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 (concat)
+    if (concatsw)
 	m_pclose();
 
     done (0);