Fixed a bug when there is a partly Content-Type header
This commit is contained in:
parent
a78ed544a2
commit
33a7c3aebf
@ -214,6 +214,7 @@ int rfc2ftn(FILE *fp, faddr *recipient)
|
|||||||
if (q)
|
if (q)
|
||||||
while (*q && isspace(*q))
|
while (*q && isspace(*q))
|
||||||
q++;
|
q++;
|
||||||
|
|
||||||
if (!(q))
|
if (!(q))
|
||||||
q = (char *)"8bit";
|
q = (char *)"8bit";
|
||||||
if ((p = hdr((char *)"Content-Type",msg))) {
|
if ((p = hdr((char *)"Content-Type",msg))) {
|
||||||
@ -230,20 +231,22 @@ int rfc2ftn(FILE *fp, faddr *recipient)
|
|||||||
|
|
||||||
q = strtok(p, " \n\0");
|
q = strtok(p, " \n\0");
|
||||||
q = strtok(NULL, "; \n\0");
|
q = strtok(NULL, "; \n\0");
|
||||||
while (*q && isspace(*q))
|
if (q) {
|
||||||
q++;
|
while (*q && isspace(*q))
|
||||||
Syslog('m', "charset part: %s", printable(q, 0));
|
q++;
|
||||||
if (q && (strncasecmp(q, "charset=", 8) == 0)) {
|
Syslog('m', "charset part: %s", printable(q, 0));
|
||||||
/*
|
if (q && (strncasecmp(q, "charset=", 8) == 0)) {
|
||||||
* google.com quotes the charset name
|
/*
|
||||||
*/
|
* google.com quotes the charset name
|
||||||
if (strchr(q, '"')) {
|
*/
|
||||||
charset = xstrcpy(q + 9);
|
if (strchr(q, '"')) {
|
||||||
charset[strlen(charset)-1] = '\0';
|
charset = xstrcpy(q + 9);
|
||||||
} else {
|
charset[strlen(charset)-1] = '\0';
|
||||||
charset = xstrcpy(q + 8);
|
} else {
|
||||||
|
charset = xstrcpy(q + 8);
|
||||||
|
}
|
||||||
|
Syslog('m', "Charset \"%s\"", printable(charset, 0));
|
||||||
}
|
}
|
||||||
Syslog('m', "Charset \"%s\"", printable(charset, 0));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user