bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another charset parser fix

Browse Source
This commit is contained in:
Michiel Broek 2005-08-14 15:04:31 +00:00
parent 506a091e4c
commit 2b24f98a15
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mbfido/rfc2ftn.c
View File

@ -306,7 +306,7 @@ 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)) while (*q && isspace(*q))
q++; q++;
Syslog('m', "charset part: %s", printable(q, 0)); Syslog('m', "charset part: %s", printable(q, 0));
@ -321,11 +321,6 @@ int rfc2ftn(FILE *fp, faddr *recipient)
} else { } else {
charset = xstrcpy(q + 8); charset = xstrcpy(q + 8);
} }
/*
* Sometimes more information follows so there the charset looks like iso-8859-1;
*/
if (charset[strlen(charset)-1] == ';')
charset[strlen(charset)-1] = '\0';
Syslog('m', "Charset \"%s\"", printable(charset, 0)); Syslog('m', "Charset \"%s\"", printable(charset, 0));
} }
} }

7
mbnntp/rfc2ftn.c
View File

@ -262,7 +262,7 @@ int rfc2ftn(FILE *fp)
} }
q = strtok(p, " \n\0"); q = strtok(p, " \n\0");
q = strtok(NULL, " \n\0"); q = strtok(NULL, "; \n\0");
while (*q && isspace(*q)) while (*q && isspace(*q))
q++; q++;
Syslog('m', "charset part: %s", printable(q, 0)); Syslog('m', "charset part: %s", printable(q, 0));
@ -277,11 +277,6 @@ int rfc2ftn(FILE *fp)
} else { } else {
charset = xstrcpy(q + 8); charset = xstrcpy(q + 8);
} }
/*
* Sometimes more information follows so there the charset looks like iso-8859-1;
*/
if (charset[strlen(charset)-1] == ';')
charset[strlen(charset)-1] = '\0';
Syslog('m', "Charset \"%s\"", printable(charset, 0)); Syslog('m', "Charset \"%s\"", printable(charset, 0));
} }
} }