Crashecho support added, few Mappath fixes, one more range check in editor fixed

This commit is contained in:
Alexander S. Aganichev
2001-05-05 21:41:41 +00:00
parent a7b00c4dc0
commit cf69e9116e
48 changed files with 226 additions and 198 deletions

View File

@@ -387,6 +387,8 @@ void AreaList::GetAreafile(char* value) {
AFILE->fidomsgtype = CFG->fidomsgtype;
AFILE->ra2usersbbs = CFG->ra2usersbbs;
AFILE->squishuserno = CFG->squishuserno;
AFILE->areapath = CFG->areapath;
AFILE->pcboardpath = CFG->pcboardpath;
if(not CFG->aka.empty())
AFILE->primary_aka = CFG->aka[0].addr;
@@ -399,17 +401,6 @@ void AreaList::GetAreafile(char* value) {
AFILE->attribsemail = CFG->attribsemail;
AFILE->attribslocal = CFG->attribslocal;
AFILE->areapath = CFG->areapath;
AFILE->adeptxbbspath = CFG->adeptxbbspath;
AFILE->jampath = CFG->jampath;
AFILE->squishuserpath = CFG->squishuserpath;
AFILE->hudsonpath = CFG->hudsonpath;
AFILE->goldbasepath = CFG->goldbasepath;
AFILE->pcboardpath = CFG->pcboardpath;
AFILE->ezycom_msgbasepath = CFG->ezycom.msgbasepath;
AFILE->ezycom_userbasepath = CFG->ezycom.userbasepath;
AFILE->fidolastread = CFG->fidolastread;
AFILE->ReadAreafile(crcval, value);
CFG->ra2usersbbs = AFILE->ra2usersbbs;
@@ -1083,7 +1074,7 @@ Area::~Area() {
char* MapPath(char* map, bool reverse) {
Path buf,cmap;
Path buf, cmap;
strxcpy(cmap, map, sizeof(Path));
if(reverse)

View File

@@ -61,25 +61,25 @@ bool ReadGoldedCfg(int& force) {
if(*CFG->squishuserpath == NUL) {
char* ptr = getenv("MAXIMUS");
if(ptr) {
if(is_dir(ptr))
AddBackslash(strcpy(CFG->squishuserpath, ptr));
if(ptr != NULL) {
CfgSquishuserpath(ptr);
}
else {
ptr = getenv("SQUISH");
if(ptr)
AddBackslash(strcpy(CFG->squishuserpath, ptr));
if(ptr != NULL)
CfgSquishuserpath(ptr);
else
strcpy(CFG->squishuserpath, CFG->areapath);
CfgSquishuserpath(CFG->areapath);
}
}
if(*CFG->hudsonpath == NUL) strcpy(CFG->hudsonpath, CFG->goldpath);
if(*CFG->hudsonsyspath == NUL) strcpy(CFG->hudsonsyspath, CFG->hudsonpath);
if(*CFG->goldbasepath == NUL) strcpy(CFG->goldbasepath, CFG->hudsonpath);
if(*CFG->goldbasesyspath == NUL) strcpy(CFG->goldbasesyspath, CFG->goldbasepath);
if(*CFG->jampath == NUL)
strcpy(CFG->jampath, CFG->hudsonpath);
CfgHudsonpath(CFG->goldpath);
if(*CFG->hudsonsyspath == NUL)
strcpy(CFG->hudsonsyspath, CFG->hudsonpath);
CfgGoldbasepath(CFG->hudsonpath);
if(*CFG->goldbasesyspath == NUL)
strcpy(CFG->goldbasesyspath, CFG->goldbasepath);
CfgJampath(CFG->hudsonpath);
MakePathname(CFG->goldcfg, CFG->goldpath, CFG->goldcfg);
MakePathname(CFG->helpcfg.fn, CFG->goldpath, CFG->helpcfg.fn);
@@ -318,7 +318,7 @@ void InstallDetect(char* path) {
if(fp) {
if(*path) {
PathCopy(CFG->areapath, path);
MapPath(PathCopy(CFG->areapath, path));
fprintf(fp, "AREAPATH %s\n", path);
}

View File

@@ -141,9 +141,15 @@ void CfgAddressmacro() {
// ------------------------------------------------------------------
void CfgAdeptxbbspath(const char *path, bool force) {
if (force or strblank(CFG->adeptxbbspath))
MapPath(PathCopy(CFG->adeptxbbspath, path));
}
void CfgAdeptxbbspath() {
PathCopy(CFG->adeptxbbspath, val);
CfgAdeptxbbspath(val, true);
}
// ------------------------------------------------------------------
@@ -359,7 +365,7 @@ void CfgArealisttype() {
void CfgAreapath() {
PathCopy(CFG->areapath, val);
MapPath(PathCopy(CFG->areapath, val));
}
// ------------------------------------------------------------------

View File

@@ -148,16 +148,28 @@ void CfgExternutil() {
// ------------------------------------------------------------------
void CfgEzycommsgbase(const char *path, bool force) {
if(force or strblank(CFG->ezycom.msgbasepath))
MapPath(PathCopy(CFG->ezycom.msgbasepath, path));
}
void CfgEzycommsgbase() {
PathCopy(CFG->ezycom.msgbasepath, val);
CfgEzycommsgbase(val, true);
}
// ------------------------------------------------------------------
void CfgEzycomuserbase(const char *path, bool force) {
if(force or strblank(CFG->ezycom.userbasepath))
MapPath(PathCopy(CFG->ezycom.userbasepath, path));
}
void CfgEzycomuserbase() {
PathCopy(CFG->ezycom.userbasepath, val);
CfgEzycomuserbase(val, true);
}
// ------------------------------------------------------------------
@@ -169,9 +181,14 @@ void CfgEzycomuserno() {
// ------------------------------------------------------------------
void CfgFidolastread(const char *path) {
MapPath(strxcpy(CFG->fidolastread, val, sizeof(Path)));
}
void CfgFidolastread() {
strcpy(CFG->fidolastread, val);
CfgFidolastread(val);
}
// ------------------------------------------------------------------
@@ -286,9 +303,15 @@ void CfgGermankeyboard() {
// ------------------------------------------------------------------
void CfgGoldbasepath(const char *path, bool force) {
if(force or strblank(CFG->goldbasepath))
MapPath(PathCopy(CFG->goldbasepath, path));
}
void CfgGoldbasepath() {
PathCopy(CFG->goldbasepath, val);
CfgGoldbasepath(val, true);
}
// ------------------------------------------------------------------

View File

@@ -44,9 +44,15 @@ void CfgHappybirthday() {
// ------------------------------------------------------------------
void CfgHudsonpath(const char *path, bool force) {
if(force or strblank(CFG->hudsonpath))
MapPath(PathCopy(CFG->hudsonpath, path));
}
void CfgHudsonpath() {
PathCopy(CFG->hudsonpath, val);
CfgHudsonpath(val, true);
}
// ------------------------------------------------------------------
@@ -286,9 +292,15 @@ void CfgInvalidate() {
// ------------------------------------------------------------------
void CfgJampath(const char *path, bool force) {
if(force or strblank(CFG->jampath))
MapPath(PathCopy(CFG->jampath, path));
}
void CfgJampath() {
PathCopy(CFG->jampath, val);
CfgJampath(val, true);
}
// ------------------------------------------------------------------

View File

@@ -240,9 +240,15 @@ void CfgPathreportfile() {
// ------------------------------------------------------------------
void CfgPcboardpath(const char *path, bool force) {
if(force or strblank(CFG->pcboardpath))
MapPath(PathCopy(CFG->pcboardpath, path));
}
void CfgPcboardpath() {
PathCopy(CFG->pcboardpath, val);
CfgPcboardpath(val, true);
}
// ------------------------------------------------------------------

View File

@@ -42,9 +42,19 @@ void CfgSquishuserno() {
// ------------------------------------------------------------------
void CfgSquishuserpath(const char *path, bool force) {
if(force or strblank(CFG->squishuserpath)) {
MapPath(PathCopy(CFG->squishuserpath, path));
if(not is_dir(CFG->squishuserpath))
StripBackslash(CFG->squishuserpath);
}
}
void CfgSquishuserpath() {
PathCopy(CFG->squishuserpath, val);
CfgSquishuserpath(val, true);
}
// ------------------------------------------------------------------

View File

@@ -565,7 +565,7 @@ void IEclass::GoLeft() {
if(currline->prev) {
GoUp();
GoEOL();
if((currline->txt[col] == '\n') or not ((col == (maxcol + 1)) and (currline->txt[col-1] == ' ')))
if((col != mincol) and ((currline->txt[col] == '\n') or not ((col == (maxcol + 1)) and (currline->txt[col-1] == ' '))))
col--;
}
}

View File

@@ -66,10 +66,10 @@ guserbase::guserbase() {
entry.fidoaddr.net = 5020;
entry.fidoaddr.node = 604;
entry.fidoaddr.point = 19;
strcpy(entry.iaddr, "aaganichev@netscape.net");
strcpy(entry.iaddr, "aaganichev@yandex.ru");
entry.prefer_internet = YES;
entry.is_deleted = NO;
strcpy(entry.pseudo, "As\'ka");
strcpy(entry.pseudo, "");
strcpy(entry.organisation, "GoldED+ Development Team");
strcpy(entry.snail1, "Zelenograd");
strcpy(entry.snail2, "Moscow");
@@ -78,7 +78,7 @@ guserbase::guserbase() {
strcpy(entry.voicephone, "+7-(095)-536-2374");
entry.faxphone[0] = NUL;
entry.firstdate = entry.lastdate = entry.times = 0;
strcpy(entry.homepage, "http://asa.i-connect.ru");
strcpy(entry.homepage, "http://aaganichev.narod.ru");
entry.group = 0;
strcpy(entry.comment1, "GoldED+ Maintainer");
entry.comment2[0] = NUL;