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

All buffers used with TokenXlat function now are of variable size

Browse Source
This commit is contained in:
Ianos Gnatiuc 2006-02-20 21:44:10 +00:00
parent 49e3c5a857
commit 823a7c8699
13 changed files with 610 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/notework.txt
View File

@ -10,6 +10,14 @@ ______________________________________________________________________
Notes for GoldED+ 1.1.5, /snapshot/ Notes for GoldED+ 1.1.5, /snapshot/
______________________________________________________________________ ______________________________________________________________________
+ Macro @pad is recursive now.
Example: @pad{=C79}{ @oname{I}{You} }
! Changed macro @pipe{`command`} to @pipe{command}
- All buffers used with TokenXlat function now are of variable size.
This may prevent some buffer overflow bugs.
= Snapshot for the February 18, 2006. = Snapshot for the February 18, 2006.
+ Added new macro: @pipe{`command`}, that inserts command's stdout in + Added new macro: @pipe{`command`}, that inserts command's stdout in

13
golded3/gectrl.cpp
View File

@ -720,14 +720,15 @@ void DoTearorig(int mode, GMsg* msg) {
origin = AA->Origin(); origin = AA->Origin();
if(AA->Taglinesupport()) { if (AA->Taglinesupport())
{
if(*msg->tagline == '@') if(*msg->tagline == '@')
GetRandomLine(msg->tagline, sizeof(msg->tagline), msg->tagline+1); GetRandomLine(msg->tagline, sizeof(msg->tagline), msg->tagline+1);
TokenXlat(mode, msg->tagline, msg, msg, CurrArea); TokenXlat(mode, msg->tagline, sizeof(msg->tagline), msg, msg, CurrArea);
strbtrim(msg->tagline); strbtrim(msg->tagline);
} }
TokenXlat(mode, msg->tearline, msg, msg, CurrArea); TokenXlat(mode, msg->tearline, sizeof(msg->tearline), msg, msg, CurrArea);
ctrlinfo = AA->Ctrlinfo(); ctrlinfo = AA->Ctrlinfo();
@ -775,9 +776,9 @@ void DoTearorig(int mode, GMsg* msg) {
} }
MakeOrigin(msg, origin.c_str()); MakeOrigin(msg, origin.c_str());
TokenXlat(mode, msg->tagline, msg, msg, CurrArea); TokenXlat(mode, msg->tagline, sizeof(msg->tagline), msg, msg, CurrArea);
TokenXlat(mode, msg->tearline, msg, msg, CurrArea); TokenXlat(mode, msg->tearline, sizeof(msg->tearline), msg, msg, CurrArea);
TokenXlat(mode, msg->origin, msg, msg, CurrArea); TokenXlat(mode, msg->origin, sizeof(msg->origin), msg, msg, CurrArea);
// Add the tagline, tearline and origin as defined // Add the tagline, tearline and origin as defined
if(AA->Taglinesupport() and *msg->tagline) { if(AA->Taglinesupport() and *msg->tagline) {

2
golded3/gedoss.cpp
View File

@ -217,7 +217,7 @@ void Cleanup(void) {
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// Multipurpose DOS shell function // Multipurpose DOS shell function
int ShellToDos(char* command, char* message, vattr cls, int cursor, int pause) { int ShellToDos(const char* command, char* message, vattr cls, int cursor, int pause) {
int error = 0; int error = 0;

4
golded3/geedit2.cpp
View File

@ -1021,7 +1021,7 @@ void IEclass::editimport(Line* __line, char* __filename, bool imptxt) {
{ {
sprintf(_parabuf, "%s\n", CFG->importbegin); sprintf(_parabuf, "%s\n", CFG->importbegin);
strischg(_parabuf, "@file", imp_filename); strischg(_parabuf, "@file", imp_filename);
TokenXlat(MODE_NEW, _parabuf, msgptr, msgptr, CurrArea); TokenXlat(MODE_NEW, _parabuf, EDIT_PARABUFLEN, true, msgptr, msgptr, CurrArea);
_parabuf[strlen(_parabuf)-1] = '\n'; _parabuf[strlen(_parabuf)-1] = '\n';
_parabuf[margintext] = NUL; _parabuf[margintext] = NUL;
_parabuf[margintext-1] = '\n'; _parabuf[margintext-1] = '\n';
@ -1198,7 +1198,7 @@ void IEclass::editimport(Line* __line, char* __filename, bool imptxt) {
{ {
sprintf(_parabuf, "%s\n", *CFG->importend ? CFG->importend : CFG->importbegin); sprintf(_parabuf, "%s\n", *CFG->importend ? CFG->importend : CFG->importbegin);
strischg(_parabuf, "@file", imp_filename); strischg(_parabuf, "@file", imp_filename);
TokenXlat(MODE_NEW, _parabuf, msgptr, msgptr, CurrArea); TokenXlat(MODE_NEW, _parabuf, EDIT_PARABUFLEN, true, msgptr, msgptr, CurrArea);
_parabuf[strlen(_parabuf)-1] = '\n'; _parabuf[strlen(_parabuf)-1] = '\n';
_parabuf[margintext] = NUL; _parabuf[margintext] = NUL;
_parabuf[margintext-1] = '\n'; _parabuf[margintext-1] = '\n';

15
golded3/gefile.cpp
View File

@ -478,10 +478,11 @@ void FileSelect(GMsg* msg, char* title, FileSpec* fspec) {
// ------------------------------------------------------------------ // ------------------------------------------------------------------
void CreateFileAddr(GMsg* msg) { void CreateFileAddr(GMsg* msg)
{
// Create message // Create message
char* _txt; std::string _txt;
if(msg->attr.att()) if(msg->attr.att())
_txt = LNG->AutoAttachMsg; _txt = LNG->AutoAttachMsg;
else if(msg->attr.frq()) else if(msg->attr.frq())
@ -490,9 +491,11 @@ void CreateFileAddr(GMsg* msg) {
_txt = LNG->AutoUpdreqMsg; _txt = LNG->AutoUpdreqMsg;
else else
_txt = LNG->EmptyMsg; _txt = LNG->EmptyMsg;
msg->txt = (char*)throw_realloc(msg->txt, strlen(_txt)+256);
strcpy(msg->txt, _txt); TokenXlat(MODE_NEW, _txt, msg, msg, CurrArea);
TokenXlat(MODE_NEW, msg->txt, msg, msg, CurrArea);
msg->txt = (char*)throw_realloc(msg->txt, _txt.length()+1);
strcpy(msg->txt, _txt.c_str());
} }

579
golded3/gemsgs.cpp
View File

@ -35,66 +35,72 @@
// ------------------------------------------------------------------ // ------------------------------------------------------------------
static bool tokenxchg(char*& dst, char* tok, const char* src, int len = 0, int cnt = 0, ...) { static bool tokenxchg(std::string &input, std::string::iterator &pos,
const char* tok, const char* src,
size_t len = 0, size_t cnt = 0, ...)
{
size_t toklen = strlen(tok);
uint toklen = strlen(tok); if (strnieql(pos, tok, toklen))
char buf[100]; {
std::string str = src;
if(*dst != *tok) std::string::iterator tokend = pos+toklen;
return false;
if(not strnieql(dst, tok, toklen)) {
if(len and *dst and (*(dst+1) == '_') and *(dst+2)) {
if(not strnieql(dst+2, tok+1, toklen-1))
return false;
else
toklen++;
}
else
return false;
}
else
len = 0;
if (cnt)
{
va_list a; va_list a;
va_start(a, cnt); va_start(a, cnt);
for(int i = 0; i < cnt; i ++) {
bool use = make_bool(va_arg(a, int));
if(dst[toklen] == '{') {
char *p = strchr(dst+toklen, '}');
if(p) {
uint dstlen = p-dst-toklen-1;
if(use and dstlen) {
strxcpy (buf, dst+toklen+1, dstlen+1);
src = buf;
}
toklen = p-dst+1;
}
}
}
va_end(a);
uint sl = strlen(src); for (int i = 0; i < cnt; i++)
uint srclen = (len == 0) ? sl : len; {
memmove(dst+srclen, dst+toklen, strlen(dst+toklen)+1); std::string::iterator beg = tokend;
memset(dst, ' ', srclen); if (*beg++ != '{') break;
memcpy(dst, src, ((len != 0) and (len < sl)) ? len : sl);
dst += srclen; std::string::iterator end;
for (end = beg; end != input.end(); end++)
{
if (*end == '}')
{
if (va_arg(a, int))
str = input.substr(beg-input.begin(), end-beg);
end++;
break;
}
}
tokend = end;
}
va_end(a);
}
size_t strlen = str.length();
if (!len || (len > strlen)) len = strlen;
size_t idx = pos - input.begin();
input.replace(pos, tokend, str.c_str(), len);
pos = input.begin() + idx;
return true; return true;
} }
return false;
}
// ------------------------------------------------------------------ // ------------------------------------------------------------------
inline bool domain_requested(const char *str, size_t pos) { inline bool domain_requested(std::string::iterator str, size_t pos)
{
if(str[1] == '_') pos++; if (*(str+1) == '_') pos++;
return strnieql(str+pos, "{domain}", 8); return strnieql(str+pos, "{domain}", 8);
} }
// ------------------------------------------------------------------ // ------------------------------------------------------------------
char* TokenXlat(int mode, char* input, GMsg* msg, GMsg* oldmsg, int __origarea) { void TokenXlat(int mode, std::string &input, GMsg* msg, GMsg* oldmsg, int __origarea)
{
static char revbuf[5] = ""; static char revbuf[5] = "";
if (revbuf[0] == NUL) if (revbuf[0] == NUL)
sprintf(revbuf, "%02d%02d", str2mon(__gver_date__), atoi(&__gver_date__[4])); sprintf(revbuf, "%02d%02d", str2mon(__gver_date__), atoi(&__gver_date__[4]));
@ -132,7 +138,8 @@ char* TokenXlat(int mode, char* input, GMsg* msg, GMsg* oldmsg, int __origarea)
char msgs[16]; char msgs[16];
sprintf(msgs, "%u", AA->Msgn.Count() + (msg->attr.nwm() ? 1 : 0)); sprintf(msgs, "%u", AA->Msgn.Count() + (msg->attr.nwm() ? 1 : 0));
if((mode == MODE_QUOTE) or (mode == MODE_REPLYCOMMENT) or (mode == MODE_REPLY)) { if ((mode == MODE_QUOTE) or (mode == MODE_REPLYCOMMENT) or (mode == MODE_REPLY))
{
if (AL.AreaIdToPtr(__origarea)->Areareplydirect() and oldmsg->areakludgeid) if (AL.AreaIdToPtr(__origarea)->Areareplydirect() and oldmsg->areakludgeid)
origareaid = oldmsg->areakludgeid; origareaid = oldmsg->areakludgeid;
} }
@ -140,255 +147,311 @@ char* TokenXlat(int mode, char* input, GMsg* msg, GMsg* oldmsg, int __origarea)
modereptr = msg->re; modereptr = msg->re;
char buf[100]; char buf[100];
char* dst = input;
while(*dst) { std::string::iterator dst;
while((*dst != '@') and (*dst != LF) and *dst) for (dst = input.begin(); dst != input.end(); )
dst++; {
if(*dst == LF) if (*dst == LF) *dst = CR;
*dst++ = CR; else if (*dst != '@') ;
else if(*dst == '@') { else if (*(dst+1) == '@') input.erase(dst);
if(dst[1] == '@') { else
memmove(dst, dst+1, strlen(dst+1)+1); {
dst++; if (tokenxchg(input, dst, "@cecho", AA->echoid()))
}
else {
if(tokenxchg(dst, "@cecho", AA->echoid()))
continue; continue;
if(tokenxchg(dst, "@cdesc", AA->desc()))
if (tokenxchg(input, dst, "@cdesc", AA->desc()))
continue; continue;
if(tokenxchg(dst, "@oecho", origareaid))
if (tokenxchg(input, dst, "@oecho", origareaid))
continue; continue;
if(tokenxchg(dst, "@odesc", AL.AreaEchoToPtr(origareaid)->desc()))
if (tokenxchg(input, dst, "@odesc", AL.AreaEchoToPtr(origareaid)->desc()))
continue; continue;
if(tokenxchg(dst, "@oname", strbtrim(strtmp(oldmsg->By())), 34, 2,
if (tokenxchg(input, dst, "@oname", strbtrim(strtmp(oldmsg->By())), 34, 2,
(int)msg->by_me(), (int)msg->by_you())) (int)msg->by_me(), (int)msg->by_you()))
continue; continue;
if(tokenxchg(dst, "@ofname", strlword(oldmsg->By()), 0, 2,
if (tokenxchg(input, dst, "@ofname", strlword(oldmsg->By()), 0, 2,
(int)msg->by_me(), (int)msg->by_you())) (int)msg->by_me(), (int)msg->by_you()))
continue; continue;
if(tokenxchg(dst, "@olname", strrword(oldmsg->By()), 0, 2,
if (tokenxchg(input, dst, "@olname", strrword(oldmsg->By()), 0, 2,
(int)msg->by_me(), (int)msg->by_you())) (int)msg->by_me(), (int)msg->by_you()))
continue; continue;
if(tokenxchg(dst, "@odate", odate))
if (tokenxchg(input, dst, "@odate", odate))
continue; continue;
if(tokenxchg(dst, "@otime", otime))
if (tokenxchg(input, dst, "@otime", otime))
continue; continue;
if(tokenxchg(dst, "@odtime", odtime))
if (tokenxchg(input, dst, "@odtime", odtime))
continue; continue;
if(tokenxchg(dst, "@otzoffset", (oldmsg->tzutc == -32767) ? "" : (sprintf(buf, " %+05d", oldmsg->tzutc), buf)))
if (tokenxchg(input, dst, "@otzoffset", (oldmsg->tzutc == -32767) ? "" : (sprintf(buf, " %+05d", oldmsg->tzutc), buf)))
continue; continue;
if(tokenxchg(dst, "@ofrom", oldmsg->ifrom))
if (tokenxchg(input, dst, "@ofrom", oldmsg->ifrom))
continue; continue;
if(tokenxchg(dst, "@oto", oldmsg->ito))
if (tokenxchg(input, dst, "@oto", oldmsg->ito))
continue; continue;
if(tokenxchg(dst, "@omessageid", oldmsg->messageid ? oldmsg->messageid : ""))
if (tokenxchg(input, dst, "@omessageid", oldmsg->messageid ? oldmsg->messageid : ""))
continue; continue;
if(tokenxchg(dst, "@omsgid", *msg->replys ? msg->replys : ""))
if (tokenxchg(input, dst, "@omsgid", *msg->replys ? msg->replys : ""))
continue; continue;
if(tokenxchg(dst, "@dname", strbtrim(strtmp(oldmsg->To())), 34, 3,
if (tokenxchg(input, dst, "@dname", strbtrim(strtmp(oldmsg->To())), 34, 3,
(int)msg->to_me(), (int)msg->to_you(), (int)oldmsg->to_all())) (int)msg->to_me(), (int)msg->to_you(), (int)oldmsg->to_all()))
continue; continue;
if(tokenxchg(dst, "@dpgp", *msg->iaddr ? msg->iaddr : msg->To()))
if (tokenxchg(input, dst, "@dpgp", *msg->iaddr ? msg->iaddr : msg->To()))
continue; continue;
if(tokenxchg(dst, "@dfname", strlword(oldmsg->To()), 0, 3,
if (tokenxchg(input, dst, "@dfname", strlword(oldmsg->To()), 0, 3,
(int)msg->to_me(), (int)msg->to_you(), (int)oldmsg->to_all())) (int)msg->to_me(), (int)msg->to_you(), (int)oldmsg->to_all()))
continue; continue;
if(tokenxchg(dst, "@dlname", strrword(oldmsg->To()), 0, 3,
if (tokenxchg(input, dst, "@dlname", strrword(oldmsg->To()), 0, 3,
(int)msg->to_me(), (int)msg->to_you(), (int)oldmsg->to_all())) (int)msg->to_me(), (int)msg->to_you(), (int)oldmsg->to_all()))
continue; continue;
if(origareaisinet) {
if(tokenxchg(dst, "@oaddr", oldmsg->iorig, 19, 1, 0)) if (origareaisinet)
{
if (tokenxchg(input, dst, "@oaddr", oldmsg->iorig, 19, 1, 0))
continue; continue;
if(tokenxchg(dst, "@daddr", oldmsg->iaddr, 19, 1, 0))
if (tokenxchg(input, dst, "@daddr", oldmsg->iaddr, 19, 1, 0))
continue; continue;
} }
if(currareaisinet) {
if(tokenxchg(dst, "@caddr", AA->Internetaddress(), 19, 1, 0)) if (currareaisinet)
{
if (tokenxchg(input, dst, "@caddr", AA->Internetaddress(), 19, 1, 0))
continue; continue;
if(tokenxchg(dst, "@faddr", msg->iorig, 19, 1, 0))
if (tokenxchg(input, dst, "@faddr", msg->iorig, 19, 1, 0))
continue; continue;
if(tokenxchg(dst, "@taddr", msg->iaddr, 19, 1, 0))
if (tokenxchg(input, dst, "@taddr", msg->iaddr, 19, 1, 0))
continue; continue;
} }
if((not origareaisinet or not currareaisinet) and (strlen(dst) >= 6)) {
if ((not origareaisinet or not currareaisinet) and (strlen(dst) >= 6))
{
bool dr = domain_requested(dst, 6); bool dr = domain_requested(dst, 6);
if(not origareaisinet) { if (not origareaisinet)
if(tokenxchg(dst, "@oaddr", oldmsg->orig.make_string(buf, dr ? oldmsg->odom : NULL), 19, 1, 0)) {
if (tokenxchg(input, dst, "@oaddr", oldmsg->orig.make_string(buf, dr ? oldmsg->odom : NULL), 19, 1, 0))
continue; continue;
if(strnieql(dst, "@o3daddr", 8)) {
if (strnieql(dst, "@o3daddr", 8))
{
ftn_addr boss = oldmsg->orig; ftn_addr boss = oldmsg->orig;
boss.point = 0; boss.point = 0;
tokenxchg(dst, "@o3daddr", boss.make_string(buf, domain_requested(dst, 8) ? oldmsg->odom : NULL), 19, 1, 0); tokenxchg(input, dst, "@o3daddr", boss.make_string(buf, domain_requested(dst, 8) ? oldmsg->odom : NULL), 19, 1, 0);
continue; continue;
} }
if(tokenxchg(dst, "@daddr", oldmsg->dest.make_string(buf, dr ? oldmsg->ddom : NULL), 19, 1, 0))
if (tokenxchg(input, dst, "@daddr", oldmsg->dest.make_string(buf, dr ? oldmsg->ddom : NULL), 19, 1, 0))
continue; continue;
if(strnieql(dst, "@d3daddr", 8)) {
if (strnieql(dst, "@d3daddr", 8))
{
ftn_addr boss = oldmsg->dest; ftn_addr boss = oldmsg->dest;
boss.point = 0; boss.point = 0;
tokenxchg(dst, "@d3daddr", boss.make_string(buf, domain_requested(dst, 8) ? oldmsg->ddom : NULL), 19, 1, 0); tokenxchg(input, dst, "@d3daddr", boss.make_string(buf, domain_requested(dst, 8) ? oldmsg->ddom : NULL), 19, 1, 0);
continue; continue;
} }
} }
if(not currareaisinet) {
if (not currareaisinet)
{
const gaka &caka=AA->Aka(); const gaka &caka=AA->Aka();
if(tokenxchg(dst, "@caddr", caka.addr.make_string(buf, dr ? caka.domain : NULL), 19, 1, 0)) if (tokenxchg(input, dst, "@caddr", caka.addr.make_string(buf, dr ? caka.domain : NULL), 19, 1, 0))
continue; continue;
if(strnieql(dst, "@c3daddr", 8)) {
if (strnieql(dst, "@c3daddr", 8))
{
ftn_addr boss = caka.addr; ftn_addr boss = caka.addr;
boss.point = 0; boss.point = 0;
tokenxchg(dst, "@c3daddr", boss.make_string(buf, domain_requested(dst, 8) ? caka.domain : NULL), 19, 1, 0); tokenxchg(input, dst, "@c3daddr", boss.make_string(buf, domain_requested(dst, 8) ? caka.domain : NULL), 19, 1, 0);
continue; continue;
} }
if(tokenxchg(dst, "@taddr", msg->dest.make_string(buf, dr ? msg->ddom : NULL), 19, 1, 0))
if (tokenxchg(input, dst, "@taddr", msg->dest.make_string(buf, dr ? msg->ddom : NULL), 19, 1, 0))
continue; continue;
if(strnieql(dst, "@t3daddr", 8)) {
if (strnieql(dst, "@t3daddr", 8))
{
ftn_addr boss = msg->dest; ftn_addr boss = msg->dest;
boss.point = 0; boss.point = 0;
tokenxchg(dst, "@t3daddr", boss.make_string(buf, domain_requested(dst, 8) ? msg->ddom : NULL), 19, 1, 0); tokenxchg(input, dst, "@t3daddr", boss.make_string(buf, domain_requested(dst, 8) ? msg->ddom : NULL), 19, 1, 0);
continue; continue;
} }
if(tokenxchg(dst, "@faddr", msg->orig.make_string(buf, dr ? msg->odom : NULL), 19, 1, 0))
if (tokenxchg(input, dst, "@faddr", msg->orig.make_string(buf, dr ? msg->odom : NULL), 19, 1, 0))
continue; continue;
if(strnieql(dst, "@f3daddr", 8)) {
if (strnieql(dst, "@f3daddr", 8))
{
ftn_addr boss = msg->orig; ftn_addr boss = msg->orig;
boss.point = 0; boss.point = 0;
tokenxchg(dst, "@f3daddr", boss.make_string(buf, domain_requested(dst, 8) ? msg->odom : NULL), 19, 1, 0); tokenxchg(input, dst, "@f3daddr", boss.make_string(buf, domain_requested(dst, 8) ? msg->odom : NULL), 19, 1, 0);
continue; continue;
} }
} }
} }
if(tokenxchg(dst, "@tname", strbtrim(strtmp(msg->To())), 34, 3,
if (tokenxchg(input, dst, "@tname", strbtrim(strtmp(msg->To())), 34, 3,
(int)false, (int)false, (int)msg->to_all())) (int)false, (int)false, (int)msg->to_all()))
continue; continue;
if(tokenxchg(dst, "@tfname", strlword(msg->To()), 0, 3,
if (tokenxchg(input, dst, "@tfname", strlword(msg->To()), 0, 3,
(int)false, (int)false, (int)msg->to_all())) (int)false, (int)false, (int)msg->to_all()))
continue; continue;
if(tokenxchg(dst, "@tlname", strrword(msg->To()), 0, 3,
if (tokenxchg(input, dst, "@tlname", strrword(msg->To()), 0, 3,
(int)false, (int)false, (int)msg->to_all())) (int)false, (int)false, (int)msg->to_all()))
continue; continue;
if(tokenxchg(dst, "@cname", AA->Username().name, 34))
if (tokenxchg(input, dst, "@cname", AA->Username().name, 34))
continue; continue;
if(tokenxchg(dst, "@cfname", strlword(strcpy(buf, AA->Username().name))))
if (tokenxchg(input, dst, "@cfname", strlword(strcpy(buf, AA->Username().name))))
continue; continue;
if(tokenxchg(dst, "@clname", strrword(strcpy(buf, AA->Username().name))))
if (tokenxchg(input, dst, "@clname", strrword(strcpy(buf, AA->Username().name))))
continue; continue;
if(tokenxchg(dst, "@cfrom", msg->ifrom))
if (tokenxchg(input, dst, "@cfrom", msg->ifrom))
continue; continue;
if(tokenxchg(dst, "@cto", msg->ito))
if (tokenxchg(input, dst, "@cto", msg->ito))
continue; continue;
if(tokenxchg(dst, "@cdate", cdate))
if (tokenxchg(input, dst, "@cdate", cdate))
continue; continue;
if(tokenxchg(dst, "@ctime", ctime))
if (tokenxchg(input, dst, "@ctime", ctime))
continue; continue;
if(tokenxchg(dst, "@cdtime", cdtime))
if (tokenxchg(input, dst, "@cdtime", cdtime))
continue; continue;
if(tokenxchg(dst, "@ctzoffset", AA->Usetzutc() ? (sprintf(buf, " %+05d", tzoffset()), buf) : ""))
if (tokenxchg(input, dst, "@ctzoffset", AA->Usetzutc() ? (sprintf(buf, " %+05d", tzoffset()), buf) : ""))
continue; continue;
if(tokenxchg(dst, "@fname", strbtrim(strtmp(msg->By())), 34))
if (tokenxchg(input, dst, "@fname", strbtrim(strtmp(msg->By())), 34))
continue; continue;
if(tokenxchg(dst, "@fpgp", *msg->iorig ? msg->iorig : msg->By()))
if (tokenxchg(input, dst, "@fpgp", *msg->iorig ? msg->iorig : msg->By()))
continue; continue;
if(tokenxchg(dst, "@ffname", strlword(msg->By())))
if (tokenxchg(input, dst, "@ffname", strlword(msg->By())))
continue; continue;
if(tokenxchg(dst, "@flname", strrword(msg->By())))
if (tokenxchg(input, dst, "@flname", strrword(msg->By())))
continue; continue;
if(strnieql(dst, "@dpseudo", 8)) {
if (strnieql(dst, "@dpseudo", 8))
{
if (*(oldmsg->pseudoto) == NUL) if (*(oldmsg->pseudoto) == NUL)
build_pseudo(oldmsg); build_pseudo(oldmsg);
tokenxchg(dst, "@dpseudo", oldmsg->pseudoto, 0, 3, (int)msg->to_me(), (int)msg->to_you(), (int)oldmsg->to_all()); tokenxchg(input, dst, "@dpseudo", oldmsg->pseudoto, 0, 3, (int)msg->to_me(), (int)msg->to_you(), (int)oldmsg->to_all());
continue; continue;
} }
if(strnieql(dst, "@opseudo", 8)) {
if (strnieql(dst, "@opseudo", 8))
{
if (*(oldmsg->pseudofrom) == NUL) if (*(oldmsg->pseudofrom) == NUL)
build_pseudo(oldmsg, false); build_pseudo(oldmsg, false);
tokenxchg(dst, "@opseudo", oldmsg->pseudofrom, 0, 2, (int)msg->by_me(), (int)msg->by_you()); tokenxchg(input, dst, "@opseudo", oldmsg->pseudofrom, 0, 2, (int)msg->by_me(), (int)msg->by_you());
continue; continue;
} }
if(strnieql(dst, "@tpseudo", 8)) {
if (strnieql(dst, "@tpseudo", 8))
{
if (*(msg->pseudoto) == NUL) if (*(msg->pseudoto) == NUL)
build_pseudo(msg); build_pseudo(msg);
tokenxchg(dst, "@tpseudo", msg->pseudoto, 0, 3, (int)false, (int)false, (int)msg->to_all()); tokenxchg(input, dst, "@tpseudo", msg->pseudoto, 0, 3, (int)false, (int)false, (int)msg->to_all());
continue; continue;
} }
// Same as above (just for backward compatibility) // Same as above (just for backward compatibility)
if(strnieql(dst, "@pseudo", 7)) { if (strnieql(dst, "@pseudo", 7))
{
if (*(msg->pseudoto) == NUL) if (*(msg->pseudoto) == NUL)
build_pseudo(msg); build_pseudo(msg);
tokenxchg(dst, "@pseudo", msg->pseudoto, 0, 3, (int)false, (int)false, (int)msg->to_all()); tokenxchg(input, dst, "@pseudo", msg->pseudoto, 0, 3, (int)false, (int)false, (int)msg->to_all());
continue; continue;
} }
if(strnieql(dst, "@fpseudo", 8)) {
if (strnieql(dst, "@fpseudo", 8))
{
if (*(msg->pseudofrom) == NUL) if (*(msg->pseudofrom) == NUL)
build_pseudo(msg, false); build_pseudo(msg, false);
tokenxchg(dst, "@fpseudo", msg->pseudofrom); tokenxchg(input, dst, "@fpseudo", msg->pseudofrom);
continue; continue;
} }
if(tokenxchg(dst, "@msgno", msgno))
if (tokenxchg(input, dst, "@msgno", msgno))
continue; continue;
if(tokenxchg(dst, "@msgs", msgs))
if (tokenxchg(input, dst, "@msgs", msgs))
continue; continue;
if(tokenxchg(dst, "@cpseudo", *AA->Nickname() ? AA->Nickname() : strlword(strcpy(buf, AA->Username().name), " @.")))
if (tokenxchg(input, dst, "@cpseudo", *AA->Nickname() ? AA->Nickname() : strlword(strcpy(buf, AA->Username().name), " @.")))
continue; continue;
if(tokenxchg(dst, "@version", __gver_ver__))
if (tokenxchg(input, dst, "@version", __gver_ver__))
continue; continue;
if(tokenxchg(dst, "@ver", __gver_shortver__))
if (tokenxchg(input, dst, "@ver", __gver_shortver__))
continue; continue;
if(tokenxchg(dst, "@rev", revbuf))
if (tokenxchg(input, dst, "@rev", revbuf))
continue; continue;
if(strnieql(dst, "@align{", 6)) {
char *ptr = strchr(dst, '}'); if (tokenxchg(input, dst, "@pid", __gver_shortpid__))
if(ptr) {
int size = atoi(dst+7) - (dst-input);
if(size > 0) {
char filler = ' ';
if((ptr[1] == '{') and (ptr[3] == '}')) {
filler = ptr[2];
ptr += 3;
}
memmove(dst+size, ptr+1, strlen(ptr+1)+1);
memset(dst, filler, size);
dst += size;
}
else {
if ((ptr[1] == '{') and (ptr[3] == '}'))
ptr += 3;
memmove(dst, ptr+1, strlen(ptr+1)+1);
}
}
else {
memmove(dst, dst+6, strlen(dst+6)+1);
}
continue; continue;
}
if(tokenxchg(dst, "@pid", __gver_shortpid__)) if (tokenxchg(input, dst, "@longpid", __gver_longpid__))
continue; continue;
if(tokenxchg(dst, "@longpid", __gver_longpid__))
if (tokenxchg(input, dst, "@widepid", xmailer))
continue; continue;
if(tokenxchg(dst, "@widepid", xmailer))
if (tokenxchg(input, dst, "@osver", osver))
continue; continue;
if(tokenxchg(dst, "@osver", osver))
if (tokenxchg(input, dst, "@osslash", __gver_platform__))
continue; continue;
if(tokenxchg(dst, "@osslash", __gver_platform__))
if (tokenxchg(input, dst, "@subject", modereptr))
continue; continue;
if(tokenxchg(dst, "@subject", modereptr))
if (tokenxchg(input, dst, "@attr", attr))
continue; continue;
if(tokenxchg(dst, "@attr", attr))
continue; if (tokenxchg(input, dst, "@tagline",
if(tokenxchg(dst, "@tagline",
HandleRandomLine(strxcpy(buf, AA->Tagline(), sizeof(buf)), sizeof(buf)))) HandleRandomLine(strxcpy(buf, AA->Tagline(), sizeof(buf)), sizeof(buf))))
continue; continue;
if(tokenxchg(dst, "@tearline",
if (tokenxchg(input, dst, "@tearline",
HandleRandomLine(strxcpy(buf, AA->Tearline(), sizeof(buf)), sizeof(buf)))) HandleRandomLine(strxcpy(buf, AA->Tearline(), sizeof(buf)), sizeof(buf))))
continue; continue;
if(tokenxchg(dst, "@origin",
if (tokenxchg(input, dst, "@origin",
HandleRandomLine(strxcpy(buf, AA->Origin(), sizeof(buf)), sizeof(buf)))) HandleRandomLine(strxcpy(buf, AA->Origin(), sizeof(buf)), sizeof(buf))))
continue; continue;
if (strnieql(dst, "@area", 5)) if (strnieql(dst, "@area", 5))
{ {
if (tokenxchg(dst, "@areatype", AA->basetype())) if (tokenxchg(input, dst, "@areatype", AA->basetype()))
continue; continue;
char areapath[GMAXPATH]; char areapath[GMAXPATH];
@ -414,75 +477,57 @@ char* TokenXlat(int mode, char* input, GMsg* msg, GMsg* oldmsg, int __origarea)
areapath[0] = NUL; areapath[0] = NUL;
} }
if (tokenxchg(dst, "@areapath", areapath)) if (tokenxchg(input, dst, "@areapath", areapath))
continue; continue;
if (tokenxchg(dst, "@areaname", areaname))
if (tokenxchg(input, dst, "@areaname", areaname))
continue; continue;
} }
char *ptr1, *ptr2; if (strnieql(dst, "@align{", 7))
if (strnieql(dst, "@pad{", 5) &&
((ptr1 = strstr(dst+5, "}{")) != NULL) &&
((ptr1-dst-5) > 2) &&
((ptr2 = strchr(ptr1+2, '}')) != NULL)
)
{ {
char buff[1024]; std::string::iterator ptr = dst+7;
char token[1024]; while ((*ptr != '}') && (ptr != input.end())) ptr++;
char fill = dst[5];
char align = g_toupper(dst[6]);
int size = atoi(dst+7);
if (strchr("CLR", align)) if (*ptr != '}')
tokenxchg(input, dst, "@align", "");
else
{ {
memcpy(token, dst, ptr2-dst+1); int size = atoi(dst+7) - (dst-input.begin());
memcpy(buff, ptr1+2, ptr2-ptr1-2); if (size < 0) size = 0;
token[ptr2-dst+1] = buff[ptr2-ptr1-2] = 0;
TokenXlat(mode, buff, msg, oldmsg, __origarea); char filler = ' ';
buff[size] = 0; if ((*(ptr+1) == '{') && (*(ptr+3) == '}'))
size_t length = strlen(buff);
if (length != size)
{ {
size_t diff = size - length; ptr += 2;
switch (align) filler = *ptr;
{ }
case 'C':
memmove(&buff[diff/2], buff, length); std::string fill(size, filler);
memset(buff, fill, diff/2); tokenxchg(input, dst, "@align", fill.c_str(), 0, 2, (int)false, (int)false);
memset(&buff[diff/2+length], fill, diff-diff/2); dst += size;
break;
case 'L':
memset(&buff[length], fill, diff);
break;
case 'R':
memmove(&buff[diff], buff, length);
memset(buff, fill, diff);
break;
}
} }
if (tokenxchg(dst, token, buff))
continue; continue;
} }
}
if (strnieql(dst, "@pipe{`", 7)) if (strnieql(dst, "@pipe{", 6))
{ {
char *argbeg = dst+7; std::string::iterator pbeg = dst+6;
char *argend = strstr(argbeg, "`}"); std::string::iterator pend = pbeg;
while ((*pend != '}') && (pend != input.end()))
pend++;
char token[1024]; if (*pend != '}')
size_t tlen = argend-dst+2; tokenxchg(input, dst, "@pipe", "");
else
memcpy(token, dst, tlen); {
*argend = token[tlen] = 0; std::string param = input.substr(pbeg-input.begin(), pend-pbeg);
FILE *pipe_in; FILE *pipe_in;
std::string pipe_buff; std::string pipe_buff;
if ((pipe_in = popen(argbeg, "rt")) != NULL ) if ((pipe_in = popen(param.c_str(), "rt")) != NULL )
{ {
char buffer[1024]; char buffer[1024];
while (!feof(pipe_in)) while (!feof(pipe_in))
@ -494,24 +539,114 @@ char* TokenXlat(int mode, char* input, GMsg* msg, GMsg* oldmsg, int __origarea)
pclose(pipe_in); pclose(pipe_in);
} }
*argend = '`';
for (size_t i = 0; i < pipe_buff.length(); i++) for (size_t i = 0; i < pipe_buff.length(); i++)
{ {
if (pipe_buff[i] == LF) if (pipe_buff[i] == LF)
pipe_buff[i] = CR; pipe_buff[i] = CR;
} }
if (tokenxchg(dst, token, pipe_buff.c_str())) if (tokenxchg(input, dst, "@pipe", pipe_buff.c_str(), 0, 1, (int)false))
continue; continue;
} }
}
if (strnieql(dst, "@pad{", 5))
{
std::string::iterator pbeg = dst+5;
std::string::iterator pend = pbeg;
while ((*pend != '}') && (pend != input.end()))
pend++;
if ((*pend != '}') || ((pend-pbeg) < 3))
tokenxchg(input, dst, "@pad", "");
else
{
pend++;
char fill = *pbeg;
char align = toupper(*(pbeg+1));
int padsize = atoi(pbeg+2);
if (padsize < 0) padsize = 0;
std::string text;
if (*pend == '{')
{
std::string buff = input.substr(pend-input.begin());
TokenXlat(mode, buff, msg, oldmsg, __origarea);
size_t idx1 = dst - input.begin();
size_t idx2 = pend - dst;
input.replace(pend, input.end(), buff);
dst = input.begin() + idx1;
pend = pbeg = dst + idx2 + 1;
while ((*pend != '}') && (pend != input.end()))
pend++;
text = input.substr(pbeg-input.begin(), pend-pbeg);
}
size_t tlen = text.length();
if (tlen != padsize)
{
int diff = padsize - tlen;
switch (align)
{
case 'L':
if (diff > 0)
text.insert(text.end(), diff, fill);
else
text.erase(padsize);
break;
case 'R':
if (diff > 0)
text.insert(text.begin(), diff, fill);
else
text = text.substr(-diff);
break;
default:
if (diff > 0)
{
text.insert(text.begin(), diff/2, fill);
text.insert(text.end(), diff-diff/2, fill);
}
else
{
text = text.substr((-diff)/2);
text.erase(padsize);
}
break;
}
}
if (tokenxchg(input, dst, "@pad", text.c_str(), 0, 2, (int)false, (int)false))
continue;
}
}
}
dst++; dst++;
} }
} }
// ------------------------------------------------------------------
void TokenXlat(int mode, char *&input, size_t size, bool resize, GMsg* msg, GMsg* oldmsg, int origarea)
{
std::string buff = input;
TokenXlat(mode, buff, msg, oldmsg, origarea);
if (resize)
{
size_t newsize = buff.length() + 1;
if (size < newsize)
input = (char*)throw_realloc(input, size = newsize);
} }
return input; strncpy(input, buff.c_str(), size);
input[size-1] = 0;
} }

5
golded3/gepost.cpp
View File

@ -1097,7 +1097,8 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
forwstat = YES; forwstat = YES;
} }
else { else {
if(confirm) { if (confirm)
{
throw_release(msg->txt); throw_release(msg->txt);
FILE* fp = fsopen(AddPath(CFG->goldpath, CFG->confirmfile), "rt", CFG->sharemode); FILE* fp = fsopen(AddPath(CFG->goldpath, CFG->confirmfile), "rt", CFG->sharemode);
if(fp) { if(fp) {
@ -1106,7 +1107,7 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
} }
if(msg->txt == NULL) if(msg->txt == NULL)
msg->txt = throw_strdup("\r\rConfirmation Receipt\r\r"); msg->txt = throw_strdup("\r\rConfirmation Receipt\r\r");
TokenXlat(mode, msg->txt, msg, omsg, CurrArea); TokenXlat(mode, msg->txt, strlen(msg->txt)+1, true, msg, omsg, CurrArea);
} }
else else
CreateFileAddr(msg); CreateFileAddr(msg);

8
golded3/geprot.h
View File

@ -118,7 +118,7 @@ void SaveLines(int mode, const char* savefile, GMsg* msg, int margin, bool clip=
// GEDOSS prototypes // GEDOSS prototypes
void Cleanup(void); void Cleanup(void);
int ShellToDos(char* command, char* message, vattr cls, int cursor, int pause=NO); int ShellToDos(const char* command, char* message, vattr cls, int cursor, int pause=NO);
// ------------------------------------------------------------------ // ------------------------------------------------------------------
@ -221,7 +221,11 @@ int NextMarkedmsg(int direction, GMsg* msg);
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// GEMSGS prototypes // GEMSGS prototypes
char* TokenXlat(int mode, char* input, GMsg* msg, GMsg* oldmsg, int origarea); void TokenXlat(int mode, std::string &input, GMsg* msg, GMsg* oldmsg, int origarea);
void TokenXlat(int mode, char *&input, size_t size, bool resize, GMsg* msg, GMsg* oldmsg, int origarea);
inline void TokenXlat(int mode, char *input, size_t size, GMsg* msg, GMsg* oldmsg, int origarea)
{ TokenXlat(mode, input, size, false, msg, oldmsg, origarea); }
void Rot13(GMsg* msg); void Rot13(GMsg* msg);
void ResetMsg(GMsg* msg); void ResetMsg(GMsg* msg);
int DoCarboncopy(GMsg* msg, GMsg** carbon); int DoCarboncopy(GMsg* msg, GMsg** carbon);

13
golded3/geread2.cpp
View File

@ -538,15 +538,15 @@ int ExternUtil(GMsg *msg, ExtUtil *extutil) {
Path editorfile, tmpfile, buf; Path editorfile, tmpfile, buf;
strxcpy(editorfile, AddPath(CFG->goldpath, EDIT->File()), sizeof(Path)); strxcpy(editorfile, AddPath(CFG->goldpath, EDIT->File()), sizeof(Path));
char cmdline[1024]; std::string cmdline = extutil->cmdline;
strxcpy(cmdline, extutil->cmdline, sizeof(cmdline));
int mode = (extutil->options & EXTUTIL_KEEPCTRL) ? MODE_SAVE : MODE_SAVENOCTRL; int mode = (extutil->options & EXTUTIL_KEEPCTRL) ? MODE_SAVE : MODE_SAVENOCTRL;
SaveLines(mode, editorfile, msg, 79); SaveLines(mode, editorfile, msg, 79);
strcpy(buf, editorfile); strcpy(buf, editorfile);
strchg(buf, GOLD_WRONG_SLASH_CHR, GOLD_SLASH_CHR); strchg(buf, GOLD_WRONG_SLASH_CHR, GOLD_SLASH_CHR);
strischg(cmdline, "@file", buf); strischg(cmdline, "@file", buf);
if(striinc("@tmpfile", cmdline)) { if(striinc("@tmpfile", cmdline) != cmdline.end())
{
mktemp(strcpy(tmpfile, AddPath(CFG->temppath, "GDXXXXXX"))); mktemp(strcpy(tmpfile, AddPath(CFG->temppath, "GDXXXXXX")));
SaveLines(mode, tmpfile, msg, 79); SaveLines(mode, tmpfile, msg, 79);
strcpy(buf, tmpfile); strcpy(buf, tmpfile);
@ -566,7 +566,7 @@ int ExternUtil(GMsg *msg, ExtUtil *extutil) {
if(extutil->options & EXTUTIL_PAUSE) if(extutil->options & EXTUTIL_PAUSE)
pauseval = 1; pauseval = 1;
ShellToDos(cmdline, "", ShellToDos(cmdline.c_str(), "",
extutil->options & EXTUTIL_CLS ? LGREY_|_BLACK : BLACK_|_BLACK, extutil->options & EXTUTIL_CLS ? LGREY_|_BLACK : BLACK_|_BLACK,
extutil->options & EXTUTIL_CURSOR, extutil->options & EXTUTIL_CURSOR,
pauseval pauseval
@ -761,8 +761,7 @@ void ReadPeekURLs(GMsg* msg) {
whelpop(); whelpop();
if(n != -1) { if(n != -1) {
char cmdline[1024]; std::string cmdline = CFG->urlhandler.cmdline;
strxcpy(cmdline, CFG->urlhandler.cmdline, sizeof(cmdline));
strxmerge(buf, sizeof(buf), "\"", strtrim(strltrim(Listi[n])), "\"", NULL); strxmerge(buf, sizeof(buf), "\"", strtrim(strltrim(Listi[n])), "\"", NULL);
strischg(cmdline, "@url", buf); strischg(cmdline, "@url", buf);
strxcpy(buf, CFG->goldpath, sizeof(buf)); strxcpy(buf, CFG->goldpath, sizeof(buf));
@ -776,7 +775,7 @@ void ReadPeekURLs(GMsg* msg) {
if(CFG->urlhandler.options & EXTUTIL_PAUSE) if(CFG->urlhandler.options & EXTUTIL_PAUSE)
pauseval = 1; pauseval = 1;
ShellToDos(cmdline, "", ShellToDos(cmdline.c_str(), "",
CFG->urlhandler.options & EXTUTIL_CLS ? LGREY_|_BLACK : BLACK_|_BLACK, CFG->urlhandler.options & EXTUTIL_CLS ? LGREY_|_BLACK : BLACK_|_BLACK,
CFG->urlhandler.options & EXTUTIL_CURSOR, CFG->urlhandler.options & EXTUTIL_CURSOR,
pauseval pauseval

27
golded3/getpls.cpp
View File

@ -87,12 +87,8 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa
uint ctrlinfo; uint ctrlinfo;
char textfile[GMAXPATH]; char textfile[GMAXPATH];
char indexfile[GMAXPATH]; char indexfile[GMAXPATH];
#if defined(__USE_ALLOCA__)
size_t sizeofbuf = CFG->quotemargin + 256; size_t sizeofbuf = CFG->quotemargin + 256;
char *buf = (char*)alloca(sizeofbuf); char *buf = (char*)throw_malloc(sizeofbuf);
#else
__extension__ char buf[CFG->quotemargin + 256];
#endif
char initials[10]; char initials[10];
char quotestr[100]; char quotestr[100];
char qbuf[100]; char qbuf[100];
@ -193,7 +189,8 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa
EDIT->HardLines(false); EDIT->HardLines(false);
msg->txt = (char*)throw_realloc(msg->txt, 256); msg->txt = (char*)throw_realloc(msg->txt, 256);
strcpy(msg->txt, LNG->RobotMsg); strcpy(msg->txt, LNG->RobotMsg);
TokenXlat(mode, msg->txt, msg, oldmsg, origarea); TokenXlat(mode, msg->txt, strlen(msg->txt)+1, true, msg, oldmsg, origarea);
throw_free(buf);
return 0; return 0;
} }
} }
@ -339,11 +336,8 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa
size_t oldmsg_size = oldmsg->txt ? strlen(oldmsg->txt) : REALLOC_CACHE_SIZE; size_t oldmsg_size = oldmsg->txt ? strlen(oldmsg->txt) : REALLOC_CACHE_SIZE;
size_t msg_txt_realloc_cache = 0; size_t msg_txt_realloc_cache = 0;
#if defined(__MINGW32__) || defined(_MSC_VER) while(fgets(buf, sizeofbuf, fp))
while(fgets(buf, sizeofbuf, fp)) { {
#else
while(fgets(buf, sizeof(buf), fp)) {
#endif
ptr = strskip_wht(buf); ptr = strskip_wht(buf);
if(*ptr != ';') { if(*ptr != ';') {
bool chg = false; bool chg = false;
@ -487,7 +481,7 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa
} while(*ptr and (token>=end_token)); } while(*ptr and (token>=end_token));
if(token < end_token) { if(token < end_token) {
TokenXlat(mode, buf, msg, oldmsg, origarea); TokenXlat(mode, buf, sizeofbuf, true, msg, oldmsg, origarea);
switch(token) { switch(token) {
@ -616,7 +610,7 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa
if(*buf) { if(*buf) {
if(*buf == '+' and buf[1] == NUL) if(*buf == '+' and buf[1] == NUL)
*buf = ' '; *buf = ' ';
TokenXlat(mode, buf, msg, oldmsg, origarea); TokenXlat(mode, buf, sizeofbuf, true, msg, oldmsg, origarea);
strtrim(buf); strtrim(buf);
strcat(buf, "\r"); strcat(buf, "\r");
len = strlen(buf); len = strlen(buf);
@ -650,7 +644,7 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa
tfp = fsopen(textfile, "rt", CFG->sharemode); tfp = fsopen(textfile, "rt", CFG->sharemode);
if(tfp) { if(tfp) {
while(fgets(buf, 255, tfp)) { while(fgets(buf, 255, tfp)) {
TokenXlat(mode, buf, msg, oldmsg, origarea); TokenXlat(mode, buf, sizeofbuf, true, msg, oldmsg, origarea);
strtrim(buf); strtrim(buf);
strcat(buf, "\r"); strcat(buf, "\r");
len = strlen(buf); len = strlen(buf);
@ -867,7 +861,7 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa
continue; continue;
if((mode == MODE_QUOTEBUF) and not quotebufline) if((mode == MODE_QUOTEBUF) and not quotebufline)
continue; continue;
TokenXlat(mode, buf, msg, oldmsg, origarea); TokenXlat(mode, buf, sizeofbuf, true, msg, oldmsg, origarea);
len = strlen(buf); len = strlen(buf);
size += len; size += len;
if(msg_txt_realloc_cache >= len) { if(msg_txt_realloc_cache >= len) {
@ -918,7 +912,7 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa
strtrim(buf); strtrim(buf);
if(*buf) { if(*buf) {
strcat(buf, "\n"); strcat(buf, "\n");
TokenXlat(mode, buf, msg, oldmsg, origarea); TokenXlat(mode, buf, sizeofbuf, true, msg, oldmsg, origarea);
len = strlen(buf); len = strlen(buf);
size += len; size += len;
if(msg_txt_realloc_cache >= len) { if(msg_txt_realloc_cache >= len) {
@ -939,6 +933,7 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa
if(tmptpl) if(tmptpl)
remove(tplfile); remove(tplfile);
throw_free(buf);
return disphdr; return disphdr;
} }

9
goldlib/gall/gfilutil.h
View File

@ -83,6 +83,15 @@
#define R_OK 0 #define R_OK 0
#endif #endif
// ------------------------------------------------------------------
#if defined(_MSC_VER)
#define popen(f,m) _popen(f,m)
#define pclose(fh) _pclose(fh)
#endif
// ------------------------------------------------------------------ // ------------------------------------------------------------------
#define GMAXPATH (FILENAME_MAX+1) /* ANSI C */ #define GMAXPATH (FILENAME_MAX+1) /* ANSI C */

2
goldlib/gall/gstrall.h
View File

@ -62,9 +62,11 @@ int strchg(char* str, char oldch, char newch);
char* stridela(const char* substr, char* str); char* stridela(const char* substr, char* str);
int strnicmpw(const char* str1, const char* str2, int len); int strnicmpw(const char* str1, const char* str2, int len);
const char* striinc(const char* str1, const char* str2); const char* striinc(const char* str1, const char* str2);
std::string::iterator striinc(const char* str1, std::string &str2);
char* strins(const char* instr, char* str, int st_pos); char* strins(const char* instr, char* str, int st_pos);
char* strisrep(char* str, const char* search, const char* replace); char* strisrep(char* str, const char* search, const char* replace);
char* strischg(char* str, const char* find, const char* replace); char* strischg(char* str, const char* find, const char* replace);
void strischg(std::string &str, const char* find, const char* replace);
char* strrjust(char* str); char* strrjust(char* str);
char* strschg(char* str, const char* find, const char* replace); char* strschg(char* str, const char* find, const char* replace);
char* strsetsz(char* str, int newsize); char* strsetsz(char* str, int newsize);

37
goldlib/gall/gstrutil.cpp
View File

@ -150,6 +150,22 @@ const char* striinc(const char* str1, const char* str2) {
} }
// ------------------------------------------------------------------
// Determines if string1 is included in string2
std::string::iterator striinc(const char* str1, std::string &str2)
{
int max = strlen(str1);
std::string::iterator it;
for (it = str2.begin(); it != str2.end(); it++)
if (!strnicmp(str1, it, max))
return it;
return str2.end(); // string1 not found in string2
}
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// Inserts one string into another // Inserts one string into another
@ -211,6 +227,27 @@ char* strischg(char* str, const char* find, const char* replace) {
} }
// ------------------------------------------------------------------
// Changes all occurrences of one string to another
void strischg(std::string &str, const char* find, const char* replace)
{
int lenf = strlen(find);
int lenr = strlen(replace);
std::string::iterator it;
for (it = str.begin(); it != str.end(); it++)
{
if (strnieql(find, it, lenf))
{
size_t idx = it - str.begin();
str.replace(it, it+lenf, replace, lenr);
it = str.begin() + idx + lenr - 1;
}
}
}
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// Takes a long number and makes a string with the form x.xxx.xxx.xxx // Takes a long number and makes a string with the form x.xxx.xxx.xxx