diff --git a/src/sbbs3/load_cfg.c b/src/sbbs3/load_cfg.c index e4bf4f5f9a550199f898693b8e5ba2b86ec2dac7..76b28032b6ffa6a32812a0ad7d91eb0da49fafe1 100644 --- a/src/sbbs3/load_cfg.c +++ b/src/sbbs3/load_cfg.c @@ -76,7 +76,7 @@ BOOL DLLCALL load_cfg(scfg_t* cfg, char* text[]) if(text!=NULL) { strcpy(fname,"text.dat"); sprintf(str,"%s%s",cfg->ctrl_dir,fname); - if((instream=fopen(str,"rb"/*O_RDONLY*/))==NULL) { + if((instream=fnopen(NULL,str,O_RDONLY))==NULL) { lprintf(txt.openerr,str); return(FALSE); } if(txt.reading && txt.reading[0]) @@ -247,7 +247,7 @@ BOOL read_attr_cfg(scfg_t* cfg, read_cfg_text_t* txt) strcpy(fname,"attr.cfg"); sprintf(str,"%s%s",cfg->ctrl_dir,fname); - if((instream=fopen(str,"rb" /*O_RDONLY*/))==NULL) { /* was fnopen */ + if((instream=fnopen(str,O_RDONLY))==NULL) { lprintf(txt->openerr,str); return(FALSE); } if(txt->reading && txt->reading[0]) diff --git a/src/sbbs3/scfglib1.c b/src/sbbs3/scfglib1.c index da1f409b391e3865549470726d311738779cbf9c..4f3e0292b97862c163c4def483a17044ea3b3a62 100644 --- a/src/sbbs3/scfglib1.c +++ b/src/sbbs3/scfglib1.c @@ -128,9 +128,10 @@ BOOL read_node_cfg(scfg_t* cfg, read_cfg_text_t* txt) strcpy(fname,"node.cnf"); sprintf(str,"%s%s",cfg->node_dir,fname); - if((instream=fopen(str,"rb" /*O_RDONLY*/))==NULL) { + if((instream=fnopen(NULL,str,O_RDONLY))==NULL) { lprintf(txt->openerr,str); - return(FALSE); } + return(FALSE); + } if(txt->reading && txt->reading[0]) lprintf(txt->reading,fname); @@ -261,7 +262,7 @@ BOOL read_main_cfg(scfg_t* cfg, read_cfg_text_t* txt) strcpy(fname,"main.cnf"); sprintf(str,"%s%s",cfg->ctrl_dir,fname); - if((instream=fopen(str,"rb" /* O_RDONLY */))==NULL) { + if((instream=fnopen(NULL,str,O_RDONLY))==NULL) { lprintf(txt->openerr,str); return(FALSE); } @@ -516,7 +517,7 @@ BOOL read_msgs_cfg(scfg_t* cfg, read_cfg_text_t* txt) strcpy(fname,"msgs.cnf"); sprintf(str,"%s%s",cfg->ctrl_dir,fname); - if((instream=fopen(str,"rb"/*O_RDONLY*/))==NULL) { + if((instream=fnopen(NULL,str,O_RDONLY))==NULL) { lprintf(txt->openerr,str); return(FALSE); } diff --git a/src/sbbs3/scfglib2.c b/src/sbbs3/scfglib2.c index 2f0862296a36ce677932d4184b6bcbef3fa0ab1b..185fb5d6392085a397807c7d08f42ab263dfcf03 100644 --- a/src/sbbs3/scfglib2.c +++ b/src/sbbs3/scfglib2.c @@ -69,7 +69,7 @@ BOOL read_file_cfg(scfg_t* cfg, read_cfg_text_t* txt) strcpy(fname,"file.cnf"); sprintf(str,"%s%s",cfg->ctrl_dir,fname); - if((instream=fopen(str,"rb" /*O_RDONLY*/))==NULL) { + if((instream=fnopen(NULL,str,O_RDONLY))==NULL) { lprintf(txt->openerr,str); return(FALSE); } @@ -536,7 +536,7 @@ BOOL read_xtrn_cfg(scfg_t* cfg, read_cfg_text_t* txt) strcpy(fname,"xtrn.cnf"); sprintf(str,"%s%s",cfg->ctrl_dir,fname); - if((instream=fopen(str,"rb" /*O_RDONLY*/))==NULL) { + if((instream=fnopen(NULL,str,O_RDONLY))==NULL) { lprintf(txt->openerr,str); return(FALSE); } @@ -788,7 +788,7 @@ BOOL read_chat_cfg(scfg_t* cfg, read_cfg_text_t* txt) strcpy(fname,"chat.cnf"); sprintf(str,"%s%s",cfg->ctrl_dir,fname); - if((instream=fopen(str,"rb"/* O_RDONLY */))==NULL) { + if((instream=fnopen(NULL,str,O_RDONLY))==NULL) { lprintf(txt->openerr,str); return(FALSE); }