...
 
Commits (1)
......@@ -43,6 +43,7 @@
#include "cryptlib.h"
#include "xpprintf.h" // vasprintf
#include "md5.h"
#include "ver.h"
/* Constants */
......@@ -82,7 +83,6 @@ static protected_uint32_t thread_count;
static volatile time_t uptime=0;
static volatile ulong served=0;
static volatile BOOL terminate_server=FALSE;
static char revision[16];
static char *text[TOTAL_TEXT];
static str_list_t recycle_semfiles;
static str_list_t shutdown_semfiles;
......@@ -3112,8 +3112,8 @@ static void ctrl_thread(void* arg)
}
sockprintf(sock,sess,"220-%s (%s)",scfg.sys_name, server_host_name());
sockprintf(sock,sess," Synchronet FTP Server %s-%s Ready"
,revision,PLATFORM_DESC);
sockprintf(sock,sess," Synchronet FTP Server %s%c-%s Ready"
,VERSION, REVISION, PLATFORM_DESC);
sprintf(str,"%sftplogin.txt",scfg.text_dir);
if((fp=fopen(str,"rb"))!=NULL) {
while(!feof(fp)) {
......@@ -5965,17 +5965,16 @@ const char* DLLCALL ftp_ver(void)
DESCRIBE_COMPILER(compiler);
sscanf("$Revision: 1.501 $", "%*s %s", revision);
sprintf(ver,"%s %s%s "
"Compiled %s %s with %s"
safe_snprintf(ver, sizeof(ver), "%s %s%c%s "
"Compiled %s/%s %s %s with %s"
,FTP_SERVER
,revision
,VERSION, REVISION
#ifdef _DEBUG
," Debug"
#else
,""
#endif
,git_branch, git_hash
,__DATE__, __TIME__, compiler);
return(ver);
......@@ -5999,8 +5998,6 @@ void DLLCALL ftp_server(void* arg)
char client_ip[INET6_ADDRSTRLEN];
CRYPT_SESSION none = -1;
ftp_ver();
startup=(ftp_startup_t*)arg;
SetThreadName("sbbs/ftpServer");
......@@ -6024,7 +6021,7 @@ void DLLCALL ftp_server(void* arg)
}
ZERO_VAR(js_server_props);
SAFEPRINTF2(js_server_props.version,"%s %s",FTP_SERVER,revision);
SAFEPRINTF3(js_server_props.version,"%s %s%c", FTP_SERVER, VERSION, REVISION);
js_server_props.version_detail=ftp_ver();
js_server_props.clients=&active_clients.value;
js_server_props.options=&startup->options;
......@@ -6061,8 +6058,8 @@ void DLLCALL ftp_server(void* arg)
memset(&scfg, 0, sizeof(scfg));
lprintf(LOG_INFO,"Synchronet FTP Server Revision %s%s"
,revision
lprintf(LOG_INFO,"Synchronet FTP Server Version %s%c%s"
,VERSION, REVISION
#ifdef _DEBUG
," Debug"
#else
......@@ -6072,7 +6069,7 @@ void DLLCALL ftp_server(void* arg)
DESCRIBE_COMPILER(compiler);
lprintf(LOG_INFO,"Compiled %s %s with %s", __DATE__, __TIME__, compiler);
lprintf(LOG_INFO,"Compiled %s/%s %s %s with %s", git_branch, git_hash, __DATE__, __TIME__, compiler);
sbbs_srand(); /* Seed random number generator */
......
......@@ -176,6 +176,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="ver.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\xpdev\xpdev_mt.vcxproj">
......
......@@ -45,6 +45,7 @@
#include "multisock.h"
#include "ssl.h"
#include "cryptlib.h"
#include "ver.h"
/* Constants */
static const char* server_name="Synchronet Mail Server";
......@@ -84,7 +85,6 @@ static volatile BOOL sendmail_running=FALSE;
static volatile BOOL terminate_server=FALSE;
static volatile BOOL terminate_sendmail=FALSE;
static sem_t sendmail_wakeup_sem;
static char revision[16];
static volatile time_t uptime;
static str_list_t recycle_semfiles;
static str_list_t shutdown_semfiles;
......@@ -1176,8 +1176,8 @@ static void pop3_thread(void* arg)
safe_snprintf(challenge,sizeof(challenge),"<%x%x%lx%lx@%.128s>"
,rand(),socket,(ulong)time(NULL),(ulong)clock(), server_host_name());
sockprintf(socket,client.protocol,session,"+OK Synchronet %s Server %s-%s Ready %s"
,client.protocol, revision,PLATFORM_DESC,challenge);
sockprintf(socket,client.protocol,session,"+OK Synchronet %s Server %s%c-%s Ready %s"
,client.protocol, VERSION, REVISION, PLATFORM_DESC, challenge);
/* Requires USER or APOP command first */
for(i=5;i;i--) {
......@@ -1192,7 +1192,7 @@ static void pop3_thread(void* arg)
else if (!stricmp(buf, "CAPA")) {
// Capabilities
sockprintf(socket,client.protocol,session, "+OK Capability list follows");
sockprintf(socket,client.protocol,session, "TOP\r\nUSER\r\nPIPELINING\r\nUIDL\r\nIMPLEMENTATION Synchronet POP3 Server %s-%s\r\n%s.", revision, PLATFORM_DESC, (session != -1 || get_ssl_cert(&scfg, NULL, NULL) == -1) ? "" : "STLS\r\n");
sockprintf(socket,client.protocol,session, "TOP\r\nUSER\r\nPIPELINING\r\nUIDL\r\nIMPLEMENTATION Synchronet POP3 Server %s%c-%s\r\n%s.", VERSION, REVISION, PLATFORM_DESC, (session != -1 || get_ssl_cert(&scfg, NULL, NULL) == -1) ? "" : "STLS\r\n");
i++;
}
else if (!stricmp(buf, "STLS")) {
......@@ -1408,7 +1408,7 @@ static void pop3_thread(void* arg)
if(!stricmp(buf, "CAPA")) {
// Capabilities
sockprintf(socket,client.protocol,session, "+OK Capability list follows");
sockprintf(socket,client.protocol,session, "TOP\r\nUSER\r\nPIPELINING\r\nUIDL\r\nIMPLEMENTATION Synchronet POP3 Server %s-%s\r\n.", revision, PLATFORM_DESC);
sockprintf(socket,client.protocol,session, "TOP\r\nUSER\r\nPIPELINING\r\nUIDL\r\nIMPLEMENTATION Synchronet POP3 Server %s%c-%s\r\n.", VERSION, REVISION, PLATFORM_DESC);
continue;
}
if(!stricmp(buf, "QUIT")) {
......@@ -3209,8 +3209,8 @@ static void smtp_thread(void* arg)
/* SMTP session active: */
sockprintf(socket,client.protocol,session,"220 %s Synchronet %s Server %s-%s Ready"
,server_host_name(), client.protocol, revision, PLATFORM_DESC);
sockprintf(socket,client.protocol,session,"220 %s Synchronet %s Server %s%c-%s Ready"
,server_host_name(), client.protocol, VERSION, REVISION, PLATFORM_DESC);
while(1) {
rd = sockreadline(socket, client.protocol, session, buf, sizeof(buf));
if(rd<0)
......@@ -3928,7 +3928,7 @@ static void smtp_thread(void* arg)
snprintf(hdrfield,sizeof(hdrfield),
"from %s (%s [%s%s])\r\n"
" by %s [%s%s] (%s %s-%s) with %s\r\n"
" by %s [%s%s] (%s %s%c-%s) with %s\r\n"
" for %s; %s\r\n"
" (envelope-from %s)"
,host_name,hello_name
......@@ -3938,7 +3938,7 @@ static void smtp_thread(void* arg)
,server_addr.addr.sa_family==AF_INET6?"IPv6: ":""
,server_ip
,server_name
,revision,PLATFORM_DESC
,VERSION, REVISION, PLATFORM_DESC
,with_clauses[with_val]
,forward_path,msgdate(msg.hdr.when_imported,date)
,reverse_path);
......@@ -6007,18 +6007,16 @@ const char* DLLCALL mail_ver(void)
DESCRIBE_COMPILER(compiler);
sscanf("$Revision: 1.735 $", "%*s %s", revision);
sprintf(ver,"%s %s%s SMBLIB %s "
"Compiled %s %s with %s"
sprintf(ver,"%s %s%c%s "
"Compiled %s/%s %s %s with %s"
,server_name
,revision
,VERSION, REVISION
#ifdef _DEBUG
," Debug"
#else
,""
#endif
,smb_lib_ver()
,git_branch, git_hash
,__DATE__, __TIME__, compiler
);
......@@ -6049,8 +6047,6 @@ void DLLCALL mail_server(void* arg)
char* servprot = "N/A";
CRYPT_SESSION session = -1;
mail_ver();
startup=(mail_startup_t*)arg;
#ifdef _THREAD_SUID_BROKEN
......@@ -6073,7 +6069,7 @@ void DLLCALL mail_server(void* arg)
}
ZERO_VAR(js_server_props);
SAFEPRINTF2(js_server_props.version,"%s %s",server_name,revision);
SAFEPRINTF3(js_server_props.version,"%s %s%c",server_name, VERSION, REVISION);
js_server_props.version_detail=mail_ver();
js_server_props.clients=&active_clients.value;
js_server_props.options=&startup->options;
......@@ -6113,9 +6109,9 @@ void DLLCALL mail_server(void* arg)
memset(&scfg, 0, sizeof(scfg));
lprintf(LOG_INFO,"%s Revision %s%s"
lprintf(LOG_INFO,"%s Version %s%c%s"
,server_name
,revision
,VERSION, REVISION
#ifdef _DEBUG
," Debug"
#else
......@@ -6125,9 +6121,7 @@ void DLLCALL mail_server(void* arg)
DESCRIBE_COMPILER(compiler);
lprintf(LOG_INFO,"Compiled %s %s with %s", __DATE__, __TIME__, compiler);
lprintf(LOG_DEBUG,"SMBLIB %s (format %x.%02x)",smb_lib_ver(),smb_ver()>>8,smb_ver()&0xff);
lprintf(LOG_INFO,"Compiled %s/%s %s %s with %s", git_branch, git_hash, __DATE__, __TIME__, compiler);
sbbs_srand();
......
......@@ -191,6 +191,7 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="nopen.c" />
<ClCompile Include="ver.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\xpdev\xpdev_mt.vcxproj">
......
......@@ -27,6 +27,7 @@
#include "js_rtpool.h"
#include "js_request.h"
#include "ssl.h"
#include "ver.h"
#include <multisock.h>
#include <limits.h> // HOST_NAME_MAX
......@@ -4877,7 +4878,7 @@ const char* DLLCALL bbs_ver(void)
if(ver[0]==0) { /* uninitialized */
DESCRIBE_COMPILER(compiler);
safe_snprintf(ver,sizeof(ver),"%s %s%c%s SMBLIB %s Compiled %s %s with %s"
safe_snprintf(ver,sizeof(ver),"%s %s%c%s Compiled %s/%s %s %s with %s"
,TELNET_SERVER
,VERSION, REVISION
#ifdef _DEBUG
......@@ -4885,7 +4886,7 @@ const char* DLLCALL bbs_ver(void)
#else
,""
#endif
,smb_lib_ver()
,git_branch, git_hash
,__DATE__, __TIME__, compiler
);
}
......@@ -5048,18 +5049,17 @@ void DLLCALL bbs_thread(void* arg)
char compiler[32];
DESCRIBE_COMPILER(compiler);
lprintf(LOG_INFO,"%s Version %s Revision %c%s"
lprintf(LOG_INFO,"%s Version %s%c%s"
,TELNET_SERVER
,VERSION
,toupper(REVISION)
,REVISION
#ifdef _DEBUG
," Debug"
#else
,""
#endif
);
lprintf(LOG_INFO,"Compiled %s %s with %s", __DATE__, __TIME__, compiler);
lprintf(LOG_DEBUG,"SMBLIB %s (format %x.%02x)",smb_lib_ver(),smb_ver()>>8,smb_ver()&0xff);
lprintf(LOG_INFO,"Compiled %s/%s %s %s with %s", git_branch, git_hash, __DATE__, __TIME__, compiler);
#ifdef _DEBUG
lprintf(LOG_DEBUG, "sizeof: int=%d, long=%d, off_t=%d, time_t=%d"
......
......@@ -21,8 +21,7 @@
#include "msg_id.h"
#include "smblib.h"
#include "git_branch.h"
#include "git_hash.h"
#include "ver.h"
static ulong msg_number(smbmsg_t* msg)
{
......@@ -246,7 +245,7 @@ char* DLLCALL msg_program_id(char* pid, size_t maxlen)
DESCRIBE_COMPILER(compiler);
snprintf(pid, maxlen, "%.10s %s%c-%s %s/%s %s %s"
,VERSION_NOTICE,VERSION,REVISION,PLATFORM_DESC
,GIT_BRANCH, GIT_HASH
,git_branch, git_hash
,__DATE__,compiler);
return pid;
}
......
/* Synchronet vanilla/console-mode "front-end" */
/* $Id: sbbscon.c,v 1.282 2020/08/17 00:48:28 rswindell Exp $ */
// vi: tabstop=4
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
......@@ -16,21 +13,9 @@
* See the GNU General Public License for more details: gpl.txt or *
* http://www.fsf.org/copyleft/gpl.html *
* *
* Anonymous FTP access to the most recent released source is available at *
* ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
* *
* Anonymous CVS access to the development source and modification history *
* is available at cvs.synchro.net:/cvsroot/sbbs, example: *
* cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
* (just hit return, no password is necessary) *
* cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
* *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
* You are encouraged to submit any modifications (preferably in Unix diff *
* format) via e-mail to mods@synchro.net *
* *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
......@@ -55,6 +40,7 @@
#include "ftpsrvr.h" /* ftp_startup_t, ftp_server */
#include "mailsrvr.h" /* mail_startup_t, mail_server */
#include "services.h" /* services_startup_t, services_thread */
#include "ver.h"
/* XPDEV headers */
#include "conwrap.h" /* kbhit/getch */
......@@ -1570,8 +1556,6 @@ int main(int argc, char** argv)
continue;
}
if(stricmp(arg, "version") == 0) {
char revision[16];
sscanf("$Revision: 1.282 $", "%*s %s", revision);
char compiler[32];
DESCRIBE_COMPILER(compiler);
printf("%s\n", bbs_ver());
......@@ -1579,13 +1563,14 @@ int main(int argc, char** argv)
printf("%s\n", ftp_ver());
printf("%s\n", web_ver());
printf("%s\n", services_ver());
printf("Synchronet Console %s%s Compiled %s %s with %s\n"
,revision
printf("Synchronet Console %s%c%s Compiled %s/%s %s %s with %s\n"
,VERSION, REVISION
#ifdef _DEBUG
," Debug"
#else
,""
#endif
,git_branch, git_hash
,__DATE__, __TIME__, compiler);
return EXIT_SUCCESS;
}
......
......@@ -159,6 +159,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="ver.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\xpdev\xpdev_mt.vcxproj">
......
......@@ -53,6 +53,7 @@
#include "msg_id.h"
#include "scfgsave.h"
#include "getmail.h"
#include "ver.h"
#define MAX_OPEN_SMBS 10
......@@ -91,7 +92,6 @@ str_list_t bad_areas;
fidoaddr_t sys_faddr = {1,1,1,0}; /* Default system address: 1:1/1.0 */
sbbsecho_cfg_t cfg;
scfg_t scfg;
char revision[16];
char compiler[32];
bool pause_on_exit=false;
......@@ -116,8 +116,8 @@ const char* sbbsecho_pid(void)
{
static char str[256];
sprintf(str, "SBBSecho %u.%02u-%s r%s %s %s"
,SBBSECHO_VERSION_MAJOR,SBBSECHO_VERSION_MINOR,PLATFORM_DESC,revision,__DATE__,compiler);
sprintf(str, "SBBSecho %u.%02u-%s %s/%s %s %s"
,SBBSECHO_VERSION_MAJOR,SBBSECHO_VERSION_MINOR,PLATFORM_DESC,git_branch,git_hash,__DATE__,compiler);
return str;
}
......@@ -198,7 +198,7 @@ int fwrite_via_control_line(FILE* fp, fidoaddr_t* addr)
time_t t = time(NULL);
struct tm* tm = gmtime(&t);
return fprintf(fp,"\1Via %s @%04u%02u%02u.%02u%02u%02u.UTC "
"SBBSecho %u.%02u-%s r%s\r"
"SBBSecho %u.%02u-%s %s/%s\r"
,smb_faddrtoa(addr, NULL)
,tm->tm_year+1900
,tm->tm_mon+1
......@@ -206,7 +206,7 @@ int fwrite_via_control_line(FILE* fp, fidoaddr_t* addr)
,tm->tm_hour
,tm->tm_min
,tm->tm_sec
,SBBSECHO_VERSION_MAJOR,SBBSECHO_VERSION_MINOR,PLATFORM_DESC,revision);
,SBBSECHO_VERSION_MAJOR,SBBSECHO_VERSION_MINOR,PLATFORM_DESC,git_branch,git_hash);
}
int fwrite_intl_control_line(FILE* fp, fmsghdr_t* hdr)
......@@ -6118,14 +6118,12 @@ int main(int argc, char **argv)
memset(&smb[i],0,sizeof(smb_t));
memset(&cfg,0,sizeof(cfg));
sscanf("$Revision: 3.179 $", "%*s %s", revision);
DESCRIBE_COMPILER(compiler);
printf("\nSBBSecho v%u.%02u-%s (rev %s) - Synchronet FidoNet EchoMail Tosser\n"
printf("\nSBBSecho v%u.%02u-%s (%s/%s) - Synchronet FidoNet EchoMail Tosser\n"
,SBBSECHO_VERSION_MAJOR, SBBSECHO_VERSION_MINOR
,PLATFORM_DESC
,revision
,git_branch, git_hash
);
cmdline[0]=0;
......
......@@ -187,6 +187,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="ver.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\smblib\smblib.vcxproj">
......
......@@ -47,6 +47,7 @@
#include "js_socket.h"
#include "multisock.h"
#include "ssl.h"
#include "ver.h"
/* Constants */
......@@ -59,7 +60,6 @@ static char* text[TOTAL_TEXT];
static volatile BOOL terminated=FALSE;
static time_t uptime=0;
static ulong served=0;
static char revision[16];
static str_list_t recycle_semfiles;
static str_list_t shutdown_semfiles;
static protected_uint32_t threads_pending_start;
......@@ -817,8 +817,8 @@ js_initcx(JSRuntime* js_runtime, SOCKET sock, service_client_t* service_client,
break;
if(service_client->service->js_server_props.version[0]==0) {
SAFEPRINTF(service_client->service->js_server_props.version
,"Synchronet Services %s",revision);
SAFEPRINTF2(service_client->service->js_server_props.version
,"Synchronet Services %s%c", VERSION, REVISION);
service_client->service->js_server_props.version_detail=
services_ver();
service_client->service->js_server_props.clients=
......@@ -1661,16 +1661,15 @@ const char* DLLCALL services_ver(void)
DESCRIBE_COMPILER(compiler);
sscanf("$Revision: 1.336 $", "%*s %s", revision);
sprintf(ver,"Synchronet Services %s%s "
"Compiled %s %s with %s"
,revision
sprintf(ver,"Synchronet Services %s%c%s "
"Compiled %s/%s %s %s with %s"
,VERSION, REVISION
#ifdef _DEBUG
," Debug"
#else
,""
#endif
,git_branch, git_hash
,__DATE__, __TIME__, compiler
);
......@@ -1735,8 +1734,6 @@ void DLLCALL services_thread(void* arg)
int level;
BOOL need_cert = FALSE;
services_ver();
startup=(services_startup_t*)arg;
if(startup==NULL) {
......@@ -1776,8 +1773,8 @@ void DLLCALL services_thread(void* arg)
memset(&scfg, 0, sizeof(scfg));
lprintf(LOG_INFO,"Synchronet Services Revision %s%s"
,revision
lprintf(LOG_INFO,"Synchronet Services Version %s%c%s"
,VERSION, REVISION
#ifdef _DEBUG
," Debug"
#else
......@@ -1787,7 +1784,7 @@ void DLLCALL services_thread(void* arg)
DESCRIBE_COMPILER(compiler);
lprintf(LOG_INFO,"Compiled %s %s with %s", __DATE__, __TIME__, compiler);
lprintf(LOG_INFO,"Compiled %s/%s %s %s with %s", git_branch, git_hash, __DATE__, __TIME__, compiler);
protected_uint32_init(&threads_pending_start,0);
......
......@@ -176,6 +176,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="ver.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\xpdev\xpdev_mt.vcxproj">
......
......@@ -20,7 +20,9 @@
****************************************************************************/
#include "sbbs.h"
#ifdef SBBS
#include "ssl.h"
#endif
#include "git_hash.h"
#include "git_branch.h"
#include "ver.h"
......@@ -67,7 +69,7 @@ char* socklib_version(char* str, char* winsock_ver)
return(str);
}
#ifndef JSDOOR
#if defined(SBBS) && !defined(JSDOOR)
void sbbs_t::ver()
{
char str[128],compiler[32];
......
......@@ -65,6 +65,7 @@
#include "xpprintf.h"
#include "ssl.h"
#include "fastcgi.h"
#include "ver.h"
static const char* server_name="Synchronet Web Server";
static const char* newline="\r\n";
......@@ -106,7 +107,6 @@ static volatile BOOL terminate_server=FALSE;
static volatile BOOL terminated=FALSE;
static volatile BOOL terminate_http_logging_thread=FALSE;
static struct xpms_set *ws_set=NULL;
static char revision[16];
static char root_dir[MAX_PATH+1];
static char error_dir[MAX_PATH+1];
static char cgi_dir[MAX_PATH+1];
......@@ -6758,17 +6758,16 @@ const char* DLLCALL web_ver(void)
DESCRIBE_COMPILER(compiler);
sscanf("$Revision: 1.720 $", "%*s %s", revision);
sprintf(ver,"%s %s%s "
"Compiled %s %s with %s"
sprintf(ver,"%s %s%c%s "
"Compiled %s/%s %s %s with %s"
,server_name
,revision
,VERSION, REVISION
#ifdef _DEBUG
," Debug"
#else
,""
#endif
,git_branch, git_hash
,__DATE__, __TIME__, compiler);
return(ver);
......@@ -6904,7 +6903,6 @@ void DLLCALL web_server(void* arg)
startup=(web_startup_t*)arg;
SetThreadName("sbbs/webServer");
web_ver(); /* get CVS revision */
if(startup==NULL) {
sbbs_beep(100,500);
......@@ -6926,7 +6924,7 @@ void DLLCALL web_server(void* arg)
#endif
ZERO_VAR(js_server_props);
SAFEPRINTF2(js_server_props.version,"%s %s",server_name,revision);
SAFEPRINTF3(js_server_props.version,"%s %s%c",server_name, VERSION, REVISION);
js_server_props.version_detail=web_ver();
js_server_props.clients=&active_clients.value;
js_server_props.options=&startup->options;
......@@ -6976,9 +6974,9 @@ void DLLCALL web_server(void* arg)
memset(&scfg, 0, sizeof(scfg));
lprintf(LOG_INFO,"%s Revision %s%s"
lprintf(LOG_INFO,"%s Version %s%c%s"
,server_name
,revision
,VERSION, REVISION
#ifdef _DEBUG
," Debug"
#else
......@@ -6988,7 +6986,7 @@ void DLLCALL web_server(void* arg)
DESCRIBE_COMPILER(compiler);
lprintf(LOG_INFO,"Compiled %s %s with %s", __DATE__, __TIME__, compiler);
lprintf(LOG_INFO,"Compiled %s/%s %s %s with %s", git_branch, git_hash, __DATE__, __TIME__, compiler);
if(!winsock_startup()) {
cleanup(1);
......
......@@ -176,6 +176,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="ver.cpp" />
<ClCompile Include="websrvr.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
......