X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/blobdiff_plain/195807904dee0a8ab038e233a4447aae455dfc46..1b02a88830b3f4d2bc0e1518cd4c80ac276f7089:/tipo3/emufs.c

diff --git a/tipo3/emufs.c b/tipo3/emufs.c
index e696d86..49cb4b4 100644
--- a/tipo3/emufs.c
+++ b/tipo3/emufs.c
@@ -1,13 +1,11 @@
-
 #include "emufs.h"
 #include "param_cte.h"
 
 /* Defino las extenciones que usan cada tipo de archivo */
-#define EXT_TIPO3_ID ".id3"
+#define EXT_TIPO3_ID ".idx"
 #define EXT_TIPO3_DATA ".dat"
 #define EXT_TIPO3_DISP ".fsc"
-#define EXT_TIPO3_IDS ".idc"
-#define EXT_TIPO3_EXTRA ".ids"
+#define EXT_TIPO3_IDS ".ids"
 
 char *str_dup(const char *s)
 {
@@ -67,11 +65,7 @@ EMUFS *emufs_crear(const char *filename, char tipo, unsigned int tam_bloque, uns
 			strcat(name, EXT_TIPO3_IDS);
 			fp = fopen(name, "w");
 			fclose(fp);
-			
-			strcpy(name, filename);
-			strcat(name, EXT_TIPO3_EXTRA);
-			fp = fopen(name, "w");
-			fclose(fp);
+
 		break;
 		default:
 			free(tmp);
@@ -137,16 +131,32 @@ int ver_archivo_FS(EMUFS *emu)
 	strcpy(name_f_block_free,emu->nombre);
 	strcat(name_f_block_free,".fsc");
 
-	if ( (f_block_free = fopen("articulos.fsc","r"))==NULL ){
+	if ( (f_block_free = fopen(name_f_block_free,"r"))==NULL ){
 		printf("no pude abrir el archivo %s\n",name_f_block_free);
 		return -1;
 	}
-
+	fread(&reg,sizeof(reg),1,f_block_free);
 	while ( !feof(f_block_free) ){
-		fread(&reg,sizeof(reg),1,f_block_free);
 		printf(" Bloque = %d   Espacio libre = %d\n",reg.block, reg.free_space);
+		fread(&reg,sizeof(reg),1,f_block_free);
 	}
 	
 	fclose(f_block_free);
+
+	/* Imprimo la lista de bloques/registros */
+	strcpy(name_f_block_free,emu->nombre);
+	strcat(name_f_block_free,".id3");
+	{
+		BLOCK_REG_T r;
+		f_block_free = fopen(name_f_block_free, "r");
+		fread(&r, sizeof(BLOCK_REG_T), 1, f_block_free);
+		while (!feof(f_block_free)) {
+			printf("ID %d en bloque %d\n", r.id_reg, r.block);
+			fread(&r, sizeof(BLOCK_REG_T), 1, f_block_free);
+		}
+		fclose(f_block_free);
+	}
+	
+	
 	return 0;
 }