* Bugfix : en procesar_leer_registro para tipo1 me estaba pasando 1 char

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

diff --git a/emufs/idx.c b/emufs/idx.c
index cb2ff78b15e2592f44c42eb33260576a4e02750e..18d4722a4af763ba88eab83b877df09e29e62320 100644 (file)
--- 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,10 +214,12 @@ 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;
+               }
        }
        fclose(f_idx);
 
@@ -239,7 +240,7 @@ int emufs_idx_existe_id(EMUFS *emu, int ID)
                PERR("No se pudo abrir el archivo");
                return -1;
        }
-
+       
        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) {
@@ -247,7 +248,30 @@ int emufs_idx_existe_id(EMUFS *emu, int ID)
                        return 0;
                }
        }
+       fclose(f_idx);
+       return -1;/*no existe el id*/
+}
+
+int emufs_idx_actualizar(EMUFS *emu, int ID, EMUFS_BLOCK_ID bloque)
+{
+       FILE *f_idx;
+       char name_f_idx[255];
+       EMUFS_IDX reg;
+       
+       strcpy(name_f_idx,emu->nombre);
+       strcat(name_f_idx, EMUFS_IDX_EXT);
 
+       if ( (f_idx = fopen(name_f_idx, "r+")) == NULL){
+               PERR("No se pudo abrir el archivo");
+               return -1;
+       }
+       printf("actualice el id = %d\n",ID);
+       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;
+       fseek(f_idx,-sizeof(EMUFS_IDX),SEEK_CUR);
+       fwrite(&reg,sizeof(EMUFS_IDX),1,f_idx);
        fclose(f_idx);
-       return -1;
+       return 0;
 }