src/sbbs3/filedat.c

@@ -1027,20 +1027,23 @@ bool extract_diz(scfg_t* cfg, file_t* f, str_list_t diz_fnames, char* path, size
 			return false;
 	}
 
-	if(extract_files_from_archive(archive
-		,/* outdir: */cfg->temp_dir
-		,/* allowed_filename_chars: */NULL /* any */
-		,/* with_path: */true
-		,/* overwrite: */false
-		,/* max_files: */strListCount(diz_fnames)
-		,/* file_list: */diz_fnames
-		,/* error: */NULL, 0) >= 0) {
-		for(i = 0; diz_fnames[i] != NULL; i++) {
-			safe_snprintf(path, maxlen, "%s%s", cfg->temp_dir, diz_fnames[i]); // no slash
-			if(fexistcase(path))
-				return true;
+	for(int nested = 0; nested <= 1; nested++) {
+		if(extract_files_from_archive(archive
+			,/* outdir: */cfg->temp_dir
+			,/* allowed_filename_chars: */NULL /* any */
+			,/* with_path: */!nested
+			,/* overwrite: */false
+			,/* max_files: */strListCount(diz_fnames)
+			,/* file_list: */diz_fnames
+			,/* error: */NULL, 0) >= 0) {
+			for(i = 0; diz_fnames[i] != NULL; i++) {
+				safe_snprintf(path, maxlen, "%s%s", cfg->temp_dir, diz_fnames[i]); // no slash
+				if(fexistcase(path))
+					return true;
+			}
+			if(nested)
+				return false;
 		}
-		return false;
 	}
 
 	char* fext = getfext(f->name);

src/sbbs3/getstats.c

@@ -66,7 +66,7 @@ FILE* fopen_dstats(scfg_t* cfg, uint node, BOOL for_write)
     char path[MAX_PATH+1];
 
 	dstats_fname(cfg, node, path, sizeof(path));
-	return iniOpenFile(path, for_write);
+	return fnopen(NULL, path, for_write ? O_CREAT|O_RDWR : O_RDONLY);
 }
 
 /****************************************************************************/
@@ -83,7 +83,7 @@ FILE* fopen_cstats(scfg_t* cfg, uint node, BOOL for_write)
 /****************************************************************************/
 BOOL fclose_dstats(FILE* fp)
 {
-	return iniCloseFile(fp);
+	return fclose(fp);
 }
 
 /****************************************************************************/

src/sbbs3/xtrn_sec.cpp

@@ -297,7 +297,7 @@ void sbbs_t::xtrndat(const char *name, const char *dropdir, uchar type, ulong tl
 			strlwr(tmp);
 		SAFEPRINTF2(str,"%s%s",dropdir,tmp);
 		(void)removecase(str);
-		if((fp=fnopen(NULL, str, O_WRONLY|O_CREAT|O_TRUNC)) == NULL) {
+		if((fp=fnopen(NULL, str, O_WRONLY|O_CREAT|O_TRUNC|O_TEXT)) == NULL) {
 			errormsg(WHERE,ERR_OPEN,str,O_WRONLY|O_CREAT|O_TRUNC|O_TEXT);
 			return; 
 		}