From edb9534d9aa8fae12ea06738b202ae77b89cbbee Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sat, 16 Oct 2004 00:55:59 +0000
Subject: [PATCH] semfile_list_init() now automatically determines the correct
local hostname (using gethostname).
---
src/sbbs3/ftpsrvr.c | 4 ++--
src/sbbs3/mailsrvr.c | 4 ++--
src/sbbs3/main.cpp | 4 ++--
src/sbbs3/sbbs.h | 2 +-
src/sbbs3/semfile.c | 5 ++++-
src/sbbs3/services.c | 4 ++--
src/sbbs3/websrvr.c | 4 ++--
7 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c
index bed889e0a4..d2c1ec465e 100644
--- a/src/sbbs3/ftpsrvr.c
+++ b/src/sbbs3/ftpsrvr.c
@@ -4693,8 +4693,8 @@ void DLLCALL ftp_server(void* arg)
status(STATUS_WFC);
/* Setup recycle/shutdown semaphore file lists */
- semfile_list_init(&shutdown_semfiles,scfg.ctrl_dir,"shutdown",startup->host_name,"ftp");
- semfile_list_init(&recycle_semfiles,scfg.ctrl_dir,"recycle",startup->host_name,"ftp");
+ semfile_list_init(&shutdown_semfiles,scfg.ctrl_dir,"shutdown","ftp");
+ semfile_list_init(&recycle_semfiles,scfg.ctrl_dir,"recycle","ftp");
SAFEPRINTF(path,"%sftpsrvr.rec",scfg.ctrl_dir); /* legacy */
semfile_list_add(&recycle_semfiles,path);
if(!initialized) {
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index f784ad1077..b18c78f75e 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -4117,8 +4117,8 @@ void DLLCALL mail_server(void* arg)
status(STATUS_WFC);
/* Setup recycle/shutdown semaphore file lists */
- semfile_list_init(&shutdown_semfiles,scfg.ctrl_dir,"shutdown",startup->host_name,"mail");
- semfile_list_init(&recycle_semfiles,scfg.ctrl_dir,"recycle",startup->host_name,"mail");
+ semfile_list_init(&shutdown_semfiles,scfg.ctrl_dir,"shutdown","mail");
+ semfile_list_init(&recycle_semfiles,scfg.ctrl_dir,"recycle","mail");
SAFEPRINTF(path,"%smailsrvr.rec",scfg.ctrl_dir); /* legacy */
semfile_list_add(&recycle_semfiles,path);
if(!initialized) {
diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp
index 34c388f5c2..3e449631c8 100644
--- a/src/sbbs3/main.cpp
+++ b/src/sbbs3/main.cpp
@@ -4110,8 +4110,8 @@ void DLLCALL bbs_thread(void* arg)
#endif // _WIN32 && _DEBUG && _MSC_VER
/* Setup recycle/shutdown semaphore file lists */
- semfile_list_init(&shutdown_semfiles,scfg.ctrl_dir,"shutdown",startup->host_name,"telnet");
- semfile_list_init(&recycle_semfiles,scfg.ctrl_dir,"recycle",startup->host_name,"telnet");
+ semfile_list_init(&shutdown_semfiles,scfg.ctrl_dir,"shutdown","telnet");
+ semfile_list_init(&recycle_semfiles,scfg.ctrl_dir,"recycle","telnet");
SAFEPRINTF(str,"%stelnet.rec",scfg.ctrl_dir); /* legacy */
semfile_list_add(&recycle_semfiles,str);
if(!initialized) {
diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h
index acb7017c10..280781e0a3 100644
--- a/src/sbbs3/sbbs.h
+++ b/src/sbbs3/sbbs.h
@@ -883,7 +883,7 @@ extern "C" {
DLLEXPORT BOOL DLLCALL semfile_check(time_t* t, const char* fname);
DLLEXPORT char* DLLCALL semfile_list_check(time_t* t, link_list_t* filelist);
DLLEXPORT void DLLCALL semfile_list_init(link_list_t* filelist, const char* parent,
- const char* action, const char* hostname, const char* service);
+ const char* action, const char* service);
DLLEXPORT void DLLCALL semfile_list_add(link_list_t* filelist, const char* fname);
DLLEXPORT void DLLCALL semfile_list_free(link_list_t* filelist);
diff --git a/src/sbbs3/semfile.c b/src/sbbs3/semfile.c
index e67f4f76cf..e041c4c8ba 100644
--- a/src/sbbs3/semfile.c
+++ b/src/sbbs3/semfile.c
@@ -72,9 +72,12 @@ char* DLLCALL semfile_list_check(time_t* t, link_list_t* filelist)
}
void DLLCALL semfile_list_init(link_list_t* filelist, const char* parent,
- const char* action, const char* hostname, const char* service)
+ const char* action, const char* service)
{
char path[MAX_PATH+1];
+ char hostname[128];
+
+ gethostname(hostname,sizeof(hostname));
listInit(filelist,0);
SAFEPRINTF2(path,"%s%s",parent,action);
diff --git a/src/sbbs3/services.c b/src/sbbs3/services.c
index 5378c7bec0..93b863de73 100644
--- a/src/sbbs3/services.c
+++ b/src/sbbs3/services.c
@@ -1848,8 +1848,8 @@ void DLLCALL services_thread(void* arg)
status("Listening");
/* Setup recycle/shutdown semaphore file lists */
- semfile_list_init(&shutdown_semfiles,scfg.ctrl_dir,"shutdown",startup->host_name,"services");
- semfile_list_init(&recycle_semfiles,scfg.ctrl_dir,"recycle",startup->host_name,"services");
+ semfile_list_init(&shutdown_semfiles,scfg.ctrl_dir,"shutdown","services");
+ semfile_list_init(&recycle_semfiles,scfg.ctrl_dir,"recycle","services");
SAFEPRINTF(path,"%sservices.rec",scfg.ctrl_dir); /* legacy */
semfile_list_add(&recycle_semfiles,path);
if(!initialized) {
diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c
index 39d36e84f6..ed5ced77cc 100644
--- a/src/sbbs3/websrvr.c
+++ b/src/sbbs3/websrvr.c
@@ -3023,8 +3023,8 @@ void DLLCALL web_server(void* arg)
}
/* Setup recycle/shutdown semaphore file lists */
- semfile_list_init(&shutdown_semfiles,scfg.ctrl_dir,"shutdown",startup->host_name,"web");
- semfile_list_init(&recycle_semfiles,scfg.ctrl_dir,"recycle",startup->host_name,"web");
+ semfile_list_init(&shutdown_semfiles,scfg.ctrl_dir,"shutdown","web");
+ semfile_list_init(&recycle_semfiles,scfg.ctrl_dir,"recycle","web");
SAFEPRINTF(path,"%swebsrvr.rec",scfg.ctrl_dir); /* legacy */
semfile_list_add(&recycle_semfiles,path);
if(!initialized) {
--
GitLab