Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-15 22:44:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed to map us-ascii to Latin1 for unicode coversion.

Browse Source
This commit is contained in:
nhotta%netscape.com 1999-04-06 02:08:34 +00:00
parent d3c78aa540
commit e60bf4fc19
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mailnews/mime/src/comi18n.cpp
View File

@ -1534,7 +1534,10 @@ PRUint32 MIME_ConvertCharset(const char* from_charset, const char* to_charset,
PRUint32 MIME_ConvertToUnicode(const char* from_charset, const char* inCstring,
void** uniBuffer, PRInt32* uniLength)
{
return INTL_ConvertToUnicode(from_charset, inCstring, PL_strlen(inCstring), uniBuffer, uniLength);
char charset[kMAX_CSNAME];
// Since we don't have a converter us-ascii and the manager does not map, we do the mapping here.
PL_strcpy(charset, PL_strcasecmp(from_charset, "us-ascii") ? (char *) from_charset : "iso-8859-1");
return INTL_ConvertToUnicode(charset, inCstring, PL_strlen(inCstring), uniBuffer, uniLength);
}
PRUint32 MIME_ConvertFromUnicode(const char* to_charset, const void* uniBuffer, const PRInt32 uniLength,
@ -1550,9 +1553,10 @@ extern "C" char *MIME_DecodeMimePartIIStr(const char *header, char *charset)
if (header == 0)
return nsnull;
// No MIME encoded, duplicate the input
if (*header == '\0' || intlmime_is_mime_part2_header(header)) {
// No MIME encoded, duplicate the input and put us-ascii as a charset
if (*header == '\0' || !intlmime_is_mime_part2_header(header)) {
result = PL_strdup(header);
PL_strcpy(charset, "us-ascii");
}
else {
char *header_copy = PL_strdup(header); // avoid to modify the original string