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

Fix the ability to designate a file echo area as a Passthru by specifying a BBS area of 0.

Browse Source
This commit is contained in:
Andrew Leary 2017-03-06 15:02:21 -05:00
parent 48f64baecc
commit b57c169ee5
6 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
v1.0.6.15 06-Mar-2017 - Andrew Leary
1. Fixed the ability to designate a file echo area as a
passthru by specifying a BBS area of 0.
v1.0.6.14 28-Jan-2017 - Andrew Leary v1.0.6.14 28-Jan-2017 - Andrew Leary
1. Changed the storage format for the last OLR download 1. Changed the storage format for the last OLR download

2
configure vendored
View File

@ -2309,7 +2309,7 @@ SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbutils mbnntp mbtask mbsetup unix lang
PACKAGE="mbsebbs" PACKAGE="mbsebbs"
MAJOR="1" MAJOR="1"
MINOR="0" MINOR="0"
REVISION="6.14" REVISION="6.15"
VERSION="$MAJOR.$MINOR.$REVISION" VERSION="$MAJOR.$MINOR.$REVISION"
COPYRIGHT="Copyright (C) 1997-2017 MBSE Development Team, All Rights Reserved" COPYRIGHT="Copyright (C) 1997-2017 MBSE Development Team, All Rights Reserved"
SHORTRIGHT="Copyright (C) 1997-2017 MBSE DevTm" SHORTRIGHT="Copyright (C) 1997-2017 MBSE DevTm"

2
configure.ac
View File

@ -12,7 +12,7 @@ AC_SUBST(SUBDIRS)
PACKAGE="mbsebbs" PACKAGE="mbsebbs"
MAJOR="1" MAJOR="1"
MINOR="0" MINOR="0"
REVISION="6.14" REVISION="6.15"
VERSION="$MAJOR.$MINOR.$REVISION" VERSION="$MAJOR.$MINOR.$REVISION"
COPYRIGHT="Copyright (C) 1997-2017 MBSE Development Team, All Rights Reserved" COPYRIGHT="Copyright (C) 1997-2017 MBSE Development Team, All Rights Reserved"
SHORTRIGHT="Copyright (C) 1997-2017 MBSE DevTm" SHORTRIGHT="Copyright (C) 1997-2017 MBSE DevTm"

2
mbsetup/ledit.c
View File

@ -563,7 +563,7 @@ char *select_pick(int max, int items)
break; break;
} }
pick = atoi(menu); pick = atoi(menu);
if ((pick >= 1) && (pick <= max)) if ((pick >= 0) && (pick <= max))
break; break;
working(2, 0, 0); working(2, 0, 0);

9
mbsetup/m_farea.c
View File

@ -703,13 +703,13 @@ int PickFilearea(char *shdr)
working(1, 0, 0); working(1, 0, 0);
if (config_read() == -1) { if (config_read() == -1) {
working(2, 0, 0); working(2, 0, 0);
return 0; return -1;
} }
records = CountFilearea(); records = CountFilearea();
if (records == -1) { if (records == -1) {
working(2, 0, 0); working(2, 0, 0);
return 0; return -1;
} }
@ -752,7 +752,7 @@ int PickFilearea(char *shdr)
strcpy(pick, select_pick(records, 20)); strcpy(pick, select_pick(records, 20));
if (strncmp(pick, "-", 1) == 0) if (strncmp(pick, "-", 1) == 0)
return 0; return -1;
if (strncmp(pick, "N", 1) == 0) if (strncmp(pick, "N", 1) == 0)
if ((o + 20) < records) if ((o + 20) < records)
@ -762,6 +762,9 @@ int PickFilearea(char *shdr)
if ((o - 20) >= 0) if ((o - 20) >= 0)
o -= 20; o -= 20;
if (!atoi(pick)) /* 0 = passthru file area */
return 0;
if ((atoi(pick) >= 1) && (atoi(pick) <= records)) { if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
snprintf(temp, PATH_MAX, "%s/etc/fareas.data", getenv("MBSE_ROOT")); snprintf(temp, PATH_MAX, "%s/etc/fareas.data", getenv("MBSE_ROOT"));
if ((fil = fopen(temp, "r")) != NULL) { if ((fil = fopen(temp, "r")) != NULL) {

21
mbsetup/m_ticarea.c
View File

@ -827,15 +827,18 @@ int EditTicRec(int Area)
for (;;) { for (;;) {
snprintf(temp, PATH_MAX, "%s/etc/fareas.data", getenv("MBSE_ROOT")); snprintf(temp, PATH_MAX, "%s/etc/fareas.data", getenv("MBSE_ROOT"));
if ((fp = fopen(temp, "r")) != NULL) { if (!tic.FileArea) {
fread(&areahdr, sizeof(areahdr), 1, fp); snprintf(temp, 81, "%d: %s", tic.FileArea, "Passthru");
fseek(fp, ((tic.FileArea - 1) * areahdr.recsize) + areahdr.hdrsize, SEEK_SET);
fread(&area, areahdr.recsize, 1, fp);
snprintf(temp, 81, "%d: %s", tic.FileArea, area.Name);
temp[24] = '\0'; temp[24] = '\0';
fclose(fp); } else if ((fp = fopen(temp, "r")) != NULL) {
} else { fread(&areahdr, sizeof(areahdr), 1, fp);
snprintf(temp, 81, "%d", tic.FileArea); fseek(fp, ((tic.FileArea - 1) * areahdr.recsize) + areahdr.hdrsize, SEEK_SET);
fread(&area, areahdr.recsize, 1, fp);
snprintf(temp, 81, "%d: %s", tic.FileArea, area.Name);
temp[24] = '\0';
fclose(fp);
} else {
snprintf(temp, 81, "%d", tic.FileArea);
} }
set_color(WHITE, BLACK); set_color(WHITE, BLACK);
@ -906,7 +909,7 @@ int EditTicRec(int Area)
SetTicScreen(); SetTicScreen();
break; break;
case 4: tmp = PickFilearea((char *)"10.2.4"); case 4: tmp = PickFilearea((char *)"10.2.4");
if (tmp != 0) if (tmp != -1)
tic.FileArea = tmp; tic.FileArea = tmp;
SetTicScreen(); SetTicScreen();
break; break;