projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Ignore!) Removed a trailing whitespace line, just for a test.
[mmh]
/
uip
/
mhshowsbr.c
diff --git
a/uip/mhshowsbr.c
b/uip/mhshowsbr.c
index
3bcf84f
..
b5ecd09
100644
(file)
--- a/
uip/mhshowsbr.c
+++ b/
uip/mhshowsbr.c
@@
-34,8
+34,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
@@
-85,9
+85,16
@@
show_all_messages(CT *cts)
for (ctp = cts; *ctp; ctp++) {
ct = *ctp;
for (ctp = cts; *ctp; ctp++) {
ct = *ctp;
- /* if top-level type is ok, then display message */
- if (type_ok(ct, 1))
- show_single_message(ct, formsw);
+ if (!type_ok(ct, 1)) { /* top-level type */
+ continue;
+ }
+ if (cts[1]) {
+ if (ctp != cts) {
+ printf("\n\n");
+ }
+ printf(">>> Message %s\n\n", ct->c_file);
+ }
+ show_single_message(ct, formsw);
}
}
}
}
@@
-226,13
+233,13
@@
show_content(CT ct, int alternate)
CI ci = &ct->c_ctinfo;
/* Check for mhshow-show-type/subtype */
CI ci = &ct->c_ctinfo;
/* Check for mhshow-show-type/subtype */
- snprintf(buffer, sizeof(buffer), "%s-show-%s/%s",
- invo_name, ci->ci_type, ci->ci_subtype);
+ snprintf(buffer, sizeof(buffer), "mhshow-show-%s/%s",
+ ci->ci_type, ci->ci_subtype);
if ((cp = context_find(buffer)) && *cp != '\0')
return show_content_aux(ct, alternate, cp, NULL);
/* Check for mhshow-show-type */
if ((cp = context_find(buffer)) && *cp != '\0')
return show_content_aux(ct, alternate, cp, NULL);
/* Check for mhshow-show-type */
- snprintf(buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
+ snprintf(buffer, sizeof(buffer), "mhshow-show-%s", ci->ci_type);
if ((cp = context_find(buffer)) && *cp != '\0')
return show_content_aux(ct, alternate, cp, NULL);
if ((cp = context_find(buffer)) && *cp != '\0')
return show_content_aux(ct, alternate, cp, NULL);
@@
-312,9
+319,8
@@
show_content_aux(CT ct, int alternate, char *cp, char *cracked)
case 'c':
/* insert charset */
case 'c':
/* insert charset */
- if (ct->c_charset) {
- strncpy(bp, ct->c_charset, buflen);
- }
+ strncpy(bp, ct->c_charset ? ct->c_charset :
+ "US-ASCII", buflen);
break;
case 'd':
break;
case 'd':
@@
-452,9
+458,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);
@@
-498,13
+504,13
@@
show_text(CT ct, int alternate)
CI ci = &ct->c_ctinfo;
/* Check for mhshow-show-type/subtype */
CI ci = &ct->c_ctinfo;
/* Check for mhshow-show-type/subtype */
- snprintf(buffer, sizeof(buffer), "%s-show-%s/%s",
- invo_name, ci->ci_type, ci->ci_subtype);
+ snprintf(buffer, sizeof(buffer), "mhshow-show-%s/%s",
+ ci->ci_type, ci->ci_subtype);
if ((cp = context_find(buffer)) && *cp != '\0')
return show_content_aux(ct, alternate, cp, NULL);
/* Check for mhshow-show-type */
if ((cp = context_find(buffer)) && *cp != '\0')
return show_content_aux(ct, alternate, cp, NULL);
/* Check for mhshow-show-type */
- snprintf(buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
+ snprintf(buffer, sizeof(buffer), "mhshow-show-%s", ci->ci_type);
if ((cp = context_find(buffer)) && *cp != '\0')
return show_content_aux(ct, alternate, cp, NULL);
if ((cp = context_find(buffer)) && *cp != '\0')
return show_content_aux(ct, alternate, cp, NULL);
@@
-513,14
+519,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 (!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;
@@
-538,13
+544,13
@@
show_multi(CT ct, int alternate)
CI ci = &ct->c_ctinfo;
/* Check for mhshow-show-type/subtype */
CI ci = &ct->c_ctinfo;
/* Check for mhshow-show-type/subtype */
- snprintf(buffer, sizeof(buffer), "%s-show-%s/%s",
- invo_name, ci->ci_type, ci->ci_subtype);
+ snprintf(buffer, sizeof(buffer), "mhshow-show-%s/%s",
+ ci->ci_type, ci->ci_subtype);
if ((cp = context_find(buffer)) && *cp != '\0')
return show_multi_aux(ct, alternate, cp);
/* Check for mhshow-show-type */
if ((cp = context_find(buffer)) && *cp != '\0')
return show_multi_aux(ct, alternate, cp);
/* Check for mhshow-show-type */
- snprintf(buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
+ snprintf(buffer, sizeof(buffer), "mhshow-show-%s", ci->ci_type);
if ((cp = context_find(buffer)) && *cp != '\0')
return show_multi_aux(ct, alternate, cp);
if ((cp = context_find(buffer)) && *cp != '\0')
return show_multi_aux(ct, alternate, cp);
@@
-714,9
+720,8
@@
show_multi_aux(CT ct, int alternate, char *cp)
case 'c':
/* insert charset */
case 'c':
/* insert charset */
- if (ct->c_charset) {
- strncpy(bp, ct->c_charset, buflen);
- }
+ strncpy(bp, ct->c_charset ? ct->c_charset :
+ "US-ASCII", buflen);
break;
case 'd':
break;
case 'd':
@@
-844,13
+849,13
@@
show_message_rfc822(CT ct, int alternate)
CI ci = &ct->c_ctinfo;
/* Check for mhshow-show-type/subtype */
CI ci = &ct->c_ctinfo;
/* Check for mhshow-show-type/subtype */
- snprintf(buffer, sizeof(buffer), "%s-show-%s/%s",
- invo_name, ci->ci_type, ci->ci_subtype);
+ snprintf(buffer, sizeof(buffer), "mhshow-show-%s/%s",
+ ci->ci_type, ci->ci_subtype);
if ((cp = context_find(buffer)) && *cp != '\0')
return show_content_aux(ct, alternate, cp, NULL);
/* Check for mhshow-show-type */
if ((cp = context_find(buffer)) && *cp != '\0')
return show_content_aux(ct, alternate, cp, NULL);
/* Check for mhshow-show-type */
- snprintf(buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
+ snprintf(buffer, sizeof(buffer), "mhshow-show-%s", ci->ci_type);
if ((cp = context_find(buffer)) && *cp != '\0')
return show_content_aux(ct, alternate, cp, NULL);
if ((cp = context_find(buffer)) && *cp != '\0')
return show_content_aux(ct, alternate, cp, NULL);