X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/blobdiff_plain/d4f0853a534fc4283fa38cf4bb4a70cc614283ec..18ff567719ef1e5437bef12b937fe95686c336b5:/emufs/fsc.c?ds=inline

diff --git a/emufs/fsc.c b/emufs/fsc.c
index 4aaaa17..73f043d 100644
--- a/emufs/fsc.c
+++ b/emufs/fsc.c
@@ -37,8 +37,8 @@
 
 #include "fsc.h"
 #include "error.h"
+#include "common.h"
 #include <unistd.h>
-#include <sys/types.h>
 #include <string.h>
 
 /* Crea un archivo de Gaps o Espacio Libre en Bloque */
@@ -125,7 +125,7 @@ int emufs_fsc_agregar_gap(EMUFS *emu, EMUFS_OFFSET marker, EMUFS_FREE freespace)
 		/* 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 (fread(&gap_aux,sizeof(EMUFS_FSC),1,f_fsc) != 1) continue;
 			if (gap_aux.marker > gap_new.marker) {
 				found = 1;
 				break;
@@ -359,7 +359,7 @@ EMUFS_BLOCK_ID emufs_fsc_buscar_lugar(EMUFS *emu, EMUFS_FREE reg_size, EMUFS_FRE
 
 /** Busca n lugares consecutivos devolviendo el id del primer bloque. */
 EMUFS_BLOCK_ID emufs_fsc_buscar_n_lugares(EMUFS* efs, size_t n,
-		EMUFS_FREE reg_size, EMUFS_FREE *freespace, int* err)
+		EMUFS_FREE size, EMUFS_FREE *freespace, int* err)
 {
 	FILE *f_fsc;
 	EMUFS_FSC reg;
@@ -389,7 +389,7 @@ EMUFS_BLOCK_ID emufs_fsc_buscar_n_lugares(EMUFS* efs, size_t n,
 			*err = EMUFS_ERROR_FILE_READ;
 			return EMUFS_NOT_FOUND;
 		}
-		if (reg.freespace >= reg_size) {
+		if (reg.freespace >= size) {
 			int found = 1;
 			EMUFS_BLOCK_ID first_id = reg.marker;
 			*freespace = reg.freespace;
@@ -401,7 +401,7 @@ EMUFS_BLOCK_ID emufs_fsc_buscar_n_lugares(EMUFS* efs, size_t n,
 					return EMUFS_NOT_FOUND;
 				}
 				/* no hay otro lugar consecutivo */
-				if (reg.freespace < reg_size) {
+				if (reg.freespace < size) {
 					found = 0;
 					break;
 				}
@@ -453,7 +453,8 @@ EMUFS_FREE emufs_fsc_get_total_fs(EMUFS *emu)
 	total = 0;
 	while ( !feof(f_fsc) ){
 		if ( fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc) != 1) continue;
-		total += reg.freespace;
+		if ( reg.freespace > 0 )
+			total += reg.freespace;
 	}
 	fclose(f_fsc);
 	return total;
@@ -568,3 +569,10 @@ EMUFS_BLOCK_ID emufs_fsc_get_num_blocks(EMUFS* efs)
 	return cant;
 }
 
+long emufs_fsc_get_file_size(EMUFS* efs, int* err)
+{
+	char name[255];
+	strcpy(name, efs->nombre);
+	strcat(name, EMUFS_FSC_EXT);
+	return emufs_common_get_file_size(name, err);
+}