From 8ae20c3627d006c5562bbdf2c67f26e20e450592 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Tue, 24 Apr 2018 19:56:52 +0000
Subject: [PATCH] Make the strings passed to startup->errormsg() more
consistent (a 4-char left-justified server prefix), e.g. "term" now added for
terminal server errors.
---
src/sbbs3/ftpsrvr.c | 2 +-
src/sbbs3/main.cpp | 6 ++++--
src/sbbs3/websrvr.c | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c
index 2f5fac87cd..d335047f9f 100644
--- a/src/sbbs3/ftpsrvr.c
+++ b/src/sbbs3/ftpsrvr.c
@@ -155,7 +155,7 @@ static int lprintf(int level, const char *fmt, ...)
if(level <= LOG_ERR) {
char errmsg[sizeof(sbuf)+16];
- SAFEPRINTF(errmsg, "ftp %s", sbuf);
+ SAFEPRINTF(errmsg, "ftp %s", sbuf);
errorlog(&scfg, startup==NULL ? NULL:startup->host_name, errmsg);
if(startup!=NULL && startup->errormsg!=NULL)
startup->errormsg(startup->cbdata,level,errmsg);
diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp
index 969c4d5ef7..8fecf253f0 100644
--- a/src/sbbs3/main.cpp
+++ b/src/sbbs3/main.cpp
@@ -215,9 +215,11 @@ static void thread_down()
int lputs(int level, const char* str)
{
if(level <= LOG_ERR) {
- errorlog(&scfg,startup==NULL ? NULL:startup->host_name, str);
+ char errmsg[1024];
+ SAFEPRINTF(errmsg, "term %s", str);
+ errorlog(&scfg,startup==NULL ? NULL:startup->host_name, errmsg);
if(startup!=NULL && startup->errormsg!=NULL)
- startup->errormsg(startup->cbdata,level,str);
+ startup->errormsg(startup->cbdata,level,errmsg);
}
if(startup==NULL || startup->lputs==NULL || str==NULL || level > startup->log_level)
diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c
index 7ffed9e800..58e01dfe30 100644
--- a/src/sbbs3/websrvr.c
+++ b/src/sbbs3/websrvr.c
@@ -533,7 +533,7 @@ static int lprintf(int level, const char *fmt, ...)
if(level <= LOG_ERR) {
char errmsg[sizeof(sbuf)+16];
- SAFEPRINTF(errmsg, "web %s", sbuf);
+ SAFEPRINTF(errmsg, "web %s", sbuf);
errorlog(&scfg,startup==NULL ? NULL:startup->host_name, errmsg);
if(startup!=NULL && startup->errormsg!=NULL)
startup->errormsg(startup->cbdata,level,errmsg);
--
GitLab