X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/blobdiff_plain/f5f9e412009380bc5aea316c9ff48ea379f17f0c..abee4a82225665f66e60a61a27bb924c698e101c:/emufs/fsc.c

diff --git a/emufs/fsc.c b/emufs/fsc.c
index 17a7244..044ef33 100644
--- a/emufs/fsc.c
+++ b/emufs/fsc.c
@@ -55,12 +55,23 @@ int emufs_fsc_agregar(EMUFS *emu, EMUFS_BLOCK_ID marker, EMUFS_FREE freespace)
 	strcpy(name_f_fsc,emu->nombre);
 	strcat(name_f_fsc, EMUFS_FSC_EXT);
 	
+	/* Lo guardo en el archivo al final "a+"*/
+	if ( (f_fsc = fopen(name_f_fsc,"r+"))==NULL ) return -1;
+	/* lo busco.. si esta lo modifico y si no lo agrego */
+	fseek(f_fsc,0,SEEK_SET);
+	while ( !feof(f_fsc) ){
+		if ( fread(&reg,sizeof(EMUFS_FSC),1,f_fsc) != 1) continue;
+		if ( reg.marker == marker ){
+			fseek(f_fsc,-sizeof(EMUFS_FSC),SEEK_CUR);
+			reg.freespace = freespace;
+			fwrite(&reg,sizeof(EMUFS_FSC),1,f_fsc);
+			fclose(f_fsc);
+			return 0;
+		}
+	}
 	/* Cargo el registro */
 	reg.marker = marker;
 	reg.freespace = freespace;
-
-	/* Lo guardo en el archivo al final "a+"*/
-	if ( (f_fsc = fopen(name_f_fsc,"a+"))==NULL ) return -1;
 	fwrite(&reg,sizeof(EMUFS_FSC),1,f_fsc);
 	fclose(f_fsc);
 	return 0;
@@ -280,6 +291,17 @@ EMUFS_BLOCK_ID emufs_fsc_buscar_lugar(EMUFS *emu, EMUFS_FREE reg_size, EMUFS_FRE
 
 	if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return EMUFS_NOT_FOUND;
 
+	if ( emu->tam_reg > emu->tam_bloque-sizeof(EMUFS_REG_ID) ){
+		fseek(f_fsc,0,SEEK_SET);
+		while(!feof(f_fsc)){
+			if (fread(&reg,sizeof(EMUFS_FSC),1,f_fsc) != 1) continue;
+			if (reg.freespace == emu->tam_bloque) {
+				fclose(f_fsc);
+				*freespace = reg.freespace;
+				return reg.marker;
+			}
+		}
+	}	
 	/* Inicializamos la estructura para devolver algun valor en concreto */
 	/* en caso de que no se halle un espacio libre apropiado */
 	while(!feof(f_fsc)){
@@ -342,8 +364,8 @@ EMUFS_FREE emufs_fsc_get_total_fs(EMUFS *emu)
 	fclose(f_fsc);
 	return total;
 }
-/*
-EMUFS_FREE emufs_fsc_get_max_min_fs(EMUFS *emu, int *min, int *max)
+
+int emufs_fsc_get_max_min_fs(EMUFS *emu, EMUFS_FREE *min, EMUFS_FREE *max)
 {
 	FILE *f_fsc;
 	EMUFS_FSC reg;
@@ -352,7 +374,7 @@ EMUFS_FREE emufs_fsc_get_max_min_fs(EMUFS *emu, int *min, int *max)
 	strcpy(name_f_fsc,emu->nombre);
 	strcat(name_f_fsc, EMUFS_FSC_EXT);
 
-	*min = emu->tam_bloque;
+	*min = ULONG_MAX;
 	*max = 0;
 	if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
 	
@@ -367,4 +389,26 @@ EMUFS_FREE emufs_fsc_get_max_min_fs(EMUFS *emu, int *min, int *max)
 	fclose(f_fsc);
 	return 0;
 }
-*/
+
+EMUFS_FREE emufs_fsc_get_media_fs(EMUFS *emu)
+{
+	FILE *f_fsc;
+	EMUFS_FSC reg;
+	char name_f_fsc[255];
+	EMUFS_FREE total_fs = 0;
+	EMUFS_REG_ID gap_count = 0;
+	
+	strcpy(name_f_fsc,emu->nombre);
+	strcat(name_f_fsc, EMUFS_FSC_EXT);
+
+	if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
+	
+	while ( !feof(f_fsc) ){
+		fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc);
+		total_fs += reg.freespace;
+		++gap_count;
+	}
+
+	fclose(f_fsc);
+	return total_fs/gap_count;
+}