Spelling and grammar corrections to several of the BBS programs. Thanks to Sean Dennis for the updates.

This commit is contained in:
Andrew Leary 2016-06-23 13:56:09 -04:00
parent 18a1fff1d1
commit 862eb0ca88
8 changed files with 54 additions and 48 deletions

View File

@ -5,7 +5,7 @@ $Id: AUTHORS,v 1.29 2015/11/03 21:05:00 mbse Exp $
The following people are members of the MBSE BBS development team:
Andrew Leary 1:320/219@fidonet
Andrew Leary ajleary19@gmail.com 1:320/219@fidonet
Vincent Coen vbcoen@gmail.com 2:250/1@fidonet
Robert James Clay jame@rocasa.us 1:120/544@fidonet

View File

@ -1,3 +1,9 @@
v1.0.6.6 23-Jun-2016 - Andrew Leary
1. Several spelling and grammar corrections in mbsebbs.c,
chat.c, offline.c, and newuser.c. Thanks to Sean Dennis for
the updates.
v1.0.6.5 12-Feb-2016 - Robert James Clay
1. Edit README file to better reflect current practice.

6
configure vendored
View File

@ -2309,10 +2309,10 @@ SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbutils mbnntp mbtask mbsetup unix lang
PACKAGE="mbsebbs"
MAJOR="1"
MINOR="0"
REVISION="6.5"
REVISION="6.6"
VERSION="$MAJOR.$MINOR.$REVISION"
COPYRIGHT="Copyright (C) 1997-2015 Michiel Broek, All Rights Reserved"
SHORTRIGHT="Copyright (C) 1997-2015 M. Broek"
COPYRIGHT="Copyright (C) 1997-2016 Michiel Broek, All Rights Reserved"
SHORTRIGHT="Copyright (C) 1997-2016 M. Broek"
GROUP="bbs"
OWNER="mbse"
ROWNER="`id -un root`"

View File

@ -12,10 +12,10 @@ AC_SUBST(SUBDIRS)
PACKAGE="mbsebbs"
MAJOR="1"
MINOR="0"
REVISION="6.5"
REVISION="6.6"
VERSION="$MAJOR.$MINOR.$REVISION"
COPYRIGHT="Copyright (C) 1997-2015 Michiel Broek, All Rights Reserved"
SHORTRIGHT="Copyright (C) 1997-2015 M. Broek"
COPYRIGHT="Copyright (C) 1997-2016 Michiel Broek, All Rights Reserved"
SHORTRIGHT="Copyright (C) 1997-2016 M. Broek"
GROUP="bbs"
OWNER="mbse"
ROWNER="`id -un root`"

View File

