X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c90aa732c2bc68f62d9ff0eb43c23d1686b56b48..58eaf2c2:/uip/mhshowsbr.c?ds=sidebyside

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 85c4c044..d99f5827 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -39,31 +39,26 @@ int type_ok (CT, int);
 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
 
-/*
- * prototypes
- */
-int show_content_aux (CT, int, char *, char *);
-
 /*
  * static prototypes
  */
 static void show_single_message (CT, char *, int, int, int, struct format *);
 static void DisplayMsgHeader (CT, char *, int);
 static int show_switch (CT, int, int, int, int, struct format *);
-static int show_content (CT, int, int, int, struct format *fmt);
-static int show_content_aux2 (CT, int, char *, char *, int, int, int);
-static int show_text (CT, int, int);
+static int show_content (CT, int, int, int, struct format *);
+static int show_content_aux2 (CT, int, char *, char *, int, int, int, struct format *);
+static int show_text (CT, int, int, struct format *);
 static int show_multi (CT, int, int, int, int, struct format *);
-static int show_multi_internal (CT, int, int, int, int, struct format *fmt);
-static int show_multi_aux (CT, int, char *);
-static int show_message_rfc822 (CT, int);
+static int show_multi_internal (CT, int, int, int, int, struct format *);
+static int show_multi_aux (CT, int, char *, struct format *);
+static int show_message_rfc822 (CT, int, struct format *);
 static int show_partial (CT, int);
 static int show_external (CT, int, int, int, int, struct format *);
 static int parse_display_string (CT, char *, int *, int *, char *, char *,
 				 size_t, int multipart);
 static int convert_content_charset (CT, char **);
 static struct format *compile_marker(char *);
-static void output_marker (CT, struct format *);
+static void output_marker (CT, struct format *, int);
 static void free_markercomps (void);
 static int pidcheck(int);
 
@@ -263,21 +258,26 @@ show_switch (CT ct, int alternate, int concatsw, int textonly, int inlineonly,
 					  inlineonly, fmt);
 
 		case MESSAGE_RFC822:
+		    return show_message_rfc822 (ct, alternate, fmt);
+
+		/*
+		 * Treat unknown message types as equivalent to
+		 * application/octet-stream for now
+		 */
 		default:
-		    return show_message_rfc822 (ct, alternate);
+		    return show_content (ct, alternate, textonly,
+		    			 inlineonly, fmt);
 	    }
 
 	case CT_TEXT:
-	    return show_text (ct, alternate, concatsw);
+	    return show_text (ct, alternate, concatsw, fmt);
 
 	case CT_AUDIO:
 	case CT_IMAGE:
 	case CT_VIDEO:
 	case CT_APPLICATION:
-	    return show_content (ct, alternate, textonly, inlineonly, fmt);
-
 	default:
-	    adios (NULL, "unknown content type %d", ct->c_type);
+	    return show_content (ct, alternate, textonly, inlineonly, fmt);
     }
 
     return 0;	/* NOT REACHED */
@@ -292,7 +292,7 @@ static int
 show_content (CT ct, int alternate, int textonly, int inlineonly,
 	      struct format *fmt)
 {
-    char *cp, buffer[BUFSIZ];
+    char *cp;
     CI ci = &ct->c_ctinfo;
 
     /*
@@ -301,23 +301,16 @@ show_content (CT ct, int alternate, int textonly, int inlineonly,
      */
 
     if (textonly || (inlineonly && !is_inline(ct))) {
-	output_marker(ct, fmt);
+	output_marker(ct, fmt, 1);
 	return OK;
     }
 
-    /* Check for invo_name-show-type/subtype */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s/%s",
-		invo_name, ci->ci_type, ci->ci_subtype);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-	return show_content_aux (ct, alternate, cp, NULL);
-
-    /* Check for invo_name-show-type */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-	return show_content_aux (ct, alternate, cp, NULL);
+    /* Check for invo_name-show-type[/subtype] */
+    if ((cp = context_find_by_type ("show", ci->ci_type, ci->ci_subtype)))
+	return show_content_aux (ct, alternate, cp, NULL, fmt);
 
     if ((cp = ct->c_showproc))
