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

Small fixes

Browse Source
This commit is contained in:
Alexander S. Aganichev 2001-05-25 03:43:20 +00:00
parent 383290c2ee
commit d8ca130bd0
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GNUmakef.def
View File

@ -3,7 +3,7 @@
ifeq ($(findstring EMX, $(PATH)), EMX) ifeq ($(findstring EMX, $(PATH)), EMX)
CC=gcc CC=gcc
AR=ar AR=ar
RANLIB=ranlib RANLIB=ar s
PLATFORM=emx PLATFORM=emx
SHELL=bash SHELL=bash
EXEEXT=.exe EXEEXT=.exe
@ -11,7 +11,7 @@ OBJEXT=.o
LIBEXT=.a LIBEXT=.a
#CC=gcc -Zomf #CC=gcc -Zomf
#AR=emxomfar #AR=emxomfar
#RANLIB=ranlib #RANLIB=emxomfar s
#PLATFORM=emx #PLATFORM=emx
#SHELL=bash #SHELL=bash
#EXEEXT=.exe #EXEEXT=.exe

28
golded3/gectrl.cpp
View File

@ -422,24 +422,26 @@ void DoKludges(int mode, GMsg* msg, bool attronly) {
char to_buf[256]; char to_buf[256];
*to_buf = NUL; *to_buf = NUL;
if(*msg->idest or strchr(msg->to, '@')) { if(AA->isemail() and (*msg->ito or strchr(msg->to, '@'))) {
char* ptr = *msg->idest ? msg->idest : msg->to; char* ptr = *msg->ito ? msg->ito : msg->to;
sprintf(to_buf, "%s%sTo: %s", rfc, AA->isnewsgroup() ? "X-" : "", ptr); mime_header_encode(buf, ptr, msg);
if(not strieql(ptr, msg->realto) and *msg->realto) { sprintf(to_buf, "%s%sTo: %s", rfc, AA->isnewsgroup() ? "X-" : "", buf);
mime_header_encode(buf, msg->realto, msg);
sprintf(buf2, " (%s)", buf);
strcat(to_buf, buf2);
}
}
if(*to_buf and AA->isemail()) {
line = AddKludge(line, to_buf); line = AddKludge(line, to_buf);
line->kludge = GKLUD_RFC; line->kludge = GKLUD_RFC;
} }
if(*msg->iorig) { if(*msg->ifrom) {
mime_header_encode(buf2, msg->ifrom, msg);
sprintf(buf, "%sFrom: %s", rfc, buf2);
line = AddKludge(line, buf);
line->kludge = GKLUD_RFC;
}
else if(*msg->iorig) {
mime_header_encode(buf2, msg->By(), msg); mime_header_encode(buf2, msg->By(), msg);
sprintf(buf, "%sFrom: \"%s\" <%s>", rfc, buf2, msg->iorig); if(*buf2)
sprintf(buf, "%sFrom: \"%s\" <%s>", rfc, buf2, msg->iorig);
else
sprintf(buf, "%sFrom: %s", rfc, msg->iorig);
line = AddKludge(line, buf); line = AddKludge(line, buf);
line->kludge = GKLUD_RFC; line->kludge = GKLUD_RFC;
} }

8
golded3/gehdre.cpp
View File

@ -450,14 +450,14 @@ int EditHeaderinfo(int mode, GMsgHeaderView &view) {
strcpy(msg->realto, msg->to); strcpy(msg->realto, msg->to);
strcpy(msg->iorig, from_addr.c_str()); strcpy(msg->iorig, from_addr.c_str());
strcpy(msg->idest, to_addr.c_str()); strcpy(msg->idest, to_addr.c_str());
if(*msg->realby) if(*msg->realby and *msg->iorig)
sprintf(msg->ifrom, "\"%s\" <%s>", msg->realby, msg->iorig); sprintf(msg->ifrom, "\"%s\" <%s>", msg->realby, msg->iorig);
else else
sprintf(msg->ifrom, "%s", msg->iorig); strcpy(msg->ifrom, msg->iorig);
if(*msg->realto) if(*msg->realto)
sprintf(msg->ito, "\"%s\" %s", msg->realto, msg->idest); sprintf(msg->ito, "\"%s\" <%s>", msg->realto, msg->idest);
else else
sprintf(msg->ito, "%s", msg->idest); strcpy(msg->ito, msg->idest);
if(msg->orig.net == 0) if(msg->orig.net == 0)
msg->orig = msg->oorig = AA->Aka().addr; msg->orig = msg->oorig = AA->Aka().addr;
if(msg->dest.net == 0) if(msg->dest.net == 0)