}
break;
+ case 'c':
+ /* insert charset */
+ if (ct->c_charset) {
+ strncpy(bp, ct->c_charset, buflen);
+ }
+ break;
+
case 'd':
/* insert content description */
if (ct->c_descr) {
}
}
- if (buflen <= 0 || (ct->c_termproc &&
- (size_t)buflen <= strlen(ct->c_termproc))) {
- /*
- ** content_error would provide a more useful error message
- ** here, except that if we got overrun, it probably would
- ** too.
- */
- fprintf(stderr, "Buffer overflow constructing show command!\n");
- return NOTOK;
- }
-
- /* use charset string to modify display method */
- if (ct->c_termproc) {
- char term[BUFSIZ];
-
- strncpy(term, buffer, sizeof(term));
- snprintf(buffer, sizeof(buffer), ct->c_termproc, term);
- }
-
got_command:
return show_content_aux2(ct, alternate, cracked, buffer,
fd, xlist, xstdin, xtty);
** if it is not a text part of a multipart/alternative
*/
if (!alternate || ct->c_subtype == TEXT_PLAIN) {
- snprintf(buffer, sizeof(buffer), "%%p%s '%%F'", defaultpager);
+ if (!check_charset(ct->c_charset, strlen(ct->c_charset))) {
+ snprintf(buffer, sizeof(buffer), "%%liconv -f '%s'",
+ ct->c_charset);
+ } else {
+ snprintf(buffer, sizeof(buffer), "%%lcat");
+ }
cp = (ct->c_showproc = getcpy(buffer));
return show_content_aux(ct, alternate, cp, NULL);
}
}
break;
+ case 'c':
+ /* insert charset */
+ if (ct->c_charset) {
+ strncpy(bp, ct->c_charset, buflen);
+ }
+ break;
+
case 'd':
/* insert content description */
if (ct->c_descr) {
}
}
- if (buflen <= 0 || (ct->c_termproc &&
- (size_t)buflen <= strlen(ct->c_termproc))) {
- /*
- ** content_error would provide a more useful error message
- ** here, except that if we got overrun, it probably would
- ** too.
- */
- fprintf(stderr, "Buffer overflow constructing show command!\n");
- return NOTOK;
- }
-
- /* use charset string to modify display method */
- if (ct->c_termproc) {
- char term[BUFSIZ];
-
- strncpy(term, buffer, sizeof(term));
- snprintf(buffer, sizeof(buffer), ct->c_termproc, term);
- }
-
return show_content_aux2(ct, alternate, NULL, buffer,
NOTOK, xlist, 0, xtty);
}
/*
-** Show content of type "message/external".
-**
-** THE ERROR CHECKING IN THIS ONE IS NOT DONE YET.
+** Show how to retrieve content of type "message/external".
*/
-
static int
show_external(CT ct, int alternate)
{
- struct exbody *e = (struct exbody *) ct->c_ctparams;
- CT p = e->eb_content;
-
- if (!type_ok(p, 0))
- return OK;
-
- return show_switch(p, alternate);
-
-#if 0
- content_error(NULL, p, "don't know how to display content");
- return NOTOK;
-#endif
+ char **ap, **ep;
+ char *msg;
+ FILE *fp;
+ char buf[BUFSIZ];
+
+ msg = add("You need to fetch the contents yourself:", NULL);
+ ap = ct->c_ctinfo.ci_attrs;
+ ep = ct->c_ctinfo.ci_values;
+ for (; *ap; ap++, ep++) {
+ msg = add(concat("\n\t", *ap, ": ", *ep, NULL), msg);
+ }
+ if (!(fp = fopen(ct->c_file, "r"))) {
+ adios(ct->c_file, "unable to open");
+ }
+ fseek(fp, ct->c_begin, SEEK_SET);
+ while (!feof(fp) && ftell(fp) < ct->c_end) {
+ if (!fgets(buf, sizeof buf, fp)) {
+ adios(ct->c_file, "unable to read");
+ }
+ *strchr(buf, '\n') = '\0';
+ msg = add(concat("\n\t", buf, NULL), msg);
+ }
+ fclose(fp);
+ content_error(NULL, ct, msg);
+ return OK;
}