mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixed bug 20063 -- Linux Save Message As Template not working with correct line endings; r=mscott

This commit is contained in:
jefft%netscape.com 1999-11-26 22:37:03 +00:00
Родитель 506027739d
Коммит c0db98b3dc
1 изменённых файлов: 40 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

72
mailnews/imap/src/nsImapProtocol.cpp
Просмотреть файл

@ -2698,49 +2698,57 @@ void nsImapProtocol::HandleMessageDownLoadLine(const char *line, PRBool chunkEnd
if (localMessageLine)
strcpy(localMessageLine,line);
char *endOfLine = localMessageLine + strlen(localMessageLine);
PRBool needDummyEnvelope = PR_FALSE;
nsCOMPtr<nsIMsgMessageUrl> msgUrl = do_QueryInterface(m_runningUrl);
if (m_imapAction == nsIImapUrl::nsImapSaveMessageToDisk && msgUrl)
msgUrl->GetAddDummyEnvelope(&needDummyEnvelope);
if (!chunkEnd)
{
#if (MSG_LINEBREAK_LEN == 1)
if ((endOfLine - localMessageLine) >= 2 &&
endOfLine[-2] == CR &&
endOfLine[-1] == LF)
if (MSG_LINEBREAK_LEN == 1 && needDummyEnvelope)
{
if ((endOfLine - localMessageLine) >= 2 &&
endOfLine[-2] == CR &&
endOfLine[-1] == LF)
{
/* CRLF -> CR or LF */
endOfLine[-2] = MSG_LINEBREAK[0];
endOfLine[-1] = '\0';
/* CRLF -> CR or LF */
endOfLine[-2] = MSG_LINEBREAK[0];
endOfLine[-1] = '\0';
}
else if (endOfLine > localMessageLine + 1 &&
endOfLine[-1] != MSG_LINEBREAK[0] &&
((endOfLine[-1] == CR) || (endOfLine[-1] == LF)))
else if (endOfLine > localMessageLine + 1 &&
endOfLine[-1] != MSG_LINEBREAK[0] &&
((endOfLine[-1] == CR) || (endOfLine[-1] == LF)))
{
/* CR -> LF or LF -> CR */
endOfLine[-1] = MSG_LINEBREAK[0];
/* CR -> LF or LF -> CR */
endOfLine[-1] = MSG_LINEBREAK[0];
}
else // no eol characters at all
{
endOfLine[0] = MSG_LINEBREAK[0]; // CR or LF
endOfLine[1] = '\0';
}
#else
if (((endOfLine - localMessageLine) >= 2 && endOfLine[-2] != CR) ||
((endOfLine - localMessageLine) >= 1 && endOfLine[-1] != LF))
else // no eol characters at all
{
endOfLine[0] = MSG_LINEBREAK[0]; // CR or LF
endOfLine[1] = '\0';
}
}
else
{
if (((endOfLine - localMessageLine) >= 2 && endOfLine[-2] != CR) ||
((endOfLine - localMessageLine) >= 1 && endOfLine[-1] != LF))
{
if ((endOfLine[-1] == CR) || (endOfLine[-1] == LF))
{
if ((endOfLine[-1] == CR) || (endOfLine[-1] == LF))
{
/* LF -> CRLF or CR -> CRLF */
endOfLine[-1] = MSG_LINEBREAK[0];
endOfLine[0] = MSG_LINEBREAK[1];
endOfLine[1] = '\0';
}
else // no eol characters at all
{
endOfLine[0] = MSG_LINEBREAK[0]; // CR
endOfLine[1] = MSG_LINEBREAK[1]; // LF
endOfLine[2] = '\0';
endOfLine[-1] = MSG_LINEBREAK[0];
endOfLine[0] = MSG_LINEBREAK[1];
endOfLine[1] = '\0';
}
else // no eol characters at all
{
endOfLine[0] = MSG_LINEBREAK[0]; // CR
endOfLine[1] = MSG_LINEBREAK[1]; // LF
endOfLine[2] = '\0';
}
}
#endif
}
}
const char *xSenderInfo = GetServerStateParser().GetXSenderInfo();