-	return show_content_aux (ct, alternate, cp, NULL);
+	return show_content_aux (ct, alternate, cp, NULL, fmt);
 
     /* complain if we are not a part of a multipart/alternative */
     if (!alternate)
@@ -332,7 +325,7 @@ show_content (CT ct, int alternate, int textonly, int inlineonly,
  */
 
 int
-show_content_aux (CT ct, int alternate, char *cp, char *cracked)
+show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format *fmt)
 {
     int fd;
     int xstdin = 0, xlist = 0;
@@ -382,7 +375,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked)
 
 got_command:
     return show_content_aux2 (ct, alternate, cracked, buffer,
-			      fd, xlist, xstdin);
+			      fd, xlist, xstdin, fmt);
 }
 
 
@@ -392,7 +385,7 @@ got_command:
 
 static int
 show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
-                   int fd, int xlist, int xstdin)
+                   int fd, int xlist, int xstdin, struct format *fmt)
 {
     pid_t child_id;
     int i, vecp;
@@ -411,11 +404,8 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
 	    fprintf (stderr, " using command %s\n", buffer);
     }
 
-    if (xlist) {
-	if (ct->c_type == CT_MULTIPART)
-	    list_content (ct, -1, 1, 0, 0, 0);
-	else
-	    list_switch (ct, -1, 1, 0, 0, 0);
+    if (xlist && fmt) {
+	output_marker(ct, fmt, 0);
     }
 
     /*
@@ -426,6 +416,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
     if (buffer[0] == '\0') {
 	char readbuf[BUFSIZ];
 	ssize_t cc;
+	char lastchar = '\n';
 
 	if (fd == NOTOK) {
 	    advise(NULL, "Cannot use NULL command to display content-type "
@@ -435,6 +426,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
 
 	while ((cc = read(fd, readbuf, sizeof(readbuf))) > 0) {
 	    fwrite(readbuf, sizeof(char), cc, stdout);
+	    lastchar = readbuf[cc - 1];
 	}
 
 	if (cc < 0) {
@@ -442,6 +434,20 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
 	    return NOTOK;
 	}
 
+	/*
+	 * The MIME standards allow content to not have a trailing newline.
+	 * But because we are (presumably) sending this to stdout, include
+	 * a newline for text content if the final character was not a
+	 * newline.  Only do this for mhshow.
+	 */
+
+	if (strcmp(invo_name, "mhshow") == 0 && ct->c_type == CT_TEXT &&
+	    ct->c_subtype == TEXT_PLAIN && lastchar != '\n') {
+	    putc('\n', stdout);
+	}
+
+	fflush(stdout);
+
 	return OK;
     }
 
@@ -487,34 +493,30 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
  */
 
 static int
-show_text (CT ct, int alternate, int concatsw)
+show_text (CT ct, int alternate, int concatsw, struct format *fmt)
 {
     char *cp, buffer[BUFSIZ];
     CI ci = &ct->c_ctinfo;
 
-    /* Check for invo_name-show-type/subtype */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s/%s",
-		invo_name, ci->ci_type, ci->ci_subtype);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-	return show_content_aux (ct, alternate, cp, NULL);
-
-    /* Check for invo_name-show-type */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-	return show_content_aux (ct, alternate, cp, NULL);
+    /* Check for invo_name-show-type[/subtype] */
+    if ((cp = context_find_by_type ("show", ci->ci_type, ci->ci_subtype)))
+	return show_content_aux (ct, alternate, cp, NULL, fmt);
 
     /*
      * Use default method if content is text/plain, or if
      * if it is not a text part of a multipart/alternative
      */
     if (!alternate || ct->c_subtype == TEXT_PLAIN) {
-	if (concatsw)
-	    snprintf(buffer, sizeof(buffer), "%%l");
-	else
+	if (concatsw) {
+	    if (ct->c_termproc)
+		snprintf(buffer, sizeof(buffer), "%%lcat");
+	    else
+		snprintf(buffer, sizeof(buffer), "%%l");
+	} else
 	    snprintf (buffer, sizeof(buffer), "%%l%s %%F", progsw ? progsw :
 		      moreproc && *moreproc ? moreproc : DEFAULT_PAGER);
 	cp = (ct->c_showproc = add (buffer, NULL));
-	return show_content_aux (ct, alternate, cp, NULL);
+	return show_content_aux (ct, alternate, cp, NULL, fmt);
     }
 
     return NOTOK;
@@ -529,22 +531,15 @@ static int
 show_multi (CT ct, int alternate, int concatsw, int textonly, int inlineonly,
 	    struct format *fmt)
 {
-    char *cp, buffer[BUFSIZ];
+    char *cp;
     CI ci = &ct->c_ctinfo;
 
-    /* Check for invo_name-show-type/subtype */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s/%s",
-		invo_name, ci->ci_type, ci->ci_subtype);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-	return show_multi_aux (ct, alternate, cp);
-
-    /* Check for invo_name-show-type */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-	return show_multi_aux (ct, alternate, cp);
+    /* Check for invo_name-show-type[/subtype] */
+    if ((cp = context_find_by_type ("show", ci->ci_type, ci->ci_subtype)))
+	return show_multi_aux (ct, alternate, cp, fmt);
 
     if ((cp = ct->c_showproc))
-	return show_multi_aux (ct, alternate, cp);
+	return show_multi_aux (ct, alternate, cp, fmt);
 
     /*
      * Use default method to display this multipart content.  Even
@@ -568,6 +563,7 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
     int	alternating, nowalternate, result;
     struct multipart *m = (struct multipart *) ct->c_ctparams;
     struct part *part;
+    int any_part_ok;
     CT p;
 
     alternating = 0;
@@ -584,6 +580,7 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
  */
 
     result = alternate ? NOTOK : OK;
