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

Small updates for mailreading

Browse Source
This commit is contained in:
Michiel Broek 2007-03-01 15:20:22 +00:00
parent bce8145f4c
commit 617377f403
1 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mbsebbs/email.c
View File

@ -142,17 +142,20 @@ void ShowEmailHdr(void)
/* From : */ /* From : */
pout(YELLOW, BLACK, (char *) Language(209)); pout(YELLOW, BLACK, (char *) Language(209));
pout(LIGHTGREEN, BLACK, Msg.From); colour(LIGHTGREEN, BLACK);
PUTSTR(chartran(Msg.From));
Enter(1); Enter(1);
/* To : */ /* To : */
pout(YELLOW, BLACK, (char *) Language(208)); pout(YELLOW, BLACK, (char *) Language(208));
pout(LIGHTGREEN, BLACK, Msg.To); colour(LIGHTGREEN, BLACK);
PUTSTR(chartran(Msg.To));
Enter(1); Enter(1);
/* Subject : */ /* Subject : */
pout(YELLOW, BLACK, (char *) Language(210)); pout(YELLOW, BLACK, (char *) Language(210));
pout(LIGHTGREEN, BLACK, Msg.Subject); colour(LIGHTGREEN, BLACK);
PUTSTR(chartran(Msg.Subject));
Enter(1); Enter(1);
if (Msg.Reply) if (Msg.Reply)
@ -376,7 +379,7 @@ int Save_Email(int IsReply)
int Read_a_Email(unsigned int Num) int Read_a_Email(unsigned int Num)
{ {
char *p = NULL, *fn; char *p = NULL, *fn, *charset = NULL, *charsin = NULL;
lastread LR; lastread LR;
LastNum = Num; LastNum = Num;
@ -408,7 +411,6 @@ int Read_a_Email(unsigned int Num)
sleep(3); sleep(3);
return FALSE; return FALSE;
} }
ShowEmailHdr();
/* /*
* Fill Quote file in case the user wants to reply. Note that line * Fill Quote file in case the user wants to reply. Note that line
@ -422,6 +424,12 @@ int Read_a_Email(unsigned int Num)
if ((p = (char *)MsgText_First()) != NULL) if ((p = (char *)MsgText_First()) != NULL)
do { do {
if (p[0] == '\001') { if (p[0] == '\001') {
/*
* Check CHRS kludge
*/
if (strncmp(p, "\001CHRS: ", 7) == 0) {
charset = xstrcpy(p + 7);
}
/* /*
* While doing this, store the original Message-id in case * While doing this, store the original Message-id in case
* a reply will be made. * a reply will be made.
@ -444,6 +452,19 @@ int Read_a_Email(unsigned int Num)
} }
free(fn); free(fn);
if (charset == NULL) {
charsin = xstrcpy((char *)"CP437");
} else {
charsin = xstrcpy(get_ic_ftn(find_ftn_charset(charset)));
}}
/*
* Setup character translation
*/
chartran_init(charsin, get_ic_ftn(exitinfo.Charset), 'b');
ShowEmailHdr();
/* /*
* Show message text * Show message text
*/ */
@ -453,7 +474,10 @@ int Read_a_Email(unsigned int Num)
do { do {
if (p[0] == '\001') { if (p[0] == '\001') {
if (Kludges) { if (Kludges) {
pout(LIGHTGRAY, BLACK, p); colour(LIGHTGRAY, BLACK);
if (p[0] == '\001')
p[0] = 'a';
PUTSTR(chartran(p));
Enter(1); Enter(1);
if (CheckLine(CFG.TextColourF, CFG.TextColourB, TRUE)) if (CheckLine(CFG.TextColourF, CFG.TextColourB, TRUE))
break; break;
@ -463,7 +487,7 @@ int Read_a_Email(unsigned int Num)
if (strchr(p, '>') != NULL) if (strchr(p, '>') != NULL)
if ((strlen(p) - strlen(strchr(p, '>'))) < 10) if ((strlen(p) - strlen(strchr(p, '>'))) < 10)
colour(CFG.HiliteF, CFG.HiliteB); colour(CFG.HiliteF, CFG.HiliteB);
PUTSTR(p); PUTSTR(chartran(p));
Enter(1); Enter(1);
if (CheckLine(CFG.TextColourF, CFG.TextColourB, TRUE)) if (CheckLine(CFG.TextColourF, CFG.TextColourB, TRUE))
break; break;
@ -472,6 +496,12 @@ int Read_a_Email(unsigned int Num)
} }
} }
if (charset)
free(charset);
if (charsin)
free(charsin);
chartran_close();
/* /*
* Set the Received status on this message. * Set the Received status on this message.
*/ */