From 330ca5153fcc4d8a7d866e637d1f1091272c9b38 Mon Sep 17 00:00:00 2001 From: Andrew Leary Date: Wed, 18 Jan 2017 19:45:13 -0500 Subject: [PATCH] Bring Git repository to v1.0.6.13 level. --- ChangeLog | 27 ++++++++++++++++++++ configure | 6 ++--- configure.ac | 6 ++--- lib/Makefile | 2 +- lib/nodelist.c | 8 +++--- lib/users.h | 1 + mbfido/mgrutil.c | 4 +-- mbsebbs/mbsebbs.c | 1 + mbsebbs/offline.c | 9 +++++-- mbsebbs/pinfo.c | 6 ++--- mbsetup/m_users.c | 63 +++++++++++++++++++++++++---------------------- mbtask/mbtask.c | 2 +- 12 files changed, 85 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5632c54b..7b347a93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +v1.0.6.13 15-Jan-2017 - Andrew Leary + + 1. Fixed mbfido using LFs instead of CRs in Notify messages. + +v1.0.6.12 11-Jan-2017 - Andrew Leary + + 1. MBSE will now properly number Blue Wave packet + extensions, instead of always using .DD0 (DD being the + current day of the week.) Reported by Sean Dennis. + +v1.0.6.11 08-Jan-2017 - Andrew Leary + + 1. Forgot to update the copyright notices to reflect 2017. + + 2. Update the product information screen in the BBS to + reflect the SourceForge website. + +v1.0.6.10 03-Jan-2017 - Andrew Leary + + 1. Fixed a bug in the nodelist flag parsing code that resulted + in finding the wrong FQDN when a nodelist entry had both an + email address (IEM: flag) and an INA: flag. + + 2. Updated the default English language file to correct + grammar and spelling issues. Thanks to Sean Dennis for this + update. + v1.0.6.9 28-Sep-2016 - Andrew Leary 1. Fixed compiler warnings while building the BBS. Thanks to diff --git a/configure b/configure index ae40e983..c7cc17ad 100755 --- a/configure +++ b/configure @@ -2309,10 +2309,10 @@ SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbutils mbnntp mbtask mbsetup unix lang PACKAGE="mbsebbs" MAJOR="1" MINOR="0" -REVISION="6.9" +REVISION="6.13" VERSION="$MAJOR.$MINOR.$REVISION" -COPYRIGHT="Copyright (C) 1997-2016 MBSE Development Team, All Rights Reserved" -SHORTRIGHT="Copyright (C) 1997-2016 MBSE DevTm" +COPYRIGHT="Copyright (C) 1997-2017 MBSE Development Team, All Rights Reserved" +SHORTRIGHT="Copyright (C) 1997-2017 MBSE DevTm" GROUP="bbs" OWNER="mbse" ROWNER="`id -un root`" diff --git a/configure.ac b/configure.ac index 6db8ebb6..06552002 100644 --- a/configure.ac +++ b/configure.ac @@ -12,10 +12,10 @@ AC_SUBST(SUBDIRS) PACKAGE="mbsebbs" MAJOR="1" MINOR="0" -REVISION="6.9" +REVISION="6.13" VERSION="$MAJOR.$MINOR.$REVISION" -COPYRIGHT="Copyright (C) 1997-2016 MBSE Development Team, All Rights Reserved" -SHORTRIGHT="Copyright (C) 1997-2016 MBSE DevTm" +COPYRIGHT="Copyright (C) 1997-2017 MBSE Development Team, All Rights Reserved" +SHORTRIGHT="Copyright (C) 1997-2017 MBSE DevTm" GROUP="bbs" OWNER="mbse" ROWNER="`id -un root`" diff --git a/lib/Makefile b/lib/Makefile index c3ed1bc5..1fc6d8de 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -42,7 +42,7 @@ OBJS = ${COMMON_OBJS} ${DBASE_OBJS} ${MSGBASE_OBJS} ${MBINET_OBJS} \ ${DIESEL_OBJS} ${NODELIST_OBJS} ${CHC_OBJS} HDRS = ${COMMON_HDRS} ${DBASE_HDRS} ${MSGBASE_HDRS} ${MBINET_HDRS} \ ${DIESEL_HDRS} ${NODELIST_HDRS} ${CHC_HDRS} ${OTHER_HDRS} -OTHER = Makefile README ftscprod.016 mkprod.awk \ +OTHER = Makefile README ftscprod.017 mkprod.awk \ README.diesel README.macro Diesel.doc nodelist.conf TARGET = libmbse.a libdbase.a libmsgbase.a libmbinet.a libdiesel.a \ libnodelist.a diff --git a/lib/nodelist.c b/lib/nodelist.c index aeb45ab4..8d9cde04 100644 --- a/lib/nodelist.c +++ b/lib/nodelist.c @@ -1021,12 +1021,10 @@ node *getnlent(faddr *addr) if ((r = strchr(p, ':'))) { r++; /* - * If there is a user@domain then strip the userpart. + * If there is a user@domain then skip to the next flag. */ - if (strchr(r, '@')) { - r = strchr(r, '@'); - r++; - } + if (strchr(r, '@')) + continue; if (*r == '*') { Syslog('n', "getnlent: possible default domain marking \"%s\"", MBSE_SS(r)); for (tmpd = &nl_domsuffix; *tmpd; tmpd=&((*tmpd)->next)) { diff --git a/lib/users.h b/lib/users.h index 3ee04f20..88ed9a05 100644 --- a/lib/users.h +++ b/lib/users.h @@ -150,6 +150,7 @@ struct userrec { unsigned FSemacs : 1; /* FSedit uses emacs keys */ char Password[Max_passlen+1];/* Plain password */ int Charset; /* Character set */ + int OLRext; /* OLR extension counter */ }; diff --git a/mbfido/mgrutil.c b/mbfido/mgrutil.c index af170a7a..2128c1ca 100644 --- a/mbfido/mgrutil.c +++ b/mbfido/mgrutil.c @@ -69,7 +69,7 @@ void MacroRead(FILE *fi, FILE *fp) /* * Empty lines are just written */ - fprintf(fp, "\n"); + fprintf(fp, "\r"); } else { strncpy(temp, ParseMacro(line,&res), 254); if (res) @@ -78,7 +78,7 @@ void MacroRead(FILE *fi, FILE *fp) * Only output if something was evaluated */ if (strlen(temp)) - fprintf(fp, "%s\n", temp); + fprintf(fp, "%s\r", temp); } } } diff --git a/mbsebbs/mbsebbs.c b/mbsebbs/mbsebbs.c index f72c95bd..38bfe68b 100644 --- a/mbsebbs/mbsebbs.c +++ b/mbsebbs/mbsebbs.c @@ -396,6 +396,7 @@ int main(int argc, char **argv) if (CFG.iConnectString) { /* Connected from */ snprintf(temp, 81, "%s\"%s\" ", (char *) Language(348), ttyinfo.comment); + Syslog('b', "ttyinfo.comment = %s", ttyinfo.comment); pout(CYAN, BLACK, temp); /* line */ snprintf(temp, 81, "%s%d ", (char *) Language(31), iNode); diff --git a/mbsebbs/offline.c b/mbsebbs/offline.c index 4857df8d..27ed339e 100644 --- a/mbsebbs/offline.c +++ b/mbsebbs/offline.c @@ -1150,7 +1150,7 @@ void OLR_Upload(void) char *Extensions[] = { - (char *)".SU0", (char *)".MO0", (char *)".TU0", (char *)".WE0", (char *)".TH0", (char *)".FR0", (char *)".SA0" + (char *)".SU", (char *)".MO", (char *)".TU", (char *)".WE", (char *)".TH", (char *)".FR", (char *)".SA" }; @@ -1194,7 +1194,7 @@ void OLR_DownBW() tp = localtime(&Now); Syslog('+', "Preparing Blue Wave packet"); - snprintf(Pktname, 32, "%s%s", CFG.bbsid , Extensions[tp->tm_wday]); + snprintf(Pktname, 32, "%s%s%d", CFG.bbsid , Extensions[tp->tm_wday], exitinfo.OLRext); Syslog('m', "Packet name %s", Pktname); snprintf(Work, PATH_MAX, "%s/%s/tmp", CFG.bbs_usersdir, exitinfo.Name); Syslog('m', "Work path %s", Work); @@ -1416,6 +1416,11 @@ void OLR_DownBW() if (mhl != NULL) UpdateLR(mhl, mf); + /* Update OLR extension */ + exitinfo.OLRext++; + if (exitinfo.OLRext > 9) + exitinfo.OLRext = 0; /* After 9, go back to 0 */ + WriteExitinfo(); } fclose(mf); diff --git a/mbsebbs/pinfo.c b/mbsebbs/pinfo.c index 22c8781b..5c8c9127 100644 --- a/mbsebbs/pinfo.c +++ b/mbsebbs/pinfo.c @@ -102,7 +102,7 @@ void cr(void) PUTSTR(chartran(pstr)); ls(); - snprintf(temp, 81, "%s", COPYRIGHT); + snprintf(temp, 81, "%s.", COPYRIGHT); strncat(pstr, pout_str(LIGHTCYAN, BLACK, padleft(temp, 76, ' ')), 255); rs(); PUTSTR(chartran(pstr)); @@ -130,7 +130,7 @@ void cr(void) PUTSTR(chartran(pstr)); ls(); - strncat(pstr, pout_str(LIGHTCYAN, BLACK, (char *)"BBS a better BBS "), 255); + strncat(pstr, pout_str(LIGHTCYAN, BLACK, (char *)"BBS a better BBS. "), 255); rs(); PUTSTR(chartran(pstr)); @@ -138,7 +138,7 @@ void cr(void) PUTSTR(chartran(pstr)); ls(); - strncat(pstr, pout_str(WHITE, BLACK, (char *)"Available from http://www.mbse.eu or 2:280/2802 "), 255); + strncat(pstr, pout_str(WHITE, BLACK, (char *)"Available from https://sourceforge.net/projects/mbsebbs "), 255); rs(); PUTSTR(chartran(pstr)); diff --git a/mbsetup/m_users.c b/mbsetup/m_users.c index 32239c5f..3579bfed 100644 --- a/mbsetup/m_users.c +++ b/mbsetup/m_users.c @@ -284,16 +284,17 @@ void Screen2(void) mbse_mvprintw(17, 2, "12. Archiver"); mbse_mvprintw(18, 2, "13. Charset"); - mbse_mvprintw( 7,63, "14. Language"); - mbse_mvprintw( 8,63, "15. Hotkeys"); - mbse_mvprintw( 9,63, "16. Silent"); - mbse_mvprintw(10,63, "17. CLS"); - mbse_mvprintw(11,63, "18. More"); - mbse_mvprintw(12,63, "19. Editor"); - mbse_mvprintw(13,63, "20. MailScan"); - mbse_mvprintw(14,63, "21. ShowNews"); - mbse_mvprintw(15,63, "22. NewFiles"); - mbse_mvprintw(16,63, "23. Emacs"); + mbse_mvprintw( 7,58, "14. Language"); + mbse_mvprintw( 8,58, "15. Hotkeys"); + mbse_mvprintw( 9,58, "16. Silent"); + mbse_mvprintw(10,58, "17. CLS"); + mbse_mvprintw(11,58, "18. More"); + mbse_mvprintw(12,58, "19. Editor"); + mbse_mvprintw(13,58, "20. MailScan"); + mbse_mvprintw(14,58, "21. ShowNews"); + mbse_mvprintw(15,58, "22. NewFiles"); + mbse_mvprintw(16,58, "23. Emacs"); + mbse_mvprintw(17,58, "24. OLRext"); } @@ -318,16 +319,17 @@ void Fields2(void) show_charset(18,17,usrconfig.Charset); snprintf(temp, 4, "%c",usrconfig.iLanguage); - show_str( 7,76,1, temp); - show_bool( 8,76, usrconfig.HotKeys); - show_bool( 9,76, usrconfig.DoNotDisturb); - show_bool(10,76, usrconfig.Cls); - show_bool(11,76, usrconfig.More); - show_msgeditor(12,76, usrconfig.MsgEditor); - show_bool(13,76, usrconfig.MailScan); - show_bool(14,76, usrconfig.ieNEWS); - show_bool(15,76, usrconfig.ieFILE); - show_bool(16,76, usrconfig.FSemacs); + show_str( 7,71,1, temp); + show_bool( 8,71, usrconfig.HotKeys); + show_bool( 9,71, usrconfig.DoNotDisturb); + show_bool(10,71, usrconfig.Cls); + show_bool(11,71, usrconfig.More); + show_msgeditor(12,71, usrconfig.MsgEditor); + show_bool(13,71, usrconfig.MailScan); + show_bool(14,71, usrconfig.ieNEWS); + show_bool(15,71, usrconfig.ieFILE); + show_bool(16,71, usrconfig.FSemacs); + show_int( 17,71, usrconfig.OLRext); } @@ -340,7 +342,7 @@ int EditUsrRec2(void) Screen2(); for (;;) { Fields2(); - j = select_menu(23); + j = select_menu(24); switch(j) { case 0: return 0; case 1: E_STR( 6,17,35,usrconfig.sHandle, "The ^Handle^ of this user") @@ -413,16 +415,17 @@ int EditUsrRec2(void) clr_index(); Screen2(); break; - case 15:E_BOOL( 8,76,usrconfig.HotKeys, "Is user using ^HotKeys^ for menus") - case 16:E_BOOL( 9,76,usrconfig.DoNotDisturb, "User will not be ^disturbed^") - case 17:E_BOOL(10,76,usrconfig.Cls, "Send ^ClearScreen code^ to users terminal") - case 18:E_BOOL(11,76,usrconfig.More, "User uses the ^More prompt^") - case 19:usrconfig.MsgEditor = edit_msgeditor(12,76,usrconfig.MsgEditor); + case 15:E_BOOL( 8,71,usrconfig.HotKeys, "Is user using ^HotKeys^ for menus") + case 16:E_BOOL( 9,71,usrconfig.DoNotDisturb, "User will not be ^disturbed^") + case 17:E_BOOL(10,71,usrconfig.Cls, "Send ^ClearScreen code^ to users terminal") + case 18:E_BOOL(11,71,usrconfig.More, "User uses the ^More prompt^") + case 19:usrconfig.MsgEditor = edit_msgeditor(12,71,usrconfig.MsgEditor); break; - case 20:E_BOOL(13,76,usrconfig.MailScan, "Don't check for ^new mail^") - case 21:E_BOOL(14,76,usrconfig.ieNEWS, "Show ^News Bulletins^ when logging in") - case 22:E_BOOL(15,76,usrconfig.ieFILE, "Show ^New Files^ when logging in") - case 23:E_BOOL(16,76,usrconfig.FSemacs, "Use ^Emacs^ or Wordstart shorcut keys in FS editor") + case 20:E_BOOL(13,71,usrconfig.MailScan, "Don't check for ^new mail^") + case 21:E_BOOL(14,71,usrconfig.ieNEWS, "Show ^News Bulletins^ when logging in") + case 22:E_BOOL(15,71,usrconfig.ieFILE, "Show ^New Files^ when logging in") + case 23:E_BOOL(16,71,usrconfig.FSemacs, "Use ^Emacs^ or Wordstar shorcut keys in FS editor") + case 24:E_INT( 17,71,usrconfig.OLRext, "Next ^OLR^ packet extension") } } } diff --git a/mbtask/mbtask.c b/mbtask/mbtask.c index 9e58cbbf..7ca243fd 100644 --- a/mbtask/mbtask.c +++ b/mbtask/mbtask.c @@ -397,7 +397,7 @@ void load_taskcfg(void) snprintf(TCFG.cmd_mbindex2, 81, "%s -f -q", _PATH_GOLDNODE); snprintf(TCFG.cmd_msglink, 81, "%s/bin/mbmsg link -quiet", getenv("MBSE_ROOT")); snprintf(TCFG.cmd_reqindex, 81, "%s/bin/mbfile index -quiet", getenv("MBSE_ROOT")); - TCFG.max_tcp = 0; + TCFG.max_tcp = 3; snprintf(TCFG.isp_ping1, 41, "192.168.1.1"); snprintf(TCFG.isp_ping2, 41, "192.168.1.1"); if ((fp = fopen(tcfgfn, "a+")) == NULL) {