X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/blobdiff_plain/9b6d59d2a6f3ed7e0d2413c3730c29f1041dab2c..71026445ea6cd499c9f8d194ddbdc9607665a719:/emufs/fsc.c

diff --git a/emufs/fsc.c b/emufs/fsc.c
index 044ef33..ffcad79 100644
--- a/emufs/fsc.c
+++ b/emufs/fsc.c
@@ -84,7 +84,8 @@ int emufs_fsc_agregar_gap(EMUFS *emu, EMUFS_OFFSET marker, EMUFS_FREE freespace)
 	EMUFS_FSC gap_aux,gap_before,gap_after,gap_new;
 	char name_f_fsc[255];
 	EMUFS_REG_ID pos_gap_before = 0, pos_gap_after = 0;
-	unsigned long source,destination,file_size,reg_count = 0,cant_moved = 0;
+	unsigned long source,destination,limit,file_size,reg_count = 0,cant_moved = 0;
+	char found = 0;
 		
 	strcpy(name_f_fsc,emu->nombre);
 	strcat(name_f_fsc, EMUFS_FSC_EXT);
@@ -116,11 +117,42 @@ int emufs_fsc_agregar_gap(EMUFS *emu, EMUFS_OFFSET marker, EMUFS_FREE freespace)
 	
 	/* Si no encontre gaps ni por delante ni por detras */
 	if ((gap_before.marker == -1) && (gap_after.marker == -1)) {
-		/* Lo guardo en el archivo al final */
+		/* Lo guardo ordenado donde deba ir */
 		gap_new.marker = marker;
 		gap_new.freespace = freespace;
-		fseek(f_fsc,0,SEEK_END);
-		fwrite(&gap_new,sizeof(EMUFS_FSC),1,f_fsc);
+		/* Busco el gap que sucede a este */
+		fseek(f_fsc,0,SEEK_SET);
+		while (!feof(f_fsc)) {
+			fread(&gap_aux,sizeof(EMUFS_FSC),1,f_fsc);
+			if (gap_aux.marker > gap_new.marker) {
+				found = 1;
+				break;
+			}
+		}
+		if (found == 1) {
+			/* Movemos todos los gaps desde el sucesor hasta el final, una pos adelante */
+			limit = ftell(f_fsc) - sizeof(EMUFS_FSC);
+			fseek(f_fsc,0,SEEK_END);
+			reg_count = (ftell(f_fsc) - limit) / sizeof(EMUFS_FSC);			
+			source = ftell(f_fsc) - sizeof(EMUFS_FSC);
+
+			while (cant_moved < reg_count)
+			{
+				fseek(f_fsc,source,SEEK_SET);
+				fread(&gap_aux,sizeof(EMUFS_FSC),1,f_fsc);
+				fwrite(&gap_aux,sizeof(EMUFS_FSC),1,f_fsc);
+				source -= sizeof(EMUFS_FSC);
+				++cant_moved;
+			}
+			/* Agrego el nuevo registro */
+			fseek(f_fsc,limit,SEEK_SET);
+			fwrite(&gap_new,sizeof(EMUFS_FSC),1,f_fsc);
+		}
+		else {
+			fseek(f_fsc,0,SEEK_END);
+			fwrite(&gap_new,sizeof(EMUFS_FSC),1,f_fsc);
+		}
+		
 		fclose(f_fsc);		
 	}
 	
@@ -374,20 +406,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,11 +447,13 @@ 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;
 }