bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed charset problem

Browse Source
This commit is contained in:
Alexander S. Aganichev 2002-09-07 13:29:30 +00:00
parent 3b6ca67214
commit 3a37ed6049
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
golded3/geread2.cpp
View File

@ -581,16 +581,31 @@ int ExternUtil(GMsg *msg, ExtUtil *extutil) {
LoadText(msg, editorfile); LoadText(msg, editorfile);
EDIT->HardLines(hardlines); EDIT->HardLines(hardlines);
// Prepend "@CHRS: XLATLOCALSET 2\n" to force proper encoding if(not strstr(msg->txt, "\001CHRS:") and not strstr(msg->txt, "\001CHARSET:")) {
if(not AA->Viewkludge()) { // Prepend "@CHRS: XLATLOCALSET 2\n" to force proper encoding
char *msg_txt_chrs = (char *)throw_malloc(strlen(msg->txt)+strlen(CFG->xlatlocalset)+sizeof("\001CHRS: 2\r")+16); const char *charset = AA->Viewkludge() ? msg->charset : CFG->xlatlocalset;
sprintf(msg_txt_chrs, "\001CHRS: %s 2\r%s", CFG->xlatlocalset, msg->txt); char *msg_txt_chrs = (char *)throw_malloc(strlen(msg->txt)+strlen(charset)+sizeof("\001CHRS: 2\r")+16);
sprintf(msg_txt_chrs, "\001CHRS: %s 2\r%s", charset, msg->txt);
throw_free(msg->txt); throw_free(msg->txt);
msg->txt = msg_txt_chrs; msg->txt = msg_txt_chrs;
} }
// Ignore any kludge address found // Ignore any kludge address found
msg->TextToLines(CFG->dispmargin-(int)CFG->switches.get(disppagebar), false); msg->TextToLines(CFG->dispmargin-(int)CFG->switches.get(disppagebar), false);
if(AA->Viewkludge()) {
// Try to convert to the original codepage
char *inpcharset = msg->charset;
int level = LoadCharset(CFG->xlatlocalset, IsQuotedPrintable(inpcharset) ? ExtractPlainCharset(inpcharset) : inpcharset);
if(level) {
// do recode
char *msg_txt_chrs = (char *)throw_malloc(strlen(msg->txt)*3+16);
XlatStr(msg_txt_chrs, msg->txt, level, CharTable);
throw_free(msg->txt);
msg->txt = (char *)throw_realloc(msg_txt_chrs, strlen(msg_txt_chrs)+16);
}
}
msg->charsetlevel = LoadCharset(msg->charset, CFG->xlatlocalset);
} }
if(extutil->options & EXTUTIL_WIPE) if(extutil->options & EXTUTIL_WIPE)