projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move things around: more DT_SYS variables into the lua !
[apps/madmutt.git]
/
lib-mime
/
rfc2231.c
diff --git
a/lib-mime/rfc2231.c
b/lib-mime/rfc2231.c
index
6bbd39a
..
287c1d6
100644
(file)
--- a/
lib-mime/rfc2231.c
+++ b/
lib-mime/rfc2231.c
@@
-36,10
+36,6
@@
*
*/
*
*/
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-
#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
@@
-179,7
+175,7
@@
rfc2231_join_continuations(parameter_t **head, rfc2231_param *par)
vl = m_strlen(par->value);
p_realloc(&value, l + vl + 1);
vl = m_strlen(par->value);
p_realloc(&value, l + vl + 1);
- strcpy (value + l, par->value); /* __STRCPY_CHECKED__ */
+ m_strcpy(value + l, vl + 1, par->value);
l += vl;
q = par->next;
l += vl;
q = par->next;
@@
-237,9
+233,9
@@
void rfc2231_decode_parameters (parameter_t ** 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);
}