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

Fallback to CP437

Browse Source
This commit is contained in:
Michiel Broek 2007-03-01 20:02:34 +00:00
parent 2df7a90122
commit 902a3e96ce
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mbnntp/commands.c
View File

@ -182,17 +182,14 @@ void command_abhs(char *buf)
}
} while ((p = (char *)MsgText_Next()) != NULL);
}
Syslog('n', "1 charset=\"%s\"", printable(charset, 0));
if (charset == NULL) {
if (msgs.Charset != FTNC_NONE) {
charset = xstrcpy(getftnchrs(msgs.Charset));
} else if (usercharset != FTNC_NONE) {
charset = xstrcpy(getftnchrs(msgs.Charset));
} else {
/*
* Missing CHRS kludge, must be an ancient DOS program that
* created this message.
*/
charset = xstrcpy((char *)"CP437");
}
}
Syslog('n', "2 charset=\"%s\"", printable(charset, 0));
charindex = find_ftn_charset(charset);
@ -204,7 +201,7 @@ void command_abhs(char *buf)
if ((strcasecmp(cmd, "ARTICLE") == 0) || (strcasecmp(cmd, "HEAD") == 0)) {
send_nntp("Path: MBNNTP!not-for-mail");
send_nntp("From: %s <%s>", Msg.From, Msg.FromAddress);
send_nntp("From: %s <%s>", chartran(Msg.From), Msg.FromAddress);
send_nntp("Newsgroups: %s", currentgroup);
asprintf(&subj,"Subject: %s", Msg.Subject);
send_xlat(subj);
@ -216,10 +213,6 @@ void command_abhs(char *buf)
/*
* Send RFC 2045 Multipurpose Internet Mail Extensions (MIME) header.
* Order is: 1. Charset defined in the FTN message
* 2. Charset of the message area
* 3. Charset of the user
* 4. Default us-ascii.
*/
send_nntp("MIME-Version: 1.0");
send_nntp("Content-Type: text/plain; charset=utf-8");