From e6bb8be35d2e1565b00542199d06c272f1af0ba4 Mon Sep 17 00:00:00 2001
From: Rob Swindell <rob@synchro.net>
Date: Wed, 25 Nov 2020 01:31:23 -0800
Subject: [PATCH] Trim left-most whitespace from stderr lines of externals
before logging.
---
src/sbbs3/xtrn.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/sbbs3/xtrn.cpp b/src/sbbs3/xtrn.cpp
index 75c862ee3a..15d46ed8fa 100644
--- a/src/sbbs3/xtrn.cpp
+++ b/src/sbbs3/xtrn.cpp
@@ -1081,9 +1081,7 @@ int sbbs_t::external(const char* cmdline, long mode, const char* startup_dir)
struct timeval timeout;
BYTE wwiv_buf[XTRN_IO_BUF_LEN*2];
bool wwiv_flag=false;
-#if defined(__FreeBSD__) || (defined(__linux__) && defined(USE_DOSEMU))
char* p;
-#endif
xtrn_mode = mode;
lprintf(LOG_DEBUG, "Executing external: %s", cmdline);
@@ -1787,9 +1785,11 @@ int sbbs_t::external(const char* cmdline, long mode, const char* startup_dir)
i+=rd;
if(*bp=='\n') {
buf[i] = '\0';
- truncsp((char*)buf);
- if(*buf)
- lprintf(LOG_NOTICE, "%s", buf);
+ p = (char*)buf;
+ truncsp(p);
+ SKIP_WHITESPACE(p);
+ if(*p)
+ lprintf(LOG_NOTICE, "%s", p);
i=0;
bp=buf;
}
--
GitLab