+    any_part_ok = 0;
 
     for (part = m->mp_parts; part; part = part->mp_next) {
 	p = part->mp_part;
@@ -591,6 +588,8 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
 	if (part_ok (p, 1) && type_ok (p, 1)) {
 	    int	inneresult;
 
+	    any_part_ok = 1;
+
 	    inneresult = show_switch (p, nowalternate, concatsw, textonly,
 				      inlineonly, fmt);
 	    switch (inneresult) {
@@ -618,7 +617,7 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
 	}
     }
 
-    if (alternating && !part) {
+    if (alternating && !part && any_part_ok) {
 	if (!alternate)
 	    content_error (NULL, ct, "don't know how to display any of the contents");
 	result = NOTOK;
@@ -636,7 +635,7 @@ out:
  */
 
 static int
-show_multi_aux (CT ct, int alternate, char *cp)
+show_multi_aux (CT ct, int alternate, char *cp, struct format *fmt)
 {
     /* xstdin is only used in the call to parse_display_string():
        its value is ignored in the function. */
@@ -674,7 +673,7 @@ show_multi_aux (CT ct, int alternate, char *cp)
 	return NOTOK;
     }
 
-    return show_content_aux2 (ct, alternate, NULL, buffer, NOTOK, xlist, 0);
+    return show_content_aux2 (ct, alternate, NULL, buffer, NOTOK, xlist, 0, fmt);
 }
 
 
@@ -683,29 +682,22 @@ show_multi_aux (CT ct, int alternate, char *cp)
  */
 
 static int
-show_message_rfc822 (CT ct, int alternate)
+show_message_rfc822 (CT ct, int alternate, struct format *fmt)
 {
-    char *cp, buffer[BUFSIZ];
+    char *cp;
     CI ci = &ct->c_ctinfo;
 
-    /* Check for invo_name-show-type/subtype */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s/%s",
-		invo_name, ci->ci_type, ci->ci_subtype);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-	return show_content_aux (ct, alternate, cp, NULL);
-
-    /* Check for invo_name-show-type */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-	return show_content_aux (ct, alternate, cp, NULL);
+    /* Check for invo_name-show-type[/subtype] */
+    if ((cp = context_find_by_type ("show", ci->ci_type, ci->ci_subtype)))
+	return show_content_aux (ct, alternate, cp, NULL, fmt);
 
     if ((cp = ct->c_showproc))
-	return show_content_aux (ct, alternate, cp, NULL);
+	return show_content_aux (ct, alternate, cp, NULL, fmt);
 
     /* default method for message/rfc822 */
     if (ct->c_subtype == MESSAGE_RFC822) {
 	cp = (ct->c_showproc = add ("%pshow -file %F", NULL));
-	return show_content_aux (ct, alternate, cp, NULL);
+	return show_content_aux (ct, alternate, cp, NULL, fmt);
     }
 
     /* complain if we are not a part of a multipart/alternative */
@@ -1023,16 +1015,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
     char *src_charset = content_charset (ct);
     int status = OK;
 
-    /* norm_charmap() is case sensitive. */
-    char *src_charset_u = upcase (src_charset);
-    char *dest_charset_u = upcase (dest_charset);
-    int different_charsets =
-        strcmp (norm_charmap (src_charset), norm_charmap (dest_charset));
-
-    free (dest_charset_u);
-    free (src_charset_u);
-
-    if (different_charsets) {
+    if (strcasecmp (src_charset, dest_charset)) {
 #ifdef HAVE_ICONV
         iconv_t conv_desc = NULL;
         char *dest;
@@ -1183,6 +1166,7 @@ iconv_start:
 
         advise (NULL, "Can't convert %s to %s without iconv", src_charset,
                 dest_charset);
+        errno = ENOSYS;
         status = NOTOK;
 #endif /* ! HAVE_ICONV */
     }
@@ -1193,6 +1177,8 @@ iconv_start:
 
 static int
 convert_content_charset (CT ct, char **file) {
+    int status = OK;
+
 #ifdef HAVE_ICONV
     /* Using current locale, see if the content needs to be converted. */
 
@@ -1202,27 +1188,33 @@ convert_content_charset (CT ct, char **file) {
     if (! check_charset (charset, strlen (charset))) {
         int unused = 0;
 
-        if (convert_charset (ct, get_charset (), &unused) == 0) {
+        char *charset = getcpy (get_charset ());
+
+        if (convert_charset (ct, charset, &unused) == 0) {
             *file = ct->c_cefile.ce_file;
         } else {
-            return NOTOK;
+            status = NOTOK;
         }
+
+        free (charset);
     }
 #else  /* ! HAVE_ICONV */
     NMH_UNUSED (ct);
     NMH_UNUSED (file);
 #endif /* ! HAVE_ICONV */
 
-    return OK;
+    return status;
 }
 
 /*
  * Compile our format string and save any parameters we care about.
  */
 
-#define DEFAULT_MARKER "[ part %{part} - %{content-type} - %<{description}" \
-		       "%{description}%?{cdispo-filename}%{cdispo-filename}" \
-		       "%|%{ctype-name}%> ]"
+#define DEFAULT_MARKER "[ part %{part} - %{content-type} - " \
+		       "%<{description}%{description}" \
+		         "%?{cdispo-filename}%{cdispo-filename}" \
+		         "%|%{ctype-name}%>  " \
+		       "%(kilo(size))B %<(unseen)\\(suppressed\\)%> ]"
 
 static struct format *
 compile_marker(char *markerform)
@@ -1283,10 +1275,11 @@ compile_marker(char *markerform)
  */
 
 static void
-output_marker(CT ct, struct format *fmt)
+output_marker(CT ct, struct format *fmt, int hidden)
 {
-    char outbuf[BUFSIZ];
+    charstring_t outbuf = charstring_create (BUFSIZ);
     struct param_comp_list *pcentry;
+    int partsize;
     int dat[5];
 
     /*
@@ -1320,9 +1313,23 @@ output_marker(CT ct, struct format *fmt)
 					  pcentry->param, '?', 0);
     }
 
-    fmt_scan(fmt, outbuf, sizeof(outbuf), sizeof(outbuf), dat, NULL);
+    if (ct->c_cesizefnx)
+	partsize = (*ct->c_cesizefnx) (ct);
+    else
+	partsize = ct->c_end - ct->c_begin;
+
+    /* make the part's hidden aspect available by overloading the
+     * %(unseen) function.  make the part's size available via %(size).
+     * see comments in h/fmt_scan.h.
+     */
+    dat[2] = partsize;
+    dat[4] = hidden;
+    dat[0] = dat[1] = dat[3] = 0;
+
+    fmt_scan(fmt, outbuf, BUFSIZ, dat, NULL);
 
-    fputs(outbuf, stdout);
+    fputs(charstring_buffer (outbuf), stdout);
+    charstring_free (outbuf);
 
     fmt_freecomptext();
 }