un change mas en la extension

[z.facultad/75.06/emufs.git] / tipo3 / emufs.c

diff --git a/tipo3/emufs.c b/tipo3/emufs.c
index 4690093ed7cfa27b12c50aa2ab38b1606f33ee29..4d7409706876cf9b249ad81d182ecb619c811058 100644 (file)
--- a/tipo3/emufs.c
+++ b/tipo3/emufs.c
@@ -1,18 +1,17 @@
-
 #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)
 {
+       char *tmp;
        if (s == NULL) return NULL;
-       char *tmp = (char *)malloc(sizeof(char)*(strlen(s)+1));
+       tmp = (char *)malloc(sizeof(char)*(strlen(s)+1));
        strcpy(tmp, s);
        return tmp;
 }
@@ -67,11 +66,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);
@@ -148,5 +143,21 @@ int ver_archivo_FS(EMUFS *emu)
        }
        
        fclose(f_block_free);
+
+       /* Imprimo la lista de bloques/registros */
+       strcpy(name_f_block_free,emu->nombre);
+       strcat(name_f_block_free,".idx");
+       {
+               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 %ld 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;
 }