@ -236,7 +236,7 @@ void Chat(char *username, char *channel)
if (socket_send(buf) == 0) {
strncpy(buf, socket_receive(), sizeof(buf)-1);
if (strncmp(buf, "200:1,", 6) == 0) {
Syslog('!', "Chatsever is not available");
Syslog('!', "Chat server is not available");
colour(LIGHTRED, BLACK);
mvprintw(4, 1, (char *) Language(30));
Enter(2);
@ -248,7 +248,7 @@ void Chat(char *username, char *channel)
locate(rows - 2, 1);
colour(WHITE, BLUE);
snprintf(buf, 200, "%-*s", cols, " Chat, type \"/EXIT\" to exit or \"/HELP\" for help");
snprintf(buf, 200, "%-*s", cols, " Type \"/EXIT\" to exit or \"/HELP\" for help.");
mvprintw(rows - 2, 1, buf);
colour(WHITE, BLACK);

View File

@ -220,7 +220,7 @@ int main(int argc, char **argv)
i = getpid();
if ((tty = ttyname(0)) == NULL) {
WriteError("Not at a tty");
WriteError("Not at a TTY");
Free_Language();
Quick_Bye(MBERR_OK);
}
@ -250,7 +250,7 @@ int main(int argc, char **argv)
* log the user off.
*/
if (CheckStatus() == FALSE) {
Syslog('+', "Kicking user out, the BBS is closed");
Syslog('+', "Kicking user out. The BBS is closed.");
Free_Language();
Quick_Bye(MBERR_OK);
}
@ -272,7 +272,7 @@ int main(int argc, char **argv)
* Check and report screens that are too small
*/
if ((cols < 80) || (rows < 24)) {
snprintf(temp, 81, "Your screen is set to %dx%d, we use 80x24 at least", cols, rows);
snprintf(temp, 81, "\r\n\r\nYour screen is set to %dx%d. MBSE requires an 80x24 minimum screen size.", cols, rows);
poutCR(LIGHTRED, BLACK, temp);
Enter(1);
cols = 80;
@ -287,9 +287,9 @@ int main(int argc, char **argv)
*/
snprintf(temp, PATH_MAX, "%s/%s", CFG.bbs_usersdir, sUnixName);
if (stat(temp, &sb)) {
snprintf(temp, 81, "No homedirectory\r\n\r\n");
snprintf(temp, 81, "You don't have a home directory!\r\n\r\n");
PUTSTR(temp);
WriteError("homedirectory %s doesn't exist", temp);
WriteError("User's home directory %s doesn't exist", temp);
Quick_Bye(MBERR_OK);
}
Fix = FALSE;
@ -331,13 +331,13 @@ int main(int argc, char **argv)
}
if (Fix) {
if (chmod(temp, 0770)) {
WriteError("Could not set home directory mode to 0770");
snprintf(temp, 81, "Internal error, the sysop is notified");
WriteError("Could not set home directory mode to 0770!");
snprintf(temp, 81, "Internal error: the sysop has been notified.");
poutCR(LIGHTRED, BLACK, temp);
Enter(1);
Quick_Bye(MBERR_OK);
} else {
Syslog('+', "Corrected home directory mode to 0770");
Syslog('+', "Corrected home directory mode to 0770.");
}
}
@ -359,7 +359,7 @@ int main(int argc, char **argv)
snprintf(ttyinfo.comment, 41, "%s", p);
snprintf(ttyinfo.tty, 7, "%s", pTTY);
snprintf(ttyinfo.speed, 21, "10 mbit");
snprintf(ttyinfo.flags, 31, "IBN,IFC,XX");
snprintf(ttyinfo.flags, 31, "XX,IBN,IFC");
ttyinfo.type = NETWORK;
ttyinfo.available = TRUE;
ttyinfo.honor_zmh = FALSE;

View File

@ -81,7 +81,7 @@ int newuser(void)
struct userrec us;
IsDoing("New user login");
Syslog('+', "Newuser registration");
Syslog('+', "New user registration");
clear();
DisplayFile((char *)"newuser");
if ((iLang = Chg_Language(TRUE)) == 0)
@ -198,7 +198,7 @@ int newuser(void)
if (CFG.iVoicePhone) {
while (1) {
Enter(1);
/* Please enter you Voice Number */
/* Please enter your voice number */
language(LIGHTGREEN, BLACK, 45);
Enter(1);
@ -223,7 +223,7 @@ int newuser(void)
if (CFG.iDataPhone) {
while (TRUE) {
Enter(1);
/* Please enter you Data Number */
/* Please enter your data number */
language(LIGHTGREEN, BLACK, 48);
Enter(1);
@ -233,7 +233,7 @@ int newuser(void)
GetPhone(temp, 16);
/*
* If no dataphone, copy voicephone.
* If no data phone, copy voice phone.
*/
if (strcmp(temp, "") == 0) {
strcpy(usrconfig.sDataPhone, usrconfig.sVoicePhone);
@ -559,7 +559,7 @@ int newuser(void)
DisplayFile((char *)"registered");
Syslog('+', "Completed new-user procedure");
Syslog('+', "Completed new user procedure");
/* New user registration completed. */
poutCR(LIGHTGREEN, BLACK, (char *) Language(71));
/* You need to login again with the name: */

View File

@ -955,7 +955,7 @@ void OLR_RestrictDate()
{
WhosDoingWhat(OLR, NULL);
PUTSTR((char *)"Not Yet Implemented");
PUTSTR((char *)"Sorry, but this feature isn't yet implemented.");
Enter(1);
Pause();
}
@ -974,7 +974,7 @@ void OLR_Upload(void)
up_list *up = NULL, *tmpf;
if (strlen(CFG.bbsid) == 0) {
PUTSTR((char *)"System configuration error, inform sysop");
PUTSTR((char *)"System configuration error. Inform the sysop!");
Enter(1);
WriteError("Config OLR bbsid not configured");
Pause();
@ -1013,7 +1013,7 @@ void OLR_Upload(void)
}
if (RetVal == FALSE) {
WriteError("Invalid OLR packed received");
WriteError("Invalid OLR packet received!");
for (tmpf = up; tmpf; tmpf = tmpf->next) {
Syslog('+', "Delete %s", tmpf->filename);
unlink(tmpf->filename);
@ -1074,7 +1074,7 @@ void OLR_Upload(void)
rc = execute_str(archiver.funarc, File, NULL, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null");
if (rawport() != 0) {
WriteError("Unable to set raw mode");
WriteError("Unable to set raw mode!");
}
if (rc) {
WriteError("$Failed %s", temp);
@ -1090,7 +1090,7 @@ void OLR_Upload(void)
unlink(File);
/*
* Check for BlueWave files, case insensitive.
* Check for Blue Wave files, case insensitive.
*/
RetVal = FALSE;
snprintf(Dirpath, PATH_MAX, "%s/%s", CFG.bbs_usersdir, exitinfo.Name);
@ -1111,7 +1111,7 @@ void OLR_Upload(void)
}
if (RetVal) {
Syslog('+', "OLR packet is BlueWave v3");
Syslog('+', "OLR packet is Blue Wave v3");
free(File);
free(temp);
BlueWave_Fetch();
@ -1133,7 +1133,7 @@ void OLR_Upload(void)
return;
}
WriteError("OLR_Upload: Garbage in mailpacket, clean directory!");
WriteError("OLR Upload: Garbage in mail packet. Clean up the directory!");
/* Unknown type mailpacket */
poutCR(LIGHTRED, BLACK, (char *)Language(443));
Pause();
@ -1145,7 +1145,7 @@ void OLR_Upload(void)
/***************************************************************************
*
* BlueWave specific functions.
* Blue Wave specific functions.
*/
@ -1156,7 +1156,7 @@ char *Extensions[] = {
/*
* Download a BlueWave mailpacket, called from menu.
* Download a Blue Wave mailpacket, called from menu.
*/
void OLR_DownBW()
{
@ -1172,9 +1172,9 @@ void OLR_DownBW()
msg_high *mhl = NULL;
if (strlen(CFG.bbsid) == 0) {
PUTSTR((char *)"System configuration error, inform sysop");
PUTSTR((char *)"System configuration error. Inform the sysop!");
Enter(1);
WriteError("Config OLR bbsid not configured");
WriteError("Config OLR BBS ID not configured");
Pause();
return;
}
@ -1192,7 +1192,7 @@ void OLR_DownBW()
Now = time(NULL);
tp = localtime(&Now);
Syslog('+', "Preparing BlueWave packet");
Syslog('+', "Preparing Blue Wave packet");
snprintf(Pktname, 32, "%s%s", CFG.bbsid , Extensions[tp->tm_wday]);
Syslog('m', "Packet name %s", Pktname);
@ -1405,13 +1405,13 @@ void OLR_DownBW()
}
if (rc) {
Syslog('+', "BlueWave download failed");
Syslog('+', "Blue Wave download failed");
/* Download failed */
poutCR(CFG.HiliteF, CFG.HiliteB, (char *)Language(447));
} else {
Syslog('+', "BlueWave download successfull");
Syslog('+', "Blue Wave download successful");
PUTCHAR('\r');
/* Download successfull */
/* Download successful */
poutCR(CFG.HiliteF, CFG.HiliteB, (char *)Language(448));
if (mhl != NULL)
@ -1461,10 +1461,10 @@ void BlueWave_Fetch()
}
if (up != NULL) {
fread(&Uph, sizeof(UPL_HEADER), 1, up);
Syslog('+', "Processing BlueWave v3 \"%s\" file", Filename);
Syslog('+', "Processing Blue Wave v3 \"%s\" file", Filename);
Syslog('+', "Client: %s %d.%d", Uph.reader_name, Uph.reader_major, Uph.reader_minor);
if (le_us(Uph.upl_header_len) != sizeof(UPL_HEADER)) {
WriteError("Recordsize mismatch");
WriteError("Record size mismatch");
fclose(up);
free(temp);
/* ERROR in packet */
@ -1638,7 +1638,7 @@ void BlueWave_Fetch()
if (iol != NULL) {
/* Processing Offline Configuration */
poutCR(LIGHTBLUE, BLACK, (char *)Language(455));
Syslog('+', "Processing BlueWave v3 configuration file \"%s\"", Filename);
Syslog('+', "Processing Blue Wave v3 configuration file \"%s\"", Filename);
OLC_head = FALSE;
while (fgets(b, 255, iol) != NULL ) {
@ -1950,7 +1950,7 @@ void OLR_DownQWK(void)
msg_high *tmp, *mhl = NULL;
if (strlen(CFG.bbsid) == 0) {
poutCR(LIGHTRED, BLACK, (char *)"System configuration error, inform sysop");
poutCR(LIGHTRED, BLACK, (char *)"System configuration error. Inform the sysop!");
WriteError("Config OLR bbsid not configured");
Pause();
return;
@ -2159,9 +2159,9 @@ void OLR_DownQWK(void)
/* Download failed */
pout(CFG.HiliteF, CFG.HiliteB, (char *)Language(447));
} else {
Syslog('+', "QWK download successfull");
Syslog('+', "QWK download successful");
PUTCHAR('\r');
/* Download successfull */
/* Download successful */
poutCR(CFG.HiliteF, CFG.HiliteB, (char *)Language(448));
if (mhl != NULL)
@ -2191,7 +2191,7 @@ void QWK_Fetch()
fidoaddr dest;
int HasTear;
/* Processing BlueWave reply packet */
/* Processing QWK reply packet */
poutCR(LIGHTBLUE, BLACK, (char *)Language(459));
temp = calloc(PATH_MAX, sizeof(char));
otemp = calloc(PATH_MAX, sizeof(char));
@ -2665,7 +2665,7 @@ void OLR_DownASCII(void)
msg_high *tmp, *mhl = NULL;
if (strlen(CFG.bbsid) == 0) {
poutCR(LIGHTRED, BLACK, (char *)"System configuration error, inform sysop");
poutCR(LIGHTRED, BLACK, (char *)"System configuration error. Inform the sysop!");
WriteError("Config OLR bbsid not configured");
Pause();
return;
@ -2853,9 +2853,9 @@ void OLR_DownASCII(void)
/* Download failed */
pout(CFG.HiliteF, CFG.HiliteB, (char *)Language(447));
} else {
Syslog('+', "ASCII download successfull");
Syslog('+', "ASCII download successful");
PUTCHAR('\r');
/* Download successfull */
/* Download successful */
poutCR(CFG.HiliteF, CFG.HiliteB, (char *)Language(448));
if (mhl != NULL)