* BUGFIX : error de typo

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

diff --git a/emufs/idx.c b/emufs/idx.c
index 6cab37cd9c1e1c3b4d59007cd2f9ee0c5931e71e..6db15a33073b1e768fca12ab6c0194e6f6a3a740 100644 (file)
--- a/emufs/idx.c
+++ b/emufs/idx.c
@@ -92,8 +92,8 @@ EMUFS_REG_ID emufs_idx_buscar_mayor_id_libre(EMUFS* emu, int* err)
                        *err = 3; /* EMUFS_ERROR_FILE_READ */
                        return EMUFS_NOT_FOUND;
                }
-               if (reg.n_idreg >= max) {
-                       max = reg.n_idreg;
+               if (reg.id_reg >= max) {
+                       max = reg.id_reg;
                        found = 1;
                }
        }
@@ -129,9 +129,9 @@ EMUFS_BLOCK_ID emufs_idx_buscar_registro(EMUFS *emu, EMUFS_REG_ID reg_id)
                        /*   *err = 3; * EMUFS_ERROR_FILE_READ */
                        return EMUFS_NOT_FOUND;
                }
-               if (reg.n_idreg == reg_id) {
+               if (reg.id_reg == reg_id) {
                        fclose(f_idx);
-                       return reg.n_location;
+                       return reg.location;
                }
        }
        fclose(f_idx);
@@ -140,7 +140,7 @@ EMUFS_BLOCK_ID emufs_idx_buscar_registro(EMUFS *emu, EMUFS_REG_ID reg_id)
 }
 
 /* agrega un registro al final del archivo */
-int emufs_idx_agregar(EMUFS *emu, EMUFS_REG_ID n_idreg, EMUFS_BLOCK_ID n_location)
+int emufs_idx_agregar(EMUFS *emu, EMUFS_REG_ID id_reg, EMUFS_BLOCK_ID location)
 {
        FILE *f_idx;
        EMUFS_IDX reg;
@@ -152,8 +152,8 @@ int emufs_idx_agregar(EMUFS *emu, EMUFS_REG_ID n_idreg, EMUFS_BLOCK_ID n_locatio
        if ( (f_idx = fopen(name_f_idx,"a+"))==NULL ) return -1;
                
     /* Note: Location = Bloque para Tipo 1 y 3, Offset para Tipo 2 */
-    reg.n_idreg = n_idreg;
-       reg.n_location = n_location;
+       reg.id_reg = id_reg;
+       reg.location = location;
        fwrite(&reg,sizeof(EMUFS_IDX),1,f_idx); 
        fclose(f_idx);
        return 0;
@@ -165,7 +165,7 @@ int emufs_idx_borrar(EMUFS *emu, EMUFS_REG_ID idreg)
        FILE *f_idx;
        EMUFS_IDX reg;
        char name_f_idx[255];
-       long actual, final, cant, i, tam, a;
+       long actual, final, cant, i, tam;
        
        strcpy(name_f_idx,emu->nombre);
        strcat(name_f_idx, EMUFS_IDX_EXT);
@@ -175,7 +175,7 @@ int emufs_idx_borrar(EMUFS *emu, EMUFS_REG_ID idreg)
        while ( !feof(f_idx) ){
                /*busco cual tengo que borrar*/
                if ( fread(&reg, sizeof(EMUFS_IDX), 1, f_idx) != 1 ) continue;
-               if ( reg.n_idreg == idreg ) {
+               if ( reg.id_reg == idreg ) {
                        break;
                }
        }
@@ -190,7 +190,7 @@ int emufs_idx_borrar(EMUFS *emu, EMUFS_REG_ID idreg)
        cant = (final-actual)/sizeof(EMUFS_IDX);
        /*apunto al siguiente del que quiero borrar*/
        /*leo todos los que quedan*/
-       for(i=0; i<cant-1; i++) {
+       for(i=0; i<cant; i++) {
                final = actual + sizeof(EMUFS_IDX);
                fseek(f_idx, final, SEEK_SET);
                fread(&reg, sizeof(EMUFS_IDX), 1, f_idx);
@@ -210,14 +210,53 @@ EMUFS_REG_ID emufs_idx_get_new_id(EMUFS* efs, int* err)
 {
        EMUFS_REG_ID id;
 
+       (*err) = 0;
        id = emufs_did_get_last(efs, err);
        if (id == EMUFS_NOT_FOUND) {
                id = emufs_idx_buscar_mayor_id_libre(efs, err);
                if (*err) {
                        PERR("error al obtener id mayor");
-                       return id;
+                       return EMUFS_NOT_FOUND;
                }
        }
        return id;      
 }
 
+unsigned int emufs_idx_get_count(EMUFS *emu)
+{
+       FILE *fp;
+       char name_f_idx[255];
+       long tam;
+       
+       strcpy(name_f_idx,emu->nombre);
+       strcat(name_f_idx, EMUFS_IDX_EXT);
+
+       fp = fopen(name_f_idx, "r");
+       if (fp == NULL) return 0;
+
+       fseek(fp, 0, SEEK_END);
+       tam = ftell(fp);
+       fclose(fp);
+
+       return tam/sizeof(EMUFS_IDX);
+}
+
+unsigned long emufs_idx_get_id_at(EMUFS *emu, unsigned int pos)
+{
+       FILE *fp;
+       char name_f_idx[255];
+       EMUFS_IDX id;
+       
+       strcpy(name_f_idx,emu->nombre);
+       strcat(name_f_idx, EMUFS_IDX_EXT);
+
+       fp = fopen(name_f_idx, "r");
+       if (fp == NULL) return EMUFS_NOT_FOUND;
+
+       fseek(fp, pos*sizeof(EMUFS_IDX), SEEK_SET);
+       fread(&id, sizeof(EMUFS_IDX), 1, fp);
+       fclose(fp);
+
+       return id.id_reg;
+}
+