From 1452c32f8c8e78600266171c42440a4e593ae3a8 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Thu, 26 Oct 2000 02:55:26 +0000
Subject: [PATCH] Uses new COMPILER_DESC macro (defined in sbbswrap.h) to
describe C/C++ compiler used.
---
src/sbbs3/ftpsrvr.c | 20 ++------------------
src/sbbs3/mailsrvr.c | 22 +++-------------------
src/sbbs3/ver.cpp | 16 +---------------
3 files changed, 6 insertions(+), 52 deletions(-)
diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c
index 45e00bfce3..7a455c02b6 100644
--- a/src/sbbs3/ftpsrvr.c
+++ b/src/sbbs3/ftpsrvr.c
@@ -2920,15 +2920,7 @@ char* ftp_ver(void)
static char ver[256];
char compiler[32];
-#if defined(__BORLANDC__)
- sprintf(compiler,"BCC %X.%02X"
- ,__BORLANDC__>>8
- ,__BORLANDC__&0xff);
-#elif defined(_MSC_VER)
- sprintf(compiler,"MSC %u", _MSC_VER);
-#else
- strcpy(compiler,"UNKNOWN COMPILER");
-#endif
+ COMPILER_DESC(compiler);
sprintf(ver,"Synchronet FTP Server v%s%s "
"Compiled %s %s with %s"
@@ -2986,15 +2978,7 @@ void ftp_server(void* arg)
#endif
);
-#if defined(__BORLANDC__)
- sprintf(compiler,"BCC %X.%02X"
- ,__BORLANDC__>>8
- ,__BORLANDC__&0xff);
-#elif defined(_MSC_VER)
- sprintf(compiler,"MSC %u", _MSC_VER);
-#else
- strcpy(compiler,"UNKNOWN COMPILER");
-#endif
+ COMPILER_DESC(compiler);
lprintf("Compiled %s %s with %s", __DATE__, __TIME__, compiler);
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index adaf7713f5..312fa684f2 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -1327,7 +1327,7 @@ static void smtp_thread(void* arg)
truncsp(rcpt_name);
truncsp(rcpt_addr);
- snprintf(hdrfield,sizeof(hdrfield),
+ _snprintf(hdrfield,sizeof(hdrfield),
"Received: from %s (%s [%s])\r\n"
" by %s [%s] (Synchronet Mail Server %s) with %s\r\n"
" for %s; %s"
@@ -2247,15 +2247,7 @@ char* mail_ver(void)
static char ver[256];
char compiler[32];
-#if defined(__BORLANDC__)
- sprintf(compiler,"BCC %X.%02X"
- ,__BORLANDC__>>8
- ,__BORLANDC__&0xff);
-#elif defined(_MSC_VER)
- sprintf(compiler,"MSC %u", _MSC_VER);
-#else
- strcpy(compiler,"UNKNOWN COMPILER");
-#endif
+ COMPILER_DESC(compiler);
sprintf(ver,"Synchronet Mail Server v%s%s SMBLIB v%s "
"Compiled %s %s with %s"
@@ -2321,15 +2313,7 @@ void mail_server(void* arg)
#endif
);
-#if defined(__BORLANDC__)
- sprintf(compiler,"BCC %X.%02X"
- ,__BORLANDC__>>8
- ,__BORLANDC__&0xff);
-#elif defined(_MSC_VER)
- sprintf(compiler,"MSC %u", _MSC_VER);
-#else
- strcpy(compiler,"UNKNOWN COMPILER");
-#endif
+ COMPILER_DESC(compiler);
lprintf("Compiled %s %s with %s", __DATE__, __TIME__, compiler);
diff --git a/src/sbbs3/ver.cpp b/src/sbbs3/ver.cpp
index 9558466c17..2731b1ffb8 100644
--- a/src/sbbs3/ver.cpp
+++ b/src/sbbs3/ver.cpp
@@ -53,21 +53,7 @@ void sbbs_t::ver()
center(str);
CRLF;
-#if defined(__BORLANDC__)
- sprintf(compiler,"BCC %X.%02X"
- ,__BORLANDC__>>8
- ,__BORLANDC__&0xff);
-#elif defined(_MSC_VER)
- sprintf(compiler,"MSC %u", _MSC_VER);
-#elif defined(__GNUC__) && defined(__GLIBC__)
- sprintf(compiler,"GCC %u.%02u (GLIBC %u.%u)"
- ,__GNUC__
- ,__GNUC_MINOR__
- ,__GLIBC__
- ,__GLIBC_MINOR__);
-#else
- strcpy(compiler,"UNKNOWN COMPILER");
-#endif
+ COMPILER_DESC(compiler);
sprintf(str,"Revision %c%s %s %.5s "
"SMBLIB %s %s"
--
GitLab