projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove longjmp from signal handler in mhl
[mmh]
/
uip
/
mhshowsbr.c
diff --git
a/uip/mhshowsbr.c
b/uip/mhshowsbr.c
index
2a8bbf9
..
fe40f9d
100644
(file)
--- a/
uip/mhshowsbr.c
+++ b/
uip/mhshowsbr.c
@@
-10,7
+10,6
@@
#include <fcntl.h>
#include <h/signals.h>
#include <errno.h>
#include <fcntl.h>
#include <h/signals.h>
#include <errno.h>
-#include <setjmp.h>
#include <signal.h>
#include <h/tws.h>
#include <h/mime.h>
#include <signal.h>
#include <h/tws.h>
#include <h/mime.h>
@@
-34,8
+33,8
@@
void content_error(char *, CT, char *, ...);
void flush_errors(void);
/* mhlistsbr.c */
void flush_errors(void);
/* mhlistsbr.c */
-int list_switch(CT, int, int, int, int);
-int list_content(CT, int, int, int, int);
+int list_switch(CT, int, int, int);
+int list_content(CT, int, int, int);
/*
** prototypes
/*
** prototypes
@@
-248,7
+247,7
@@
show_content(CT ct, int alternate)
/* complain if we are not a part of a multipart/alternative */
if (!alternate)
/* complain if we are not a part of a multipart/alternative */
if (!alternate)
- content_error(NULL, ct, "don't know how to display content");
+ return show_content_aux(ct, alternate, "%l", NULL);
return NOTOK;
}
return NOTOK;
}
@@
-458,9
+457,9
@@
show_content_aux2(CT ct, int alternate, char *cracked,
if (xlist) {
if (ct->c_type == CT_MULTIPART)
if (xlist) {
if (ct->c_type == CT_MULTIPART)
- list_content(ct, -1, 1, 0, 0);
+ list_content(ct, -1, 0, 0);
else
else
- list_switch(ct, -1, 1, 0, 0);
+ list_switch(ct, -1, 0, 0);
}
fflush(stdout);
}
fflush(stdout);
@@
-519,15
+518,14
@@
show_text(CT ct, int alternate)
** if it is not a text part of a multipart/alternative
*/
if (!alternate || ct->c_subtype == TEXT_PLAIN) {
** if it is not a text part of a multipart/alternative
*/
if (!alternate || ct->c_subtype == TEXT_PLAIN) {
- if (ct->c_charset && !check_charset(ct->c_charset,
- strlen(ct->c_charset))) {
+ if (ct->c_charset && !is_native_charset(ct->c_charset)) {
snprintf(buffer, sizeof(buffer), "%%liconv -f '%s'",
ct->c_charset);
} else {
snprintf(buffer, sizeof(buffer), "%%lcat");
}
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);
+ ct->c_showproc = getcpy(buffer);
+ return show_content_aux(ct, alternate, ct->c_showproc, NULL);
}
return NOTOK;
}
return NOTOK;
@@
-871,7
+869,7
@@
show_message_rfc822(CT ct, int alternate)
/* complain if we are not a part of a multipart/alternative */
if (!alternate)
/* complain if we are not a part of a multipart/alternative */
if (!alternate)
- content_error(NULL, ct, "don't know how to display content");
+ return show_content_aux(ct, alternate, "%l", NULL);
return NOTOK;
}
return NOTOK;
}
@@
-884,8
+882,8
@@
show_message_rfc822(CT ct, int alternate)
static int
show_partial(CT ct, int alternate)
{
static int
show_partial(CT ct, int alternate)
{
- content_error(NULL, ct,
- "in order to display this message, you must reassemble it");
+ show_content_aux(ct, alternate, "%l", NULL);
+ puts("in order to display this message, you must reassemble it");
return NOTOK;
}
return NOTOK;
}
@@
-901,11
+899,11
@@
show_external(CT ct, int alternate)
FILE *fp;
char buf[BUFSIZ];
FILE *fp;
char buf[BUFSIZ];
- msg = add("You need to fetch the contents yourself:", NULL);
+ msg = add("You need to fetch the contents yourself:\n", NULL);
ap = ct->c_ctinfo.ci_attrs;
ep = ct->c_ctinfo.ci_values;
for (; *ap; ap++, ep++) {
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);
+ msg = add(concat("\t", *ap, ": ", *ep, NULL), msg);
}
if (!(fp = fopen(ct->c_file, "r"))) {
adios(ct->c_file, "unable to open");
}
if (!(fp = fopen(ct->c_file, "r"))) {
adios(ct->c_file, "unable to open");
@@
-916,9
+914,13
@@
show_external(CT ct, int alternate)
adios(ct->c_file, "unable to read");
}
*strchr(buf, '\n') = '\0';
adios(ct->c_file, "unable to read");
}
*strchr(buf, '\n') = '\0';
- msg = add(concat("\n\t", buf, NULL), msg);
+ if (!*buf) {
+ continue; /* skip empty lines */
+ }
+ msg = add(concat("\t", buf, "\n", NULL), msg);
}
fclose(fp);
}
fclose(fp);
- content_error(NULL, ct, msg);
+ show_content_aux(ct, alternate, "%l", NULL);
+ fputs(msg, stdout);
return OK;
}
return OK;
}