X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ea855e72d026c72658d43f993fc62cfcf2de2ca3..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/mhshowsbr.c diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 187f9156..8dbc2ecc 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -23,6 +22,8 @@ #endif /* ! HAVE_ICONV */ extern int debugsw; +extern int npart; +extern int ntype; int nolist = 0; @@ -32,18 +33,20 @@ char *progsw = NULL; int nomore = 0; char *formsw = NULL; +/* for output markerss and headers */ +char *folder = NULL; +char *markerform; +char *headerform; +int headersw = -1; + /* mhmisc.c */ -int part_ok (CT, int); +int part_ok (CT); +int part_exact (CT); int type_ok (CT, int); void content_error (char *, CT, char *, ...); void flush_errors (void); -/* - * prototypes - */ -int show_content_aux (CT, int, char *, char *, struct format *fmt); - /* * static prototypes */ @@ -62,7 +65,9 @@ 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_header(char *); static struct format *compile_marker(char *); +static void output_header (CT, struct format *); static void output_marker (CT, struct format *, int); static void free_markercomps (void); static int pidcheck(int); @@ -72,6 +77,7 @@ static int pidcheck(int); * content marker display. */ +static struct comp *folder_comp = NULL; static struct comp *part_comp = NULL; static struct comp *ctype_comp = NULL; static struct comp *description_comp = NULL; @@ -92,11 +98,10 @@ static struct param_comp_list *dispo_pc_list = NULL; */ void -show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly, - char *markerform) +show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly) { CT ct, *ctp; - struct format *fmt; + struct format *hfmt, *mfmt; /* * If form is not specified, then get default form @@ -106,9 +111,10 @@ show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly, formsw = getcpy (etcpath ("mhl.headers")); /* - * Compile the content marker format line + * Compile the content marker and header format lines */ - fmt = compile_marker(markerform); + mfmt = compile_marker(markerform); + hfmt = compile_header(headerform); /* * If form is "mhl.null", suppress display of header. @@ -120,13 +126,17 @@ show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly, ct = *ctp; /* if top-level type is ok, then display message */ - if (type_ok (ct, 1)) + if (type_ok (ct, 1)) { + if (headersw) output_header(ct, hfmt); + show_single_message (ct, formsw, concatsw, textonly, inlineonly, - fmt); + mfmt); + } } free_markercomps(); - fmt_free(fmt, 1); + fmt_free(hfmt, 1); + fmt_free(mfmt, 1); } @@ -140,7 +150,7 @@ show_single_message (CT ct, char *form, int concatsw, int textonly, { 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 */ @@ -196,9 +206,9 @@ DisplayMsgHeader (CT ct, char *form, int concatsw) char *file; vec = argsplit(mhlproc, &file, &vecp); - vec[vecp++] = getcpy("-form"); - vec[vecp++] = getcpy(form); - vec[vecp++] = getcpy("-nobody"); + vec[vecp++] = mh_xstrdup("-form"); + vec[vecp++] = mh_xstrdup(form); + vec[vecp++] = mh_xstrdup("-nobody"); vec[vecp++] = getcpy(ct->c_file); /* @@ -206,10 +216,10 @@ DisplayMsgHeader (CT ct, char *form, int concatsw) * then just pass that along. */ if (nomore || concatsw) { - vec[vecp++] = getcpy("-nomoreproc"); + vec[vecp++] = mh_xstrdup("-nomoreproc"); } else if (progsw) { - vec[vecp++] = getcpy("-moreproc"); - vec[vecp++] = getcpy(progsw); + vec[vecp++] = mh_xstrdup("-moreproc"); + vec[vecp++] = mh_xstrdup(progsw); } vec[vecp] = NULL; @@ -263,8 +273,15 @@ show_switch (CT ct, int alternate, int concatsw, int textonly, int inlineonly, inlineonly, fmt); case MESSAGE_RFC822: - default: return show_message_rfc822 (ct, alternate, fmt); + + /* + * Treat unknown message types as equivalent to + * application/octet-stream for now + */ + default: + return show_content (ct, alternate, textonly, + inlineonly, fmt); } case CT_TEXT: @@ -274,10 +291,8 @@ show_switch (CT ct, int alternate, int concatsw, int textonly, int inlineonly, 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 +307,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; /* @@ -305,15 +320,8 @@ show_content (CT ct, int alternate, int textonly, int inlineonly, 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, fmt); - - /* 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') + /* 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)) @@ -336,7 +344,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format * { int fd; int xstdin = 0, xlist = 0; - char *file, buffer[BUFSIZ]; + char *file = NULL, buffer[BUFSIZ]; if (!ct->c_ceopenfnx) { if (!alternate) @@ -345,11 +353,10 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format * return NOTOK; } - file = NULL; if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK) return NOTOK; if (ct->c_showproc && !strcmp (ct->c_showproc, "true")) - return (alternate ? DONE : OK); + return OK; if (! strcmp(invo_name, "mhshow") && ct->c_type == CT_TEXT && ct->c_subtype == TEXT_PLAIN) { @@ -362,10 +369,12 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format * if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK) return NOTOK; } else { - admonish (NULL, "unable to convert character set%s%s to %s", + char *charset = content_charset (ct); + admonish (NULL, "unable to convert character set%s%s from %s", ct->c_partno ? " of part " : "", ct->c_partno ? ct->c_partno : "", - content_charset (ct)); + charset); + free (charset); } } @@ -411,7 +420,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, fprintf (stderr, " using command %s\n", buffer); } - if (xlist) { + if (xlist && fmt) { output_marker(ct, fmt, 0); } @@ -423,6 +432,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 " @@ -431,7 +441,10 @@ 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); + if ((ssize_t) fwrite(readbuf, sizeof(char), cc, stdout) < cc) { + advise ("putline", "fwrite"); + } + lastchar = readbuf[cc - 1]; } if (cc < 0) { @@ -439,6 +452,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; } @@ -456,8 +483,11 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, return NOTOK; case OK: - if (cracked) - chdir (cracked); + if (cracked) { + if (chdir (cracked) < 0) { + advise (cracked, "chdir"); + } + } if (!xstdin) dup2 (fd, 0); close (fd); @@ -467,14 +497,17 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, _exit (-1); /* NOTREACHED */ - default: + default: { + int status; + arglist_free(file, vec); - pidcheck (pidXwait (child_id, NULL)); + pidcheck ((status = pidXwait (child_id, NULL))); if (fd != NOTOK) (*ct->c_ceclosefnx) (ct); - return (alternate ? DONE : OK); + return (alternate ? OK : status); + } } } @@ -489,15 +522,8 @@ 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, fmt); - - /* 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') + /* 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); /* @@ -529,22 +555,16 @@ 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') + /* 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); - /* 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, fmt); - - if ((cp = ct->c_showproc)) + if ((cp = ct->c_showproc)) { return show_multi_aux (ct, alternate, cp, fmt); + } /* * Use default method to display this multipart content. Even @@ -568,7 +588,10 @@ 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; + int request_matched; + int display_success; + int mult_alt_done; + int ret; CT p; alternating = 0; @@ -579,42 +602,58 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly, alternating = 1; } -/* - * alternate -> we are a part inside an multipart/alternative - * alternating -> we are a multipart/alternative - */ + /* + * alternate -> we are a part inside a multipart/alternative + * alternating -> we are a multipart/alternative + */ - result = alternate ? NOTOK : OK; - any_part_ok = 0; + result = NOTOK; + request_matched = 0; + display_success = 0; + mult_alt_done = 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; + /* while looking for the right displayable alternative, we + * use a looser search criterion than we do after finding it. + * specifically, while still looking, part_ok() will match + * "parent" parts (e.g. "-part 2" where 2 is a high-level + * multipart). after finding it, we use part_exact() to only + * choose a part that was requested explicitly. + */ + if ((part_exact(p) && type_ok(p, 1)) || + (!mult_alt_done && part_ok (p) && type_ok (p, 1))) { - any_part_ok = 1; + int inneresult; inneresult = show_switch (p, nowalternate, concatsw, textonly, inlineonly, fmt); switch (inneresult) { - case NOTOK: + case NOTOK: /* hard display error */ + request_matched = 1; if (alternate && !alternating) { result = NOTOK; goto out; } continue; - case OK: - case DONE: + case DONE: /* found no match on content type */ + continue; + + case OK: /* display successful */ + request_matched = 1; + display_success = 1; + result = OK; + + /* if we got success on a sub-part of + * multipart/alternative, we're done, unless + * there's a chance an explicit part should be + * matched later in the alternatives. */ if (alternating) { - result = DONE; - break; - } - if (alternate) { + mult_alt_done = 1; + } else if (alternate) { alternate = nowalternate = 0; - if (result == NOTOK) - result = inneresult; } continue; } @@ -622,15 +661,23 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly, } } - if (alternating && !part && any_part_ok) { + /* we're supposed to be displaying at least something from a + * multipart/alternative. if we've had parts to consider, and + * we've had no success, then we should complain. we shouldn't + * complain if none of the parts matched any -part or -type option. + */ + if (alternating && request_matched && !display_success) { + /* if we're ourselves an alternate. don't complain yet. */ if (!alternate) content_error (NULL, ct, "don't know how to display any of the contents"); result = NOTOK; - goto out; } out: - return result; + /* if no parts matched what was requested, there can't have been + * any display errors. we report DONE rather than OK. */ + ret = request_matched ? result : DONE; + return ret; } @@ -645,7 +692,7 @@ 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; @@ -660,14 +707,13 @@ show_multi_aux (CT ct, int alternate, char *cp, struct format *fmt) } if (p->c_storage == NULL) { - file = NULL; if ((*p->c_ceopenfnx) (p, &file) == NOTOK) return NOTOK; p->c_storage = add (file, NULL); if (p->c_showproc && !strcmp (p->c_showproc, "true")) - return (alternate ? DONE : OK); + return OK; (*p->c_ceclosefnx) (p); } } @@ -689,18 +735,11 @@ show_multi_aux (CT ct, int alternate, char *cp, struct format *fmt) static int 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, fmt); - - /* 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') + /* 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)) @@ -1027,19 +1066,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); - char *src_charset_n = getcpy (norm_charmap (src_charset)); - char *dest_charset_n = getcpy (norm_charmap (dest_charset)); - int different_charsets = strcmp (src_charset_n, dest_charset_n); - - free (dest_charset_n); - free (src_charset_n); - 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; @@ -1054,10 +1081,12 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) { char *dest_buffer = mh_xmalloc(dest_buffer_size); HF hf; char *tempfile; + int fromutf8 = !strcasecmp(src_charset, "UTF-8"); 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; } @@ -1122,10 +1151,39 @@ iconv_start: outbytes_before += bumpup; goto iconv_start; } + if (errno == EINVAL) { + /* middle of multi-byte sequence */ + if (write (fd, dest_buffer, outbytes_before - outbytes) < 0) { + advise (dest, "write"); + } + fseeko (*fp, -inbytes, SEEK_CUR); + if (end > 0) bytes_to_read += inbytes; + /* advise(NULL, "convert_charset: EINVAL"); */ + continue; + } + if (errno == EILSEQ) { + /* invalid multi-byte sequence */ + if (fromutf8) { + for (++ib, --inbytes; + inbytes > 0 && + (((unsigned char) *ib) & 0xc0) == 0x80; + ++ib, --inbytes) + continue; + } else { + ib++; inbytes--; /* skip it */ + } + (*ob++) = '?'; outbytes --; + /* advise(NULL, "convert_charset: EILSEQ"); */ + goto iconv_start; + } + advise (NULL, "convert_charset: errno = %d", errno); status = NOTOK; break; } else { - write (fd, dest_buffer, outbytes_before - outbytes); + if (write (fd, dest_buffer, outbytes_before - outbytes) + < 0) { + advise (dest, "write"); + } } } @@ -1195,6 +1253,7 @@ iconv_start: #endif /* ! HAVE_ICONV */ } + free (src_charset); return status; } @@ -1207,21 +1266,22 @@ convert_content_charset (CT ct, char **file) { /* Using current locale, see if the content needs to be converted. */ /* content_charset() cannot return NULL. */ - char *charset = content_charset (ct); + char *src_charset = content_charset (ct); - if (! check_charset (charset, strlen (charset))) { + if (! check_charset (src_charset, strlen (src_charset))) { int unused = 0; - char *charset = getcpy (get_charset ()); + char *dest_charset = getcpy (get_charset ()); - if (convert_charset (ct, charset, &unused) == 0) { + if (convert_charset (ct, dest_charset, &unused) == 0) { *file = ct->c_cefile.ce_file; } else { status = NOTOK; } - free (charset); + free (dest_charset); } + free (src_charset); #else /* ! HAVE_ICONV */ NMH_UNUSED (ct); NMH_UNUSED (file); @@ -1234,12 +1294,37 @@ convert_content_charset (CT ct, char **file) { * 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}%> %<(unseen)\\(suppressed\\)%> ]" +#define DEFAULT_HEADER "[ Message %{folder}%<{folder}:%>%(msg) ]" +#define DEFAULT_MARKER "[ part %{part} - %{content-type} - " \ + "%<{description}%{description}" \ + "%?{cdispo-filename}%{cdispo-filename}" \ + "%|%{ctype-name}%> " \ + "%(kilo(size))B %<(unseen)\\(suppressed\\)%> ]" + +static struct format * +compile_header(char *form) +{ + struct format *fmt; + char *fmtstring; + struct comp *comp = NULL; + unsigned int bucket; + + fmtstring = new_fs(form, NULL, DEFAULT_HEADER); + + (void) fmt_compile(fmtstring, &fmt, 1); + free_fs(); + + while ((comp = fmt_nextcomp(comp, &bucket)) != NULL) { + if (strcasecmp(comp->c_name, "folder") == 0) { + folder_comp = comp; + } + } + + return fmt; +} static struct format * -compile_marker(char *markerform) +compile_marker(char *form) { struct format *fmt; char *fmtstring; @@ -1247,10 +1332,10 @@ compile_marker(char *markerform) unsigned int bucket; struct param_comp_list *pc_entry; - fmtstring = new_fs(markerform, NULL, DEFAULT_MARKER); + fmtstring = new_fs(form, NULL, DEFAULT_MARKER); (void) fmt_compile(fmtstring, &fmt, 1); - free(fmtstring); + free_fs(); /* * Things we care about: @@ -1274,15 +1359,15 @@ compile_marker(char *markerform) dispo_comp = comp; } else if (strncasecmp(comp->c_name, "ctype-", 6) == 0 && strlen(comp->c_name) > 6) { - pc_entry = mh_xmalloc(sizeof(*pc_entry)); - pc_entry->param = getcpy(comp->c_name + 6); + NEW(pc_entry); + pc_entry->param = mh_xstrdup(comp->c_name + 6); pc_entry->comp = comp; pc_entry->next = ctype_pc_list; ctype_pc_list = pc_entry; } else if (strncasecmp(comp->c_name, "cdispo-", 7) == 0 && strlen(comp->c_name) > 7) { - pc_entry = mh_xmalloc(sizeof(*pc_entry)); - pc_entry->param = getcpy(comp->c_name + 7); + NEW(pc_entry); + pc_entry->param = mh_xstrdup(comp->c_name + 7); pc_entry->comp = comp; pc_entry->next = dispo_pc_list; dispo_pc_list = pc_entry; @@ -1296,12 +1381,46 @@ compile_marker(char *markerform) * Output on stdout an appropriate marker for this content, using mh-format */ +static void +output_header(CT ct, struct format *fmt) +{ + charstring_t outbuf = charstring_create (BUFSIZ); + int dat[5] = { 0 }; + char *endp; + int message = 0; + + if (folder_comp) + folder_comp->c_text = getcpy(folder); + + if (ct->c_file && *ct->c_file) { + message = strtol(ct->c_file, &endp, 10); + if (*endp) message = 0; + dat[0] = message; + } + + /* it would be nice to populate dat[2], for %(size) here, + * but it's not available. it might also be nice to know + * if the message originally had any mime parts or not -- but + * there's also no record of that. (except for MIME-version:) + */ + + fmt_scan(fmt, outbuf, BUFSIZ, dat, NULL); + + fputs(charstring_buffer (outbuf), stdout); + charstring_free (outbuf); + + fmt_freecomptext(); +} + static void output_marker(CT ct, struct format *fmt, int hidden) { - char outbuf[BUFSIZ]; + charstring_t outbuf = charstring_create (BUFSIZ); struct param_comp_list *pcentry; - int dat[5]; + int partsize; + int message = 0; + char *endp; + int dat[5] = { 0 }; /* * Grab any items we care about. @@ -1313,15 +1432,15 @@ output_marker(CT ct, struct format *fmt, int hidden) } if (part_comp && ct->c_partno) { - part_comp->c_text = getcpy(ct->c_partno); + part_comp->c_text = mh_xstrdup(ct->c_partno); } if (description_comp && ct->c_descr) { - description_comp->c_text = getcpy(ct->c_descr); + description_comp->c_text = mh_xstrdup(ct->c_descr); } if (dispo_comp && ct->c_dispo_type) { - dispo_comp->c_text = getcpy(ct->c_dispo_type); + dispo_comp->c_text = mh_xstrdup(ct->c_dispo_type); } for (pcentry = ctype_pc_list; pcentry != NULL; pcentry = pcentry->next) { @@ -1334,15 +1453,28 @@ output_marker(CT ct, struct format *fmt, int hidden) pcentry->param, '?', 0); } + if (ct->c_cesizefnx) + partsize = (*ct->c_cesizefnx) (ct); + else + partsize = ct->c_end - ct->c_begin; + + if (ct->c_file && *ct->c_file) { + message = strtol(ct->c_file, &endp, 10); + if (*endp) message = 0; + dat[0] = message; + } + dat[2] = partsize; + /* make the part's hidden aspect available by overloading the - * %(unseen) function. see comments in h/fmt_scan.h. + * %(unseen) function. make the part's size available via %(size). + * see comments in h/fmt_scan.h. */ - dat[0] = dat[1] = dat[2] = dat[3] = 0; dat[4] = hidden; - fmt_scan(fmt, outbuf, sizeof(outbuf), sizeof(outbuf), dat, NULL); + fmt_scan(fmt, outbuf, BUFSIZ, dat, NULL); - fputs(outbuf, stdout); + fputs(charstring_buffer (outbuf), stdout); + charstring_free (outbuf); fmt_freecomptext(); } @@ -1356,6 +1488,7 @@ free_markercomps(void) { struct param_comp_list *pc_entry, *pc2; + folder_comp = NULL; part_comp = NULL; ctype_comp = NULL; description_comp = NULL;