diff --git a/src/sbbs3/echocfg.c b/src/sbbs3/echocfg.c index 0ec3b1d99703e03f5c15eb793e4ed44799f73fc6..0d71880225faf09dd73659458bafc09cf2665a45 100644 --- a/src/sbbs3/echocfg.c +++ b/src/sbbs3/echocfg.c @@ -707,7 +707,7 @@ void banner() printf("\nSynchronet FidoNet Configuration Version %u.%02u " COPYRIGHT_NOTICE "\n\n",SBBSECHO_VERSION_MAJOR, SBBSECHO_VERSION_MINOR); - printf("Compiled %s/%s %s %s with %s\n", GIT_BRANCH, GIT_HASH, __DATE__, __TIME__, compiler); + printf("Compiled %s/%s %s with %s\n", GIT_BRANCH, GIT_HASH, GIT_DATE, compiler); } int main(int argc, char **argv) diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c index c7d61e10d7586b4699c7768401b77443d02fe50b..92f89c8f5de28449ffc495a77442ab5d270221b9 100644 --- a/src/sbbs3/ftpsrvr.c +++ b/src/sbbs3/ftpsrvr.c @@ -4997,7 +4997,7 @@ const char* ftp_ver(void) DESCRIBE_COMPILER(compiler); safe_snprintf(ver, sizeof(ver), "%s %s%c%s " - "Compiled %s/%s %s %s with %s" + "Compiled %s/%s %s with %s" ,FTP_SERVER ,VERSION, REVISION #ifdef _DEBUG @@ -5006,7 +5006,7 @@ const char* ftp_ver(void) ,"" #endif ,GIT_BRANCH, GIT_HASH - ,__DATE__, __TIME__, compiler); + ,GIT_DATE, compiler); return(ver); } @@ -5086,7 +5086,7 @@ void ftp_server(void* arg) DESCRIBE_COMPILER(compiler); - lprintf(LOG_INFO,"Compiled %s/%s %s %s with %s", GIT_BRANCH, GIT_HASH, __DATE__, __TIME__, compiler); + lprintf(LOG_INFO,"Compiled %s/%s %s with %s", GIT_BRANCH, GIT_HASH, GIT_DATE, compiler); sbbs_srand(); /* Seed random number generator */ diff --git a/src/sbbs3/jsexec.c b/src/sbbs3/jsexec.c index 7fc87cdc84ed39b3a8bc2d628d92eca2aeb356df..a1dadecd5a164b458e64f59bc870320bc784048f 100644 --- a/src/sbbs3/jsexec.c +++ b/src/sbbs3/jsexec.c @@ -108,8 +108,8 @@ void banner(FILE* fp) #endif ); - fprintf(fp, "Compiled %s %s with %s\n" - ,__DATE__, __TIME__, compiler); + fprintf(fp, "Compiled %s with %s\n" + ,GIT_DATE, compiler); } void usage() @@ -1007,13 +1007,13 @@ long js_exec(const char *fname, const char* buf, char** args) ,NULL,NULL,JSPROP_READONLY|JSPROP_ENUMERATE); safe_snprintf(rev_detail, sizeof(rev_detail), PROG_NAME " " GIT_BRANCH "/" GIT_HASH "%s " - "Compiled %s %s with %s" + "Compiled %s with %s" #ifdef _DEBUG ," Debug" #else ,"" #endif - ,__DATE__, __TIME__, compiler + ,GIT_DATE, compiler ); JS_DefineProperty(js_cx, js_glob, PROG_NAME_LC "_revision_detail" diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c index afa6037785a599228be967e3dc9633a5d435631c..5c4ccd2ceac8e15c812c966ee29ca52a32f9d6cb 100644 --- a/src/sbbs3/mailsrvr.c +++ b/src/sbbs3/mailsrvr.c @@ -5958,7 +5958,7 @@ const char* mail_ver(void) DESCRIBE_COMPILER(compiler); sprintf(ver,"%s %s%c%s " - "Compiled %s/%s %s %s with %s" + "Compiled %s/%s %s with %s" ,server_name ,VERSION, REVISION #ifdef _DEBUG @@ -5967,7 +5967,7 @@ const char* mail_ver(void) ,"" #endif ,GIT_BRANCH, GIT_HASH - ,__DATE__, __TIME__, compiler + ,GIT_DATE, compiler ); return(ver); @@ -6071,7 +6071,7 @@ void mail_server(void* arg) DESCRIBE_COMPILER(compiler); - lprintf(LOG_INFO,"Compiled %s/%s %s %s with %s", GIT_BRANCH, GIT_HASH, __DATE__, __TIME__, compiler); + lprintf(LOG_INFO,"Compiled %s/%s %s with %s", GIT_BRANCH, GIT_HASH, GIT_DATE, compiler); sbbs_srand(); diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp index 0f0f224a8f176164d657457b3b7aab64535bbb53..85ea8bbb021ed714f85855e1f5516df307f7a5cd 100644 --- a/src/sbbs3/main.cpp +++ b/src/sbbs3/main.cpp @@ -4820,7 +4820,7 @@ const char* bbs_ver(void) if(ver[0]==0) { /* uninitialized */ DESCRIBE_COMPILER(compiler); - safe_snprintf(ver,sizeof(ver),"%s %s%c%s Compiled %s/%s %s %s with %s" + safe_snprintf(ver,sizeof(ver),"%s %s%c%s Compiled %s/%s %s with %s" ,TELNET_SERVER ,VERSION, REVISION #ifdef _DEBUG @@ -4829,7 +4829,7 @@ const char* bbs_ver(void) ,"" #endif ,git_branch, git_hash - ,__DATE__, __TIME__, compiler + ,git_date, compiler ); } return(ver); @@ -4995,7 +4995,7 @@ void bbs_thread(void* arg) ,"" #endif ); - lprintf(LOG_INFO,"Compiled %s/%s %s %s with %s", git_branch, git_hash, __DATE__, __TIME__, compiler); + lprintf(LOG_INFO,"Compiled %s/%s %s with %s", git_branch, git_hash, git_date, compiler); #ifdef _DEBUG lprintf(LOG_DEBUG, "sizeof: int=%d, long=%d, off_t=%d, time_t=%d" diff --git a/src/sbbs3/msg_id.c b/src/sbbs3/msg_id.c index 62d51f014bedc267a32f11d6832e333c4b99d8f4..4307adefbd6f71721b09193b9620cd429be8c00a 100644 --- a/src/sbbs3/msg_id.c +++ b/src/sbbs3/msg_id.c @@ -249,6 +249,6 @@ char* msg_program_id(char* pid, size_t maxlen) snprintf(pid, maxlen, "%.10s %s%c-%s %s/%s %s %s" ,VERSION_NOTICE,VERSION,REVISION,PLATFORM_DESC ,GIT_BRANCH, GIT_HASH - ,__DATE__,compiler); + ,GIT_DATE,compiler); return pid; } diff --git a/src/sbbs3/sbbscon.c b/src/sbbs3/sbbscon.c index a7230134b87d6c907c968933d749108294f87738..8b5d5baafc375f7502b377f8c1db644408a92ead 100644 --- a/src/sbbs3/sbbscon.c +++ b/src/sbbs3/sbbscon.c @@ -1153,7 +1153,7 @@ static const char* sbbscon_ver() if(*str == '\0') { char compiler[32]; DESCRIBE_COMPILER(compiler); - snprintf(str, sizeof(str), "Synchronet Console %s%c%s Compiled %s/%s %s %s with %s" + snprintf(str, sizeof(str), "Synchronet Console %s%c%s Compiled %s/%s %s with %s" ,VERSION, REVISION #ifdef _DEBUG ," Debug" @@ -1161,7 +1161,7 @@ static const char* sbbscon_ver() ,"" #endif ,git_branch, git_hash - ,__DATE__, __TIME__, compiler); + ,git_date, compiler); } return str; } diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c index 69a033c66a1b3e5e5fe27dd19195190c5160a52e..6cdd1114150e3a5e98afe96c8b4ef6dbb6e0240c 100644 --- a/src/sbbs3/sbbsecho.c +++ b/src/sbbs3/sbbsecho.c @@ -124,7 +124,7 @@ const char* sbbsecho_pid(void) static char str[256]; sprintf(str, "SBBSecho %u.%02u-%s %s/%s %s %s" - ,SBBSECHO_VERSION_MAJOR,SBBSECHO_VERSION_MINOR,PLATFORM_DESC,GIT_BRANCH,GIT_HASH,__DATE__,compiler); + ,SBBSECHO_VERSION_MAJOR,SBBSECHO_VERSION_MINOR,PLATFORM_DESC,GIT_BRANCH,GIT_HASH,GIT_DATE,compiler); return str; } diff --git a/src/sbbs3/sbbsexec.c b/src/sbbs3/sbbsexec.c index 45cb331eb2573f243ea8ea6fa19cf049beefa7a1..7b4f74c7043893c2c80a3e2b04390bd345b76b6d 100644 --- a/src/sbbs3/sbbsexec.c +++ b/src/sbbs3/sbbsexec.c @@ -530,8 +530,8 @@ __declspec(dllexport) void __cdecl VDDDispatch(void) case VDD_OPEN: - lprintf(LOG_INFO,"Synchronet Virtual Device Driver, %s/%s %s %s" - ,GIT_BRANCH, GIT_HASH, __DATE__, __TIME__); + lprintf(LOG_INFO,"Synchronet Virtual Device Driver, %s/%s %s" + ,GIT_BRANCH, GIT_HASH, GIT_DATE); #if 0 sprintf(str,"sbbsexec%d.log",node_num); fp=fopen(str,"wb"); diff --git a/src/sbbs3/services.c b/src/sbbs3/services.c index 05346eb1b27a5ef495b0b1edda6bea68b4e9dc98..80671ca3bcc31debfbc79a486cf22629e61a18e6 100644 --- a/src/sbbs3/services.c +++ b/src/sbbs3/services.c @@ -1777,7 +1777,7 @@ const char* services_ver(void) DESCRIBE_COMPILER(compiler); sprintf(ver,"Synchronet Services %s%c%s " - "Compiled %s/%s %s %s with %s" + "Compiled %s/%s %s with %s" ,VERSION, REVISION #ifdef _DEBUG ," Debug" @@ -1785,7 +1785,7 @@ const char* services_ver(void) ,"" #endif ,GIT_BRANCH, GIT_HASH - ,__DATE__, __TIME__, compiler + ,GIT_DATE, compiler ); return(ver); @@ -1938,7 +1938,7 @@ void services_thread(void* arg) DESCRIBE_COMPILER(compiler); - lprintf(LOG_INFO,"Compiled %s/%s %s %s with %s", GIT_BRANCH, GIT_HASH, __DATE__, __TIME__, compiler); + lprintf(LOG_INFO,"Compiled %s/%s %s with %s", GIT_BRANCH, GIT_HASH, GIT_DATE, compiler); protected_uint32_init(&threads_pending_start,0); diff --git a/src/sbbs3/sexyz.c b/src/sbbs3/sexyz.c index 990ac688de5863b894d39bc708737b401f54419b..67be9b3e9dec205bfa6d0128c38ed63171be2915 100755 --- a/src/sbbs3/sexyz.c +++ b/src/sbbs3/sexyz.c @@ -1698,7 +1698,7 @@ int main(int argc, char **argv) #ifdef _DEBUG fprintf(statfp,"Debug\n"); #endif - fprintf(statfp,"Compiled %s %.5s with %s\n",__DATE__,__TIME__,compiler); + fprintf(statfp,"Compiled %s/%s %s with %s\n",GIT_BRANCH,GIT_HASH,GIT_DATE,compiler); fprintf(statfp,"%s\n",os_version(str, sizeof(str))); bail(0); return 0; diff --git a/src/sbbs3/smbutil.c b/src/sbbs3/smbutil.c index a445aeb935be289787c867f97119b2c94956225b..5f261a213c27ade17f6dce23d05d37110cead6b2 100644 --- a/src/sbbs3/smbutil.c +++ b/src/sbbs3/smbutil.c @@ -341,7 +341,7 @@ void postmsg(char type, char* to, char* to_number, char* to_address, ,SMBUTIL_VER ,PLATFORM_DESC ,GIT_BRANCH, GIT_HASH - ,__DATE__ + ,GIT_DATE ,compiler ); if((i=smb_hfield_str(&msg,FIDOPID,str))!=SMB_SUCCESS) { diff --git a/src/sbbs3/ver.cpp b/src/sbbs3/ver.cpp index b0ee0072af78e5117c8e0785db6cf4b6d7980500..6508f93da77066279c3224eab699943fff259384 100644 --- a/src/sbbs3/ver.cpp +++ b/src/sbbs3/ver.cpp @@ -85,17 +85,17 @@ void sbbs_t::ver() DESCRIBE_COMPILER(compiler); - sprintf(str,"Revision %c%s %s %.5s " + sprintf(str,"Revision %c%s %s " "SMBLIB %s %s" ,toupper(REVISION) ,beta_version - ,__DATE__,__TIME__ + ,git_date ,smb_lib_ver(),compiler); center(str); CRLF; - center(GIT_BRANCH "/" GIT_HASH " - " GIT_DATE); + center("https;//gitlab.synchro.net - " GIT_BRANCH "/" GIT_HASH); CRLF; sprintf(str,"%s - http://synchro.net", COPYRIGHT_NOTICE); diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c index 735d5d5db1ebfd00e79f8591a4556aea52780b61..03f748e8ff90606db5b441402a6e46a1439fd9b6 100644 --- a/src/sbbs3/websrvr.c +++ b/src/sbbs3/websrvr.c @@ -6959,7 +6959,7 @@ const char* web_ver(void) DESCRIBE_COMPILER(compiler); sprintf(ver,"%s %s%c%s " - "Compiled %s/%s %s %s with %s" + "Compiled %s/%s %s with %s" ,server_name ,VERSION, REVISION #ifdef _DEBUG @@ -6968,7 +6968,7 @@ const char* web_ver(void) ,"" #endif ,GIT_BRANCH, GIT_HASH - ,__DATE__, __TIME__, compiler); + ,GIT_DATE, compiler); return(ver); } @@ -7184,7 +7184,7 @@ void web_server(void* arg) DESCRIBE_COMPILER(compiler); - lprintf(LOG_INFO,"Compiled %s/%s %s %s with %s", GIT_BRANCH, GIT_HASH, __DATE__, __TIME__, compiler); + lprintf(LOG_INFO,"Compiled %s/%s %s with %s", GIT_BRANCH, GIT_HASH, GIT_DATE, compiler); if(!winsock_startup()) { cleanup(1);