X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/blobdiff_plain/bf8259284603ef16c6bb1c44438f2a13ad526a9a..6380d182cdde008560bc1381da208ce98bcb836a:/emufs/idx.c

diff --git a/emufs/idx.c b/emufs/idx.c
index f9c33db..06cb824 100644
--- a/emufs/idx.c
+++ b/emufs/idx.c
@@ -37,6 +37,8 @@
 
 #include "idx.h"
 #include "did.h"
+#include "error.h"
+#include "common.h"
 #include <stdlib.h>
 #include <strings.h>
 #include <unistd.h>
@@ -80,7 +82,7 @@ EMUFS_REG_ID emufs_idx_buscar_mayor_id_libre(EMUFS* emu, int* err)
 
 	if ((f_idx = fopen(name_f_idx, "rb")) == NULL) {
 		PERR("No se puede abrir archivo");
-		*err = 4; /* EMUFS_ERROR_CANT_OPEN_FILE */
+		*err = EMUFS_ERROR_CANT_OPEN_FILE;
 		return EMUFS_NOT_FOUND;
 	}
 
@@ -115,7 +117,7 @@ EMUFS_BLOCK_ID emufs_idx_buscar_registro(EMUFS *emu, EMUFS_REG_ID reg_id)
 	
 	if ((f_idx = fopen(name_f_idx, "rb")) == NULL) {
 		PERR("No se puede abrir archivo");
-		/*    *err = 4; * EMUFS_ERROR_CANT_OPEN_FILE */
+		/* *err = EMUFS_ERROR_CANT_OPEN_FILE; */
 		return EMUFS_NOT_FOUND;
 	}
 
@@ -214,10 +216,11 @@ EMUFS_REG_ID *emufs_idx_get(EMUFS *emu, EMUFS_REG_ID *cant)
 	count = 0;
 	while (!feof(f_idx)) {
 		if (fread(&reg, sizeof(EMUFS_IDX), 1, f_idx) != 1) continue;
-		count++;
-		/* TODO : Verificar errores :-D */
-		tmp = realloc(tmp, count*sizeof(EMUFS_REG_ID));
-		tmp[count-1] = reg.id_reg;
+		if (reg.location != EMUFS_NOT_FOUND) {
+			count++;
+			tmp = realloc(tmp, count*sizeof(EMUFS_REG_ID));
+			tmp[count-1] = reg.id_reg;
+		}
 	}
 	fclose(f_idx);
 
@@ -276,3 +279,12 @@ int emufs_idx_actualizar(EMUFS *emu, int ID, EMUFS_BLOCK_ID bloque)
 	fclose(f_idx);
 	return 0;
 }
+
+long emufs_idx_get_file_size(EMUFS* efs, int* err)
+{
+	char name[255];
+	strcpy(name, efs->nombre);
+	strcat(name, EMUFS_IDX_EXT);
+	return emufs_common_get_file_size(name, err);
+}
+