Se emprolija un poco los archivos de indices.

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

diff --git a/emufs/idx.c b/emufs/idx.c
index a9efcaa0cdc2b0e45eeb7ced6242e8dbe7aec036..093c2ac7689c1a7100bea7ff15f86dd170e61fe3 100644 (file)
--- a/emufs/idx.c
+++ b/emufs/idx.c
@@ -35,23 +35,29 @@
  */
 
 #include "idx.h"
-#include "tipo3.h"
+
+#define EMUFS_IDX_EXT ".idx"
+
+typedef struct emufs_idx_t {
+       int block;
+       long int id_reg;
+} EMUFS_IDX;
 
 int emufs_idx_buscar_mayor_id(EMUFS *emu)
 {
        int id, max = -1;
        FILE *f_idx;    
-       BLOCK_REG_T reg;
-       char name_f_idx[255];
+       EMUFS_IDX reg;
+       char name_f_idx[255]; /* TODO usar malloc para no limitar el tamaño de nombre de archivo */
 
        strcpy(name_f_idx,emu->nombre);
-       strcat(name_f_idx,".idx");
+       strcat(name_f_idx, EMUFS_IDX_EXT);
 
        if ( (f_idx = fopen(name_f_idx,"r")) == NULL) return -1; /*ERROR*/
        id = -1;
        while ( !feof(f_idx) ){
                /* Me aseguro de leer la cantidad de bytes correcta */
-               if (fread(&reg,sizeof(BLOCK_REG_T),1,f_idx) != 1) continue;
+               if (fread(&reg,sizeof(EMUFS_IDX),1,f_idx) != 1) continue;
                if ( reg.id_reg >= max ) 
                        max = reg.id_reg;
        }
@@ -65,14 +71,14 @@ int emufs_idx_buscar_mayor_id(EMUFS *emu)
 int emufs_idx_buscar_registro(EMUFS *emu, int ID)
 {
        FILE* f_idx;
-       BLOCK_REG_T reg;
+       EMUFS_IDX reg;
        char name_f_idx[255];
        strcpy(name_f_idx,emu->nombre);
-       strcat(name_f_idx,".idx");
+       strcat(name_f_idx, EMUFS_IDX_EXT);
        
        if ( (f_idx = fopen(name_f_idx,"r")) == NULL) return -1; /*ERROR*/
        while ( !feof(f_idx) ){
-               if (fread(&reg,sizeof(BLOCK_REG_T),1,f_idx) != 1) continue;
+               if (fread(&reg,sizeof(EMUFS_IDX),1,f_idx) != 1) continue;
                if ( reg.id_reg == ID ){
                        fclose(f_idx);
                        return reg.block;
@@ -84,20 +90,20 @@ int emufs_idx_buscar_registro(EMUFS *emu, int ID)
 }
 
 /* agrega un registro al final del archivo */
-emufs_idx_agregar(EMUFS *emu, int num_bloque, int ID_aux)
+int emufs_idx_agregar(EMUFS *emu, int num_bloque, int ID_aux)
 {
        FILE *f_idx;
-       BLOCK_REG_T reg;
+       EMUFS_IDX reg;
        char name_f_idx[255];
        
        strcpy(name_f_idx,emu->nombre);
-       strcat(name_f_idx,".idx");
+       strcat(name_f_idx, EMUFS_IDX_EXT);
 
        if ( (f_idx = fopen(name_f_idx,"ab+"))==NULL ) return -1;
                
        reg.block = num_bloque;
        reg.id_reg = ID_aux;
-       fwrite(&reg,sizeof(BLOCK_REG_T),1,f_idx); 
+       fwrite(&reg,sizeof(EMUFS_IDX),1,f_idx); 
        fclose(f_idx);
        return 0;
 }