projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
force rfc2047_parameters to be set to yes, and non configureable.
[apps/madmutt.git]
/
lib-mime
/
rfc2231.c
diff --git
a/lib-mime/rfc2231.c
b/lib-mime/rfc2231.c
index
b5a2553
..
7cd45d2
100644
(file)
--- a/
lib-mime/rfc2231.c
+++ b/
lib-mime/rfc2231.c
@@
-36,13
+36,7
@@
*
*/
*
*/
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
@@
-134,10
+128,10
@@
rfc2231_list_insert(rfc2231_param **list, rfc2231_param *par)
*list = par;
}
*list = par;
}
-static void purge_empty_parameters(
PARAMETER
**headp)
+static void purge_empty_parameters(
parameter_t
**headp)
{
while (*headp) {
{
while (*headp) {
-
PARAMETER
*p = *headp;
+
parameter_t
*p = *headp;
if (!p->attribute || !p->value) {
p = parameter_list_pop(headp);
if (!p->attribute || !p->value) {
p = parameter_list_pop(headp);
@@
-151,7
+145,7
@@
static void purge_empty_parameters(PARAMETER **headp)
/* process continuation parameters */
/* XXX: MC: not read */
static void
/* process continuation parameters */
/* XXX: MC: not read */
static void
-rfc2231_join_continuations(
PARAMETER
**head, rfc2231_param *par)
+rfc2231_join_continuations(
parameter_t
**head, rfc2231_param *par)
{
rfc2231_param *q;
{
rfc2231_param *q;
@@
-206,11
+200,11
@@
rfc2231_join_continuations(PARAMETER **head, rfc2231_param *par)
/****************************************************************************/
/* XXX: MC: not read */
/****************************************************************************/
/* XXX: MC: not read */
-void rfc2231_decode_parameters (
PARAMETER
** headp)
+void rfc2231_decode_parameters (
parameter_t
** headp)
{
{
-
PARAMETER
*head = NULL;
-
PARAMETER
**last;
-
PARAMETER
*p, *q;
+
parameter_t
*head = NULL;
+
parameter_t
**last;
+
parameter_t
*p, *q;
rfc2231_param *conthead = NULL;
rfc2231_param *conttmp;
rfc2231_param *conthead = NULL;
rfc2231_param *conttmp;
@@
-239,9
+233,9
@@
void rfc2231_decode_parameters (PARAMETER ** headp)
* Internet Gateways. So we actually decode it.
*/
* Internet Gateways. So we actually decode it.
*/
- if (
option (OPTRFC2047PARAMS) && p->value && strstr (p->value, "=?"))
- rfc2047_decode
(&p->value);
-
else if (!option (OPTSTRICTMIME))
{
+ if (
p->value && strstr(p->value, "=?")) {
+ rfc2047_decode(&p->value);
+
} else
{
if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII)
mutt_convert_nonmime_string(&p->value);
}
if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII)
mutt_convert_nonmime_string(&p->value);
}