Changed use of fopen() back to fnopen() to avoid open collisions (occuring on Linux).

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])

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); }
 

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); }