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);
{
sigset_t set, oset;
- int status;
+ int status = OK;
/* Allow user executable bit so that temporary directories created by
* the viewer (e.g., lynx) are going to be accessible */
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 */
show_content (CT ct, int alternate, int textonly, int inlineonly,
struct format *fmt)
{
- char *cp, buffer[BUFSIZ];
+ char *cp;
CI ci = &ct->c_ctinfo;
/*
* the content-type.
*/
- if (textonly || (inlineonly && is_inline(ct))) {
- output_marker(ct, fmt);
+ if (textonly || (inlineonly && !is_inline(ct))) {
+ 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)
*/
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;
- char *file, buffer[BUFSIZ];
+ char *file = NULL, buffer[BUFSIZ];
if (!ct->c_ceopenfnx) {
if (!alternate)
return NOTOK;
}
- file = NULL;
if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
return NOTOK;
if (ct->c_showproc && !strcmp (ct->c_showproc, "true"))
some code rearrangement. And to make this really ugly,
only do it in mhshow, not mhfixmsg, mhn, or mhstore. */
if (convert_content_charset (ct, &file) == OK) {
- close_encoding (ct);
+ (*ct->c_ceclosefnx) (ct);
if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
return NOTOK;
} else {
- admonish (NULL, "unable to convert character set%s to %s",
- ct->c_partno ? "of part " : "",
+ char *charset = content_charset (ct);
+ admonish (NULL, "unable to convert character set%s%s to %s",
+ ct->c_partno ? " of part " : "",
ct->c_partno ? ct->c_partno : "",
- content_charset (ct));
+ charset);
+ free (charset);
}
}
got_command:
return show_content_aux2 (ct, alternate, cracked, buffer,
- fd, xlist, xstdin);
+ fd, xlist, xstdin, fmt);
}
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;
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);
}
/*
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 "
}
while ((cc = read(fd, readbuf, sizeof(readbuf))) > 0) {
- fwrite(readbuf, sizeof(char), cc, stdout);
+ if ((ssize_t) fwrite(readbuf, sizeof(char), cc, stdout) < cc) {
+ advise ("putline", "fwrite");
+ }
+ lastchar = readbuf[cc - 1];
}
if (cc < 0) {
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;
}
return NOTOK;
case OK:
- if (cracked)
- chdir (cracked);
+ if (cracked) {
+ if (chdir (cracked) < 0) {
+ advise (cracked, "chdir");
+ }
+ }
if (!xstdin)
dup2 (fd, 0);
close (fd);
execvp (file, vec);
fprintf (stderr, "unable to exec ");
- perror ("/bin/sh");
+ perror (buffer);
_exit (-1);
/* NOTREACHED */
*/
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;
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
int alternating, nowalternate, result;
struct multipart *m = (struct multipart *) ct->c_ctparams;
struct part *part;
+ int request_matched;
CT p;
alternating = 0;
alternating = 1;
}
-/*
- * alternate -> we are a part inside an multipart/alternative
- * alternating -> we are a multipart/alternative
- */
+ /*
+ * alternate -> we are a part inside an multipart/alternative
+ * alternating -> we are a multipart/alternative
+ */
result = alternate ? NOTOK : OK;
+ request_matched = 0;
for (part = m->mp_parts; part; part = part->mp_next) {
p = part->mp_part;
if (part_ok (p, 1) && type_ok (p, 1)) {
int inneresult;
+ request_matched = 1;
+
inneresult = show_switch (p, nowalternate, concatsw, textonly,
inlineonly, fmt);
switch (inneresult) {
}
}
- if (alternating && !part) {
+ if (alternating && !part && request_matched) {
if (!alternate)
content_error (NULL, ct, "don't know how to display any of the contents");
result = NOTOK;
}
out:
- return result;
+ /* if no parts matched what was requested, there can't have been
+ * any display errors, so we report OK. */
+ return request_matched ? result : OK;
}
*/
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. */
int xstdin = 0, xlist = 0;
- char *file, buffer[BUFSIZ];
+ char *file = NULL, buffer[BUFSIZ];
struct multipart *m = (struct multipart *) ct->c_ctparams;
struct part *part;
CT p;
}
if (p->c_storage == NULL) {
- file = NULL;
if ((*p->c_ceopenfnx) (p, &file) == NOTOK)
return NOTOK;
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);
}
*/
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 ("%pecho -file %F", NULL));
- return show_content_aux (ct, alternate, cp, NULL);
+ cp = (ct->c_showproc = add ("%pshow -file %F", NULL));
+ return show_content_aux (ct, alternate, cp, NULL, fmt);
}
/* complain if we are not a part of a multipart/alternative */
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;
size_t end;
int opened_input_file = 0;
char src_buffer[BUFSIZ];
+ size_t dest_buffer_size = BUFSIZ;
+ char *dest_buffer = mh_xmalloc(dest_buffer_size);
HF hf;
char *tempfile;
if ((conv_desc = iconv_open (dest_charset, src_charset)) ==
(iconv_t) -1) {
advise (NULL, "Can't convert %s to %s", src_charset, dest_charset);
+ free (src_charset);
return NOTOK;
}
while ((inbytes = fread (src_buffer, 1,
min (bytes_to_read, sizeof src_buffer),
*fp)) > 0) {
- char dest_buffer[BUFSIZ];
ICONV_CONST char *ib = src_buffer;
char *ob = dest_buffer;
- size_t outbytes = sizeof dest_buffer;
+ size_t outbytes = dest_buffer_size;
size_t outbytes_before = outbytes;
if (end > 0) bytes_to_read -= inbytes;
+iconv_start:
if (iconv (conv_desc, &ib, &inbytes, &ob, &outbytes) ==
(size_t) -1) {
+ if (errno == E2BIG) {
+ /*
+ * Bump up the buffer by at least a factor of 2
+ * over what we need.
+ */
+ size_t bumpup = inbytes * 2, ob_off = ob - dest_buffer;
+ dest_buffer_size += bumpup;
+ dest_buffer = mh_xrealloc(dest_buffer,
+ dest_buffer_size);
+ ob = dest_buffer + ob_off;
+ outbytes += bumpup;
+ outbytes_before += bumpup;
+ goto iconv_start;
+ }
status = NOTOK;
break;
} else {
- write (fd, dest_buffer, outbytes_before - outbytes);
+ if (write (fd, dest_buffer, outbytes_before - outbytes)
+ < 0) {
+ advise (dest, "write");
+ }
}
}
} else {
(void) m_unlink (dest);
}
+ free(dest_buffer);
#else /* ! HAVE_ICONV */
NMH_UNUSED (message_mods);
advise (NULL, "Can't convert %s to %s without iconv", src_charset,
dest_charset);
+ errno = ENOSYS;
status = NOTOK;
#endif /* ! HAVE_ICONV */
}
+ free (src_charset);
return status;
}
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. */
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)
*/
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];
/*
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();
}
projects / nmh / blobdiff