Skip to content
Snippets Groups Projects
Commit 23a9181c authored by rswindell's avatar rswindell
Browse files

Changed lputs() to return string length (matching prototype in sbbs.h).

Only calls services functions if JAVASCRIPT defined.
parent 54d30251
No related branches found
No related tags found
No related merge requests found
...@@ -155,7 +155,7 @@ static const char* usage = "usage: %s [[setting] [...]]\n" ...@@ -155,7 +155,7 @@ static const char* usage = "usage: %s [[setting] [...]]\n"
"\tdefaults show default settings and options\n" "\tdefaults show default settings and options\n"
; ;
static void lputs(char *str) static int lputs(char *str)
{ {
static pthread_mutex_t mutex; static pthread_mutex_t mutex;
static BOOL mutex_initialized; static BOOL mutex_initialized;
...@@ -169,7 +169,7 @@ static void lputs(char *str) ...@@ -169,7 +169,7 @@ static void lputs(char *str)
else else
syslog(LOG_INFO,"%s",str); syslog(LOG_INFO,"%s",str);
} }
return; return(0);
} }
#endif #endif
if(!mutex_initialized) { if(!mutex_initialized) {
...@@ -185,6 +185,8 @@ static void lputs(char *str) ...@@ -185,6 +185,8 @@ static void lputs(char *str)
prompt_len = printf(prompt, thread_count, socket_count, client_count, served); prompt_len = printf(prompt, thread_count, socket_count, client_count, served);
fflush(stdout); fflush(stdout);
pthread_mutex_unlock(&mutex); pthread_mutex_unlock(&mutex);
return(prompt_len);
} }
#ifdef __unix__ #ifdef __unix__
...@@ -553,7 +555,9 @@ void _sighandler_quit(int sig) ...@@ -553,7 +555,9 @@ void _sighandler_quit(int sig)
bbs_terminate(); bbs_terminate();
ftp_terminate(); ftp_terminate();
mail_terminate(); mail_terminate();
#ifdef JAVASCRIPT
services_terminate(); services_terminate();
#endif
while(bbs_running || ftp_running || mail_running || services_running) while(bbs_running || ftp_running || mail_running || services_running)
mswait(1); mswait(1);
if(is_daemon) if(is_daemon)
...@@ -1061,8 +1065,10 @@ int main(int argc, char** argv) ...@@ -1061,8 +1065,10 @@ int main(int argc, char** argv)
_beginthread((void(*)(void*))ftp_server,0,&ftp_startup); _beginthread((void(*)(void*))ftp_server,0,&ftp_startup);
if(run_mail) if(run_mail)
_beginthread((void(*)(void*))mail_server,0,&mail_startup); _beginthread((void(*)(void*))mail_server,0,&mail_startup);
#ifdef JAVASCRIPT
if(run_services) if(run_services)
_beginthread((void(*)(void*))services_thread,0,&services_startup); _beginthread((void(*)(void*))services_thread,0,&services_startup);
#endif
#ifdef __unix__ #ifdef __unix__
// Set up QUIT-type signals so they clean up properly. // Set up QUIT-type signals so they clean up properly.
...@@ -1130,7 +1136,9 @@ int main(int argc, char** argv) ...@@ -1130,7 +1136,9 @@ int main(int argc, char** argv)
bbs_terminate(); bbs_terminate();
ftp_terminate(); ftp_terminate();
mail_terminate(); mail_terminate();
#ifdef JAVASCRIPT
services_terminate(); services_terminate();
#endif
while(bbs_running || ftp_running || mail_running || services_running) while(bbs_running || ftp_running || mail_running || services_running)
mswait(1); mswait(1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment