From: Alan Kennedy <kennedya@3dgames.com.ar>
Date: Sat, 17 Apr 2004 18:15:40 +0000 (+0000)
Subject: Fixee el get_max_min y get_media que si el .fsc estaba vacio devolvian valores basura
X-Git-Tag: svn_import_r684~422
X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/commitdiff_plain/69c9a330bed7b04915ab1f1e7603150a7c90e0bc?ds=inline

Fixee el get_max_min y get_media que si el .fsc estaba vacio devolvian valores basura
---

diff --git a/emufs/fsc.c b/emufs/fsc.c
index 4c5008a..562ae32 100644
--- a/emufs/fsc.c
+++ b/emufs/fsc.c
@@ -374,20 +374,31 @@ int emufs_fsc_get_max_min_fs(EMUFS *emu, EMUFS_FREE *min, EMUFS_FREE *max)
 	strcpy(name_f_fsc,emu->nombre);
 	strcat(name_f_fsc, EMUFS_FSC_EXT);
 
-	*min = ULONG_MAX;
-	*max = 0;
 	if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
-	
-	while ( !feof(f_fsc) ){
-		fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc);
-		if (  reg.freespace < *min )
-			*min = reg.freespace;
-		if ( reg.freespace > *max )
-			*max = reg.freespace;
+		
+	/* Si el file esta vacio, devuelvo valores nulos */
+	fseek(f_fsc,0,SEEK_END);
+	if (ftell(f_fsc) == 0) {
+		*min = 0;
+		*max = 0;
+		return 0;		
+	}
+	else
+	{
+		/* Busco Min y Max */
+		*min = ULONG_MAX;
+		*max = 0;		
+		fseek(f_fsc,0,SEEK_SET);		
+		while ( !feof(f_fsc) ){
+			if ( fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc) != 1) continue;
+			if (  reg.freespace < *min )
+				*min = reg.freespace;
+			if ( reg.freespace > *max )
+				*max = reg.freespace;
+		}
+		fclose(f_fsc);
+		return 0;		
 	}
-
-	fclose(f_fsc);
-	return 0;
 }
 
 EMUFS_FREE emufs_fsc_get_media_fs(EMUFS *emu)
@@ -404,13 +415,15 @@ EMUFS_FREE emufs_fsc_get_media_fs(EMUFS *emu)
 	if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
 	
 	while ( !feof(f_fsc) ){
-		fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc);
+		if ( fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc) != 1) continue;		
 		total_fs += reg.freespace;
 		++gap_count;
 	}
 
 	fclose(f_fsc);
-	return total_fs/gap_count;
+	
+	if (gap_count > 0) return total_fs/gap_count;
+	else return 0;
 }
 
 int emufs_fsc_get_cant_bloques_vacios(EMUFS *emu)