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

fixed bug 16584; CRCRLF not handled correctly. r=syd

Browse Source
This commit is contained in:
rickg%netscape.com 1999-10-19 08:52:30 +00:00
parent 6bf524bc9e
commit 2942a58e82
2 changed files with 60 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
htmlparser/src/nsHTMLTokens.cpp
View File

@ -443,24 +443,38 @@ nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode)
result=aScanner.ReadUntil(mTextValue,theTerminals,PR_TRUE,PR_FALSE);
if(NS_OK==result) {
result=aScanner.Peek(aChar);
if(((kCR==aChar) || (kNewLine==aChar)) && (NS_OK==result)) {
result=aScanner.GetChar(aChar); //strip off the \r
result=aScanner.Peek(aChar); //then see what's next.
if(NS_OK==result) {
switch(aChar) {
case kCR:
result=aScanner.GetChar(aChar); //strip off the \r
mTextValue.Append("\n\n");
break;
case kNewLine:
//which means we saw \r\n, which becomes \n
result=aScanner.GetChar(aChar); //strip off the \n
//now fall through on purpose...
default:
result=aScanner.GetChar(aChar); //strip off the char
PRUnichar theNextChar;
result=aScanner.Peek(theNextChar); //then see what's next.
switch(aChar) {
case kCR:
// result=aScanner.GetChar(aChar);
if(kLF==theNextChar) {
result=aScanner.GetChar(theNextChar);
}
else if(kCR==theNextChar) {
result=aScanner.GetChar(theNextChar);
result=aScanner.Peek(theNextChar); //then see what's next.
if(kLF==theNextChar) {
result=aScanner.GetChar(theNextChar);
}
mTextValue.Append("\n");
break;
}//switch
}//if
}
mTextValue.Append("\n");
break;
case kLF:
if((kLF==theNextChar) || (kCR==theNextChar)) {
result=aScanner.GetChar(theNextChar);
mTextValue.Append("\n");
}
mTextValue.Append("\n");
break;
default:
mTextValue.Append("\n");
break;
} //switch
}
else done=PR_TRUE;
}

46
parser/htmlparser/src/nsHTMLTokens.cpp
View File

@ -443,24 +443,38 @@ nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode)
result=aScanner.ReadUntil(mTextValue,theTerminals,PR_TRUE,PR_FALSE);
if(NS_OK==result) {
result=aScanner.Peek(aChar);
if(((kCR==aChar) || (kNewLine==aChar)) && (NS_OK==result)) {
result=aScanner.GetChar(aChar); //strip off the \r
result=aScanner.Peek(aChar); //then see what's next.
if(NS_OK==result) {
switch(aChar) {
case kCR:
result=aScanner.GetChar(aChar); //strip off the \r
mTextValue.Append("\n\n");
break;
case kNewLine:
//which means we saw \r\n, which becomes \n
result=aScanner.GetChar(aChar); //strip off the \n
//now fall through on purpose...
default:
result=aScanner.GetChar(aChar); //strip off the char
PRUnichar theNextChar;
result=aScanner.Peek(theNextChar); //then see what's next.
switch(aChar) {
case kCR:
// result=aScanner.GetChar(aChar);
if(kLF==theNextChar) {
result=aScanner.GetChar(theNextChar);
}
else if(kCR==theNextChar) {
result=aScanner.GetChar(theNextChar);
result=aScanner.Peek(theNextChar); //then see what's next.
if(kLF==theNextChar) {
result=aScanner.GetChar(theNextChar);
}
mTextValue.Append("\n");
break;
}//switch
}//if
}
mTextValue.Append("\n");
break;
case kLF:
if((kLF==theNextChar) || (kCR==theNextChar)) {
result=aScanner.GetChar(theNextChar);
mTextValue.Append("\n");
}
mTextValue.Append("\n");
break;
default:
mTextValue.Append("\n");
break;
} //switch
}
else done=PR_TRUE;
}