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

Re-write RFC-2047 encoder. bug 73403 12699 37088 98675 102610 104447 119079, r=nhotta, sr=mscott

This commit is contained in:
taka%netscape.com 2002-02-20 07:18:11 +00:00
Родитель 309ddcb648
Коммит e58d69c8eb
11 изменённых файлов: 677 добавлений и 961 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
mailnews/base/util/nsMsgI18N.cpp
Просмотреть файл

@ -393,10 +393,10 @@ const char * nsMsgI18NFileSystemCharset()
}
// MIME encoder, output string should be freed by PR_FREE
char * nsMsgI18NEncodeMimePartIIStr(const char *header, const char *charset, PRBool bUseMime)
char * nsMsgI18NEncodeMimePartIIStr(const char *header, PRBool structured, const char *charset, PRInt32 fieldnamelen, PRBool usemime)
{
// No MIME, convert to the outgoing mail charset.
if (PR_FALSE == bUseMime) {
if (PR_FALSE == usemime) {
char *convertedStr;
if (NS_SUCCEEDED(ConvertFromUnicode(charset, NS_ConvertUTF8toUCS2(header), &convertedStr)))
return (convertedStr);
@ -408,7 +408,7 @@ char * nsMsgI18NEncodeMimePartIIStr(const char *header, const char *charset, PRB
nsresult res;
nsCOMPtr<nsIMimeConverter> converter = do_GetService(kCMimeConverterCID, &res);
if (NS_SUCCEEDED(res) && nsnull != converter)
res = converter->EncodeMimePartIIStr_UTF8(header, charset, kMIME_ENCODED_WORD_SIZE, &encodedString);
res = converter->EncodeMimePartIIStr_UTF8(header, structured, charset, fieldnamelen, kMIME_ENCODED_WORD_SIZE, &encodedString);
return NS_SUCCEEDED(res) ? encodedString : nsnull;
}

12
mailnews/base/util/nsMsgI18N.h
Просмотреть файл

@ -49,12 +49,14 @@ class nsFileSpec;
/**
* Encode an input string into RFC 2047 form.
*
* @param header [IN] A header to encode.
* @param charset [IN] Charset name to convert.
* @param bUseMime [IN] If false then apply charset conversion only no MIME encoding.
* @return Encoded buffer (in C string) or NULL in case of error.
* @param header [IN] A header to encode.
* @param structured [IN] Specify the header is structured or non-structured field (See RFC-822).
* @param charset [IN] Charset name to convert.
* @param fieldnamelen [IN] Header field name length. (e.g. "From: " -> 6)
* @param usemime [IN] If false then apply charset conversion only no MIME encoding.
* @return Encoded buffer (in C string) or NULL in case of error.
*/
NS_MSG_BASE char *nsMsgI18NEncodeMimePartIIStr(const char *header, const char *charset, PRBool bUseMime);
NS_MSG_BASE char *nsMsgI18NEncodeMimePartIIStr(const char *header, PRBool structured, const char *charset, PRInt32 fieldnamelen, PRBool usemime);
/**
* Check if given charset is stateful (e.g. ISO-2022-JP).

203
mailnews/compose/src/nsMsgCompUtils.cpp
Просмотреть файл

@ -220,6 +220,19 @@ nsMsgStripLine (char * string)
//
#define UA_PREF_PREFIX "general.useragent."
#define ENCODE_AND_PUSH(name, structured, body, charset, usemime) \
{ \
PUSH_STRING((name)); \
convbuf = nsMsgI18NEncodeMimePartIIStr((body), (structured), (charset), nsCRT::strlen(name), (usemime)); \
if (convbuf) { \
PUSH_STRING (convbuf); \
PR_FREEIF(convbuf); \
} \
else \
PUSH_STRING((body)); \
PUSH_NEWLINE (); \
}
char *
mime_generate_headers (nsMsgCompFields *fields,
const char *charset,
@ -234,7 +247,8 @@ mime_generate_headers (nsMsgCompFields *fields,
return nsnull;
}
int size = 0;
PRBool usemime = nsMsgMIMEGetConformToStandard();
PRInt32 size = 0;
char *buffer = 0, *buffer_tail = 0;
PRBool isDraft =
deliver_mode == nsIMsgSend::nsMsgSaveAsDraft ||
@ -253,6 +267,7 @@ mime_generate_headers (nsMsgCompFields *fields,
const char* pPriority;
const char* pReference;
const char* pOtherHdr;
char *convbuf;
nsCAutoString headerBuf; // accumulate header strings for charset conversion check
headerBuf.Truncate(0);
@ -313,7 +328,6 @@ mime_generate_headers (nsMsgCompFields *fields,
buffer_tail = buffer;
if (pMessageID && *pMessageID) {
char *convbuf = NULL;
PUSH_STRING ("Message-ID: ");
PUSH_STRING (pMessageID);
PUSH_NEWLINE ();
@ -336,49 +350,20 @@ mime_generate_headers (nsMsgCompFields *fields,
// 0 = MDN Disposition-Notification-To: ; 1 = Return-Receipt-To: ; 2 =
// both MDN DNT & RRT headers
if (receipt_header_type == 1) {
RRT_HEADER:
PUSH_STRING ("Return-Receipt-To: ");
convbuf = nsMsgI18NEncodeMimePartIIStr((char *)pFrom, charset, nsMsgMIMEGetConformToStandard());
if (convbuf) { /* MIME-PartII conversion */
PUSH_STRING (convbuf);
PR_FREEIF(convbuf);
}
else
PUSH_STRING (pFrom);
PUSH_NEWLINE ();
RRT_HEADER:
ENCODE_AND_PUSH("Return-Receipt-To: ", PR_TRUE, pFrom, charset, usemime);
}
else {
PUSH_STRING ("Disposition-Notification-To: ");
convbuf = nsMsgI18NEncodeMimePartIIStr((char *)pFrom, charset,
nsMsgMIMEGetConformToStandard());
if (convbuf) { /* MIME-PartII conversion */
PUSH_STRING (convbuf);
PR_FREEIF(convbuf);
}
else
PUSH_STRING (pFrom);
PUSH_NEWLINE ();
ENCODE_AND_PUSH("Disposition-Notification-To: ", PR_TRUE, pFrom, charset, usemime);
if (receipt_header_type == 2)
goto RRT_HEADER;
}
}
#ifdef SUPPORT_X_TEMPLATE_NAME
if (deliver_mode == MSG_SaveAsTemplate) {
PUSH_STRING ("X-Template: ");
char * pStr = fields->GetTemplateName();
if (pStr) {
convbuf = nsMsgI18NEncodeMimePartIIStr((char *)
pStr,
charset,
nsMsgMIMEGetConformToStandard());
if (convbuf) {
PUSH_STRING (convbuf);
PR_FREEIF(convbuf);
}
else
PUSH_STRING(pStr);
}
PUSH_NEWLINE ();
const char *pStr = fields->GetTemplateName();
pStr = pStr ? pStr : "";
ENCODE_AND_PUSH("X-Template: ", PR_FALSE, pStr, charset, usemime);
}
#endif /* SUPPORT_X_TEMPLATE_NAME */
}
@ -400,53 +385,23 @@ mime_generate_headers (nsMsgCompFields *fields,
PR_snprintf(buffer_tail, buffer + size - buffer_tail,
"%c%02d%02d" CRLF,
(gmtoffset >= 0 ? '+' : '-'),
(PR_ABS(gmtoffset) / 60),
(PR_ABS(gmtoffset) % 60));
((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60),
((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60));
buffer_tail += PL_strlen (buffer_tail);
if (pFrom && *pFrom) {
char *convbuf;
PUSH_STRING ("From: ");
convbuf = nsMsgI18NEncodeMimePartIIStr((char *)pFrom, charset,
nsMsgMIMEGetConformToStandard());
if (convbuf) { /* MIME-PartII conversion */
PUSH_STRING (convbuf);
PR_Free(convbuf);
}
else
PUSH_STRING (pFrom);
PUSH_NEWLINE ();
if (pFrom && *pFrom)
{
ENCODE_AND_PUSH("From: ", PR_TRUE, pFrom, charset, usemime);
}
if (pReplyTo && *pReplyTo)
{
char *convbuf;
PUSH_STRING ("Reply-To: ");
convbuf = nsMsgI18NEncodeMimePartIIStr((char *)pReplyTo, charset,
nsMsgMIMEGetConformToStandard());
if (convbuf) { /* MIME-PartII conversion */
PUSH_STRING (convbuf);
PR_Free(convbuf);
}
else
PUSH_STRING (pReplyTo);
PUSH_NEWLINE ();
ENCODE_AND_PUSH("Reply-To: ", PR_TRUE, pReplyTo, charset, usemime);
}
if (pOrg && *pOrg)
{
char *convbuf;
PUSH_STRING ("Organization: ");
convbuf = nsMsgI18NEncodeMimePartIIStr((char *)pOrg, charset,
nsMsgMIMEGetConformToStandard());
if (convbuf) { /* MIME-PartII conversion */
PUSH_STRING (convbuf);
PR_Free(convbuf);
}
else
PUSH_STRING (pOrg);
PUSH_NEWLINE ();
ENCODE_AND_PUSH("Organization: ", PR_FALSE, pOrg, charset, usemime);
}
// X-Mozilla-Draft-Info
@ -509,26 +464,14 @@ mime_generate_headers (nsMsgCompFields *fields,
if (pNewsGrp && *pNewsGrp) {
/* turn whitespace into a comma list
*/
char *ptr, *ptr2;
char *n2;
char *convbuf;
convbuf = nsMsgI18NEncodeMimePartIIStr((char *)pNewsGrp, charset,
nsMsgMIMEGetConformToStandard());
if (convbuf)
n2 = nsMsgStripLine (convbuf);
else {
ptr = PL_strdup(pNewsGrp);
if (!ptr) {
PR_FREEIF(buffer);
return nsnull; /* NS_ERROR_OUT_OF_MEMORY */
}
n2 = nsMsgStripLine(ptr);
NS_ASSERTION(n2 == ptr, "n2 != ptr"); /* Otherwise, the PR_Free below is
gonna choke badly. */
char *duppedNewsGrp = PL_strdup(pNewsGrp);
if (!duppedNewsGrp) {
PR_FREEIF(buffer);
return nsnull; /* NS_ERROR_OUT_OF_MEMORY */
}
char *n2 = nsMsgStripLine(duppedNewsGrp);
for(ptr=n2; *ptr != '\0'; ptr++) {
for(char *ptr = n2; *ptr != '\0'; ptr++) {
/* find first non white space */
while(!IS_SPACE(*ptr) && *ptr != ',' && *ptr != '\0')
ptr++;
@ -540,7 +483,7 @@ mime_generate_headers (nsMsgCompFields *fields,
*ptr = ',';
/* find next non white space */
ptr2 = ptr+1;
char *ptr2 = ptr+1;
while(IS_SPACE(*ptr2))
ptr2++;
@ -590,33 +533,21 @@ mime_generate_headers (nsMsgCompFields *fields,
PUSH_NEWLINE ();
}
PR_FREEIF(n2);
PR_FREEIF(duppedNewsGrp);
}
/* #### shamelessly duplicated from above */
if (pFollow && *pFollow) {
/* turn whitespace into a comma list
*/
char *ptr, *ptr2;
char *n2;
char *convbuf;
convbuf = nsMsgI18NEncodeMimePartIIStr((char *)pFollow, charset,
nsMsgMIMEGetConformToStandard());
if (convbuf)
n2 = nsMsgStripLine (convbuf);
else {
ptr = PL_strdup(pFollow);
if (!ptr) {
PR_FREEIF(buffer);
return nsnull; /* NS_ERROR_OUT_OF_MEMORY */
}
n2 = nsMsgStripLine (ptr);
NS_ASSERTION(n2 == ptr, "n2 != ptr"); /* Otherwise, the PR_Free below is
gonna choke badly. */
char *duppedFollowup = PL_strdup(pFollow);
if (!duppedFollowup) {
PR_FREEIF(buffer);
return nsnull; /* NS_ERROR_OUT_OF_MEMORY */
}
char *n2 = nsMsgStripLine (duppedFollowup);
for (ptr=n2; *ptr != '\0'; ptr++) {
for (char *ptr = n2; *ptr != '\0'; ptr++) {
/* find first non white space */
while(!IS_SPACE(*ptr) && *ptr != ',' && *ptr != '\0')
ptr++;
@ -628,7 +559,7 @@ mime_generate_headers (nsMsgCompFields *fields,
*ptr = ',';
/* find next non white space */
ptr2 = ptr+1;
char *ptr2 = ptr+1;
while(IS_SPACE(*ptr2))
ptr2++;
@ -638,52 +569,20 @@ mime_generate_headers (nsMsgCompFields *fields,
PUSH_STRING ("Followup-To: ");
PUSH_STRING (n2);
PR_Free (n2);
PR_Free (duppedFollowup);
PUSH_NEWLINE ();
}
if (pTo && *pTo) {
char *convbuf;
PUSH_STRING ("To: ");
convbuf = nsMsgI18NEncodeMimePartIIStr((char *)pTo, charset,
nsMsgMIMEGetConformToStandard());
if (convbuf) { /* MIME-PartII conversion */
PUSH_STRING (convbuf);
PR_Free(convbuf);
}
else
PUSH_STRING (pTo);
PUSH_NEWLINE ();
ENCODE_AND_PUSH("To: ", PR_TRUE, pTo, charset, usemime);
}
if (pCc && *pCc) {
char *convbuf;
PUSH_STRING ("CC: ");
convbuf = nsMsgI18NEncodeMimePartIIStr((char *)pCc, charset,
nsMsgMIMEGetConformToStandard());
if (convbuf) { /* MIME-PartII conversion */
PUSH_STRING (convbuf);
PR_Free(convbuf);
}
else
PUSH_STRING (pCc);
PUSH_NEWLINE ();
ENCODE_AND_PUSH("CC: ", PR_TRUE, pCc, charset, usemime);
}
if (pSubject && *pSubject) {
char *convbuf;
PUSH_STRING ("Subject: ");
convbuf = nsMsgI18NEncodeMimePartIIStr((char *)pSubject, charset,
nsMsgMIMEGetConformToStandard());
if (convbuf) { /* MIME-PartII conversion */
PUSH_STRING (convbuf);
PR_Free(convbuf);
}
else
PUSH_STRING (pSubject);
PUSH_NEWLINE ();
ENCODE_AND_PUSH("Subject: ", PR_FALSE, pSubject, charset, usemime);
}
if (pPriority && *pPriority)
@ -809,6 +708,7 @@ mime_generate_attachment_headers (const char *type, const char *encoding,
NS_ASSERTION (encoding, "null encoding");
PRBool usemime = nsMsgMIMEGetConformToStandard();
PRInt32 parmFolding = 0;
if (NS_SUCCEEDED(rv) && prefs)
prefs->GetIntPref("mail.strictly_mime.parm_folding", &parmFolding);
@ -817,12 +717,11 @@ mime_generate_attachment_headers (const char *type, const char *encoding,
char *encodedRealName = nsnull;
if (real_name)
{
encodedRealName = nsMsgI18NEncodeMimePartIIStr(real_name,
nsMsgI18NFileSystemCharset(), nsMsgMIMEGetConformToStandard());
encodedRealName = nsMsgI18NEncodeMimePartIIStr(real_name, PR_FALSE, nsMsgI18NFileSystemCharset(), 0, usemime);
if (!encodedRealName || !*encodedRealName)
{
/* Let's try one more time using UTF8 */
encodedRealName = nsMsgI18NEncodeMimePartIIStr(real_name, "UTF-8", nsMsgMIMEGetConformToStandard());
encodedRealName = nsMsgI18NEncodeMimePartIIStr(real_name, PR_FALSE, "UTF-8", 0, usemime);
if (!encodedRealName || !*encodedRealName)
{
PR_FREEIF(encodedRealName);

9
mailnews/compose/src/nsMsgSend.cpp
Просмотреть файл

@ -3001,10 +3001,9 @@ nsMsgComposeAndSend::DeliverMessage()
PRBool news_p = (mCompFields->GetNewsgroups() &&
*(mCompFields->GetNewsgroups()) ? PR_TRUE : PR_FALSE);
if ( m_deliver_mode != nsMsgSaveAsDraft &&
m_deliver_mode != nsMsgSaveAsTemplate )
if ( m_deliver_mode != nsMsgSaveAsDraft && m_deliver_mode != nsMsgSaveAsTemplate ) {
NS_ASSERTION(mail_p || news_p, "message without destination");
}
if (m_deliver_mode == nsMsgQueueForLater)
{
return QueueForLater();
@ -3161,8 +3160,8 @@ nsMsgComposeAndSend::DeliverFileAsMail()
}
// Ok, now MIME II encode this to prevent 8bit problems...
char *convbuf = nsMsgI18NEncodeMimePartIIStr((char *)buf, mCompFields->GetCharacterSet(),
nsMsgMIMEGetConformToStandard());
char *convbuf = nsMsgI18NEncodeMimePartIIStr(buf, PR_TRUE,
mCompFields->GetCharacterSet(), 0, nsMsgMIMEGetConformToStandard());
if (convbuf)
{
// MIME-PartII conversion

4
mailnews/mime/public/nsIMimeConverter.h
Просмотреть файл

@ -85,13 +85,17 @@ public:
// Encode routine
NS_IMETHOD EncodeMimePartIIStr(const char *header,
PRBool structured,
const char *mailCharset,
PRInt32 fieldnamelen,
const PRInt32 encodedWordSize,
char **encodedString) = 0;
// Encode routine (utf-8 input)
NS_IMETHOD EncodeMimePartIIStr_UTF8(const char *header,
PRBool structured,
const char *mailCharset,
PRInt32 fieldnamelen,
const PRInt32 encodedWordSize,
char **encodedString) = 0;

1382
mailnews/mime/src/comi18n.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

4
mailnews/mime/src/comi18n.h
Просмотреть файл

@ -80,11 +80,13 @@ extern "C" char *MIME_DecodeMimeHeader(const char *header,
*
*
* @param header [IN] A header to encode (utf-8 Cstring).
* @param structured [IN] A boolean to swtich between structured field body and non-structured field body.
* @param mailCharset [IN] Charset name (in C string) to convert.
* @param fieldNameLen [IN] Header field name length (e.g. "From: " -> 6)
* @param encodedWordSize [IN] Byte length limit of the output, ususally 72 (use kMIME_ENCODED_WORD_SIZE).
* @return Encoded buffer (in C string) or NULL in case of error.
*/
char *MIME_EncodeMimePartIIStr(const char *header, const char* mailCharset, const PRInt32 encodedWordSize);
char *MIME_EncodeMimePartIIStr(const char *header, PRBool structured, const char* mailCharset, const PRInt32 fieldNameLen, const PRInt32 encodedWordSize);
/**
* Get a next character position in an UTF-8 string.

4
mailnews/mime/src/mimehdrs.cpp
Просмотреть файл

@ -56,10 +56,10 @@
#include "nsMimeStringResources.h"
#include "mimemoz2.h"
#include "nsMsgI18N.h"
#include "mimehdrs.h"
// Forward declares...
extern "C" char *MIME_StripContinuations(char *original);
int MimeHeaders_build_heads_list(MimeHeaders *hdrs);
PRInt32 MimeHeaders_build_heads_list(MimeHeaders *hdrs);
static char *
MimeHeaders_convert_header_value(MimeDisplayOptions *opt, char **value)

2
mailnews/mime/src/mimehdrs.h
Просмотреть файл

@ -109,4 +109,6 @@ extern char *MimeHeaders_get_name(MimeHeaders *hdrs, MimeDisplayOptions *opt);
extern char *mime_decode_filename(char *name, const char* charset,
MimeDisplayOptions *opt);
extern "C" char * MIME_StripContinuations(char *original);
#endif /* _MIMEHDRS_H_ */

8
mailnews/mime/src/nsMimeConverter.cpp
Просмотреть файл

@ -133,7 +133,9 @@ nsMimeConverter::DecodeMimeHeader(const char *header,
nsresult
nsMimeConverter::EncodeMimePartIIStr(const char *header,
PRBool structured,
const char *mailCharset,
PRInt32 fieldnamelen,
const PRInt32 encodedWordSize,
char **encodedString)
{
@ -142,17 +144,19 @@ nsMimeConverter::EncodeMimePartIIStr(const char *header,
nsAutoString tempUnicodeString;
nsresult rv = ConvertToUnicode(mailCharset, header, tempUnicodeString);
NS_ENSURE_SUCCESS(rv, rv);
rv = EncodeMimePartIIStr_UTF8(NS_ConvertUCS2toUTF8(tempUnicodeString).get(), mailCharset, encodedWordSize, encodedString);
rv = EncodeMimePartIIStr_UTF8(NS_ConvertUCS2toUTF8(tempUnicodeString).get(), structured, mailCharset, fieldnamelen, encodedWordSize, encodedString);
return rv;
}
nsresult
nsMimeConverter::EncodeMimePartIIStr_UTF8(const char *header,
PRBool structured,
const char *mailCharset,
PRInt32 fieldnamelen,
const PRInt32 encodedWordSize,
char **encodedString)
{
char *retString = MIME_EncodeMimePartIIStr(header, mailCharset, encodedWordSize);
char *retString = MIME_EncodeMimePartIIStr(header, structured, mailCharset, fieldnamelen, encodedWordSize);
if (retString == NULL)
return NS_ERROR_FAILURE;
else

4
mailnews/mime/src/nsMimeConverter.h
Просмотреть файл

@ -78,13 +78,17 @@ public:
// Encode routine
NS_IMETHOD EncodeMimePartIIStr(const char *header,
PRBool structured,
const char *mailCharset,
PRInt32 fieldnamelen,
const PRInt32 encodedWordSize,
char **encodedString);
// Encode routine (utf-8 input)
NS_IMETHOD EncodeMimePartIIStr_UTF8(const char *header,
PRBool structured,
const char *mailCharset,
PRInt32 fieldnamelen,
const PRInt32 encodedWordSize,
char **encodedString);