From 47d92439a3f75356d65a2a541ea776ec373bd5e5 Mon Sep 17 00:00:00 2001 From: rswindell <> Date: Sat, 18 Jan 2003 03:00:36 +0000 Subject: [PATCH] If the SBBSCTRL env var is blank, it's not used (defaults to /sbbs/ctrl). The CtrlDirectory key read out of the sbbs.ini file is used for the load_cfg() call. --- src/sbbs3/sbbscon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sbbs3/sbbscon.c b/src/sbbs3/sbbscon.c index aa1ba965cd..87cd205b1c 100644 --- a/src/sbbs3/sbbscon.c +++ b/src/sbbs3/sbbscon.c @@ -834,7 +834,7 @@ int main(int argc, char** argv) ,PLATFORM_DESC,VERSION,REVISION,COPYRIGHT_NOTICE); ctrl_dir=getenv("SBBSCTRL"); /* read from environment variable */ - if(ctrl_dir==NULL) + if(ctrl_dir==NULL || ctrl_dir[0]==0) ctrl_dir="/sbbs/ctrl"; /* Not set? Use default */ if(!winsock_startup()) @@ -1333,7 +1333,7 @@ int main(int argc, char** argv) /* Read in configuration files */ memset(&scfg,0,sizeof(scfg)); - SAFECOPY(scfg.ctrl_dir,ctrl_dir); + SAFECOPY(scfg.ctrl_dir,bbs_startup.ctrl_dir); scfg.size=sizeof(scfg); SAFECOPY(error,UNKNOWN_LOAD_ERROR); sprintf(str,"Loading configuration files from %s", scfg.ctrl_dir); -- GitLab