Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back out my last change rev=1.86 because of a regression bug 92330, a=dbaron.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@99940 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nhotta%netscape.com 2001-07-26 14:11:21 +00:00
parent 3771703f6e
commit cd644310a0
1 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
mozilla/mailnews/mime/src/comi18n.cpp
View File

@ -1566,48 +1566,23 @@ PRInt32 MIME_ConvertCharset(const PRBool autoDetection, const char* from_charset
(!nsCRT::strcasecmp(from_charset,to_charset) ||
(!nsCRT::strcasecmp(from_charset,"us-ascii") && !nsCRT::strcasecmp(to_charset,"UTF-8")) ||
(!nsCRT::strcasecmp(from_charset,"UTF-8") && !nsCRT::strcasecmp(to_charset,"us-ascii")))) {
if (NULL != numUnConverted)
*numUnConverted = 0;
// make sure if the data is really ASCII in order to prevent generating illegal UTF-8
PRInt32 len = inLength;
PRBool bASCII = PR_TRUE;
// check 4 bytes at a time
for (PRUint32* p = (PRUint32 *) inBuffer; len > 3; p++) {
if (*p & (PRUint32)0x80808080) {
bASCII = PR_FALSE;
break;
}
len -= 4;
}
// check rest of the data
if (bASCII) {
for (PRUint8* p = (PRUint8 *) (inBuffer + inLength - len); len; p++) {
if (*p & (PRUint8)0x80) {
bASCII = PR_FALSE;
break;
}
len--;
}
}
if (bASCII) {
if (NULL != numUnConverted)
*numUnConverted = 0;
*outBuffer = (char *) PR_Malloc(inLength+1);
if (NULL != *outBuffer) {
nsCRT::memcpy(*outBuffer, inBuffer, inLength);
*outLength = inLength;
(*outBuffer)[inLength] = '\0';
return 0;
}
return -1;
*outBuffer = (char *) PR_Malloc(inLength+1);
if (NULL != *outBuffer) {
nsCRT::memcpy(*outBuffer, inBuffer, inLength);
*outLength = inLength;
(*outBuffer)[inLength] = '\0';
return 0;
}
return -1;
}
MimeCharsetConverterClass aMimeCharsetConverterClass;
PRInt32 res;
res = aMimeCharsetConverterClass.Initialize(nsCRT::strcasecmp(from_charset,"us-ascii") ? from_charset : "ISO-8859-1",
to_charset, autoDetection, -1);
res = aMimeCharsetConverterClass.Initialize(from_charset, to_charset, autoDetection, -1);
if (res != -1) {
res = aMimeCharsetConverterClass.Convert(inBuffer, inLength, outBuffer, outLength, NULL);