X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/blobdiff_plain/d9274cf4aaaa1a7a6dbba6e4cf8ba37d05d66380..840e216ee1d0b23864f75f44ba549899669d9595:/emufs/idx.c

diff --git a/emufs/idx.c b/emufs/idx.c
index e23a77f..8b4f969 100644
--- a/emufs/idx.c
+++ b/emufs/idx.c
@@ -131,7 +131,6 @@ EMUFS_BLOCK_ID emufs_idx_buscar_registro(EMUFS *emu, EMUFS_REG_ID reg_id)
 	return EMUFS_NOT_FOUND;
 }
 
-/* agrega un registro al final del archivo */
 int emufs_idx_agregar(EMUFS *emu, EMUFS_REG_ID id_reg, EMUFS_BLOCK_ID location)
 {
 	FILE *f_idx;
@@ -141,7 +140,7 @@ int emufs_idx_agregar(EMUFS *emu, EMUFS_REG_ID id_reg, EMUFS_BLOCK_ID location)
 	strcpy(name_f_idx,emu->nombre);
 	strcat(name_f_idx, EMUFS_IDX_EXT);
 
-	if ( (f_idx = fopen(name_f_idx,"a+b"))==NULL ) return -1;
+	if ( (f_idx = fopen(name_f_idx,"a+"))==NULL ) return -1;
 
 	fseek(f_idx, sizeof(EMUFS_IDX)*id_reg, SEEK_SET); 
 	reg.id_reg = id_reg;
@@ -215,14 +214,18 @@ 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);
-		tmp[count-1] = reg.id_reg;
+		if (reg.location != EMUFS_NOT_FOUND) {
+			count++;
+			tmp = realloc(tmp, count);
+			tmp[count-1] = reg.id_reg;
+			fprintf(stderr, "Nuevo registro de id = %lu\n", reg.id_reg);
+		}
 	}
 	fclose(f_idx);
 
 	(*cant) = count;
+	fprintf(stderr, "Mando %d registros\n", count);
 	return tmp;
 }
 
@@ -242,13 +245,13 @@ int emufs_idx_existe_id(EMUFS *emu, int ID)
 	
 	if (fseek(f_idx, sizeof(EMUFS_IDX)*ID, SEEK_SET) == 0) {
 		fread(&reg, sizeof(EMUFS_IDX), 1, f_idx);
-		if (reg.location == EMUFS_NOT_FOUND) {
+		if (reg.location != EMUFS_NOT_FOUND) {
 			fclose(f_idx);
-			return -1;
+			return 0;
 		}
 	}
 	fclose(f_idx);
-	return 0;/*no existe el id*/
+	return -1;/*no existe el id*/
 }
 
 int emufs_idx_actualizar(EMUFS *emu, int ID, EMUFS_BLOCK_ID bloque)
@@ -265,7 +268,7 @@ int emufs_idx_actualizar(EMUFS *emu, int ID, EMUFS_BLOCK_ID bloque)
 		return -1;
 	}
 	printf("actualice el id = %d\n",ID);
-	/*fseek(f_idx,0,SEEK_SET);*/
+	fseek(f_idx,0,SEEK_SET);
 	fseek(f_idx,ID*sizeof(EMUFS_IDX),SEEK_SET);
 	fread(&reg,sizeof(EMUFS_IDX),1,f_idx);
 	reg.location = bloque;