bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 07:50:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

added support for extended notation in attachment filenames, see RFC5987

Browse Source
This commit is contained in:
SJ 2014-10-03 11:38:49 +02:00
parent e2ef65a112
commit cd53d12099
2 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.h
View File

@ -14,7 +14,7 @@
#define VERSION "1.1.1-pre" #define VERSION "1.1.1-pre"
#define BUILD 890 #define BUILD 891
#define HOSTID "mailarchiver" #define HOSTID "mailarchiver"

55
src/parser_utils.c
View File

@ -732,14 +732,41 @@ void fixURL(char *url){
int extractNameFromHeaderLine(char *s, char *name, char *resultbuf){ int extractNameFromHeaderLine(char *s, char *name, char *resultbuf){
int rc=0; int rc=0, extended=0;
char buf[SMALLBUFSIZE], puf[SMALLBUFSIZE], *p, *q; char buf[SMALLBUFSIZE], puf[SMALLBUFSIZE], *p, *q, *encoding;
snprintf(buf, sizeof(buf)-1, "%s", s); snprintf(buf, sizeof(buf)-1, "%s", s);
p = strstr(buf, name); p = strstr(buf, name);
if(p){ if(p){
/*
*
* Some examples from http://tools.ietf.org/html/rfc5987:
*
* Non-extended notation, using "token":
*
* foo: bar; title=Economy
*
* Non-extended notation, using "quoted-string":
*
* foo: bar; title="US-$ rates"
*
* Extended notation, using the Unicode character U+00A3 (POUND SIGN):
*
* foo: bar; title*=iso-8859-1'en'%A3%20rates
*
* Extended notation, using the Unicode characters U+00A3 (POUND SIGN) and U+20AC (EURO SIGN):
*
* foo: bar; title*=UTF-8''%c2%a3%20and%20%e2%82%ac%20rates
*
*/
p += strlen(name); p += strlen(name);
if(*p == '*'){
extended = 1;
}
p = strchr(p, '='); p = strchr(p, '=');
if(p){ if(p){
p++; p++;
@ -754,11 +781,29 @@ int extractNameFromHeaderLine(char *s, char *name, char *resultbuf){
} }
} }
snprintf(puf, sizeof(puf)-1, "%s", p); if(extended == 1){
encoding = p;
q = strchr(p, '\'');
if(q){
*q = '\0';
p = q + 1;
q = strchr(p, '\'');
if(q) p = q + 1;
}
fixupEncodedHeaderLine(puf, sizeof(puf)); decodeURL(p);
snprintf(resultbuf, TINYBUFSIZE-1, "%s", puf); if(strlen(encoding) > 2 && strcasecmp(encoding, "utf-8"))
utf8_encode(p, strlen(p), resultbuf, TINYBUFSIZE-1, encoding);
else
snprintf(resultbuf, TINYBUFSIZE-1, "%s", p);
}
else {
snprintf(puf, sizeof(puf)-1, "%s", p);
fixupEncodedHeaderLine(puf, sizeof(puf));
snprintf(resultbuf, TINYBUFSIZE-1, "%s", puf);
}
rc = 1; rc = 1;
} }