Borro parte redundante.

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

diff --git a/emufs/idx.c b/emufs/idx.c
index 8b4f969a922b1c2e3df7e99ad6abdb5a6f266202..ec869663f027d6725a3a1f6718a7e7dd72c5991a 100644 (file)
--- a/emufs/idx.c
+++ b/emufs/idx.c
@@ -37,6 +37,8 @@
 
 #include "idx.h"
 #include "did.h"
+#include "error.h"
+#include "common.h"
 #include <stdlib.h>
 #include <strings.h>
 #include <unistd.h>
@@ -50,7 +52,6 @@ FILE* emufs_idx_abrir(EMUFS* efs, const char* mode)
        filename = (char*) malloc(sizeof(char) * (strlen(efs->nombre)
                                + strlen(EMUFS_IDX_EXT) + 1));
        if (filename == NULL) {
-               /* TODO Manejo de errores */
                return NULL;
        }
        strcpy(filename, efs->nombre);
@@ -80,7 +81,7 @@ EMUFS_REG_ID emufs_idx_buscar_mayor_id_libre(EMUFS* emu, int* err)
 
        if ((f_idx = fopen(name_f_idx, "rb")) == NULL) {
                PERR("No se puede abrir archivo");
-               *err = 4; /* EMUFS_ERROR_CANT_OPEN_FILE */
+               *err = EMUFS_ERROR_CANT_OPEN_FILE;
                return EMUFS_NOT_FOUND;
        }
 
@@ -115,7 +116,7 @@ EMUFS_BLOCK_ID emufs_idx_buscar_registro(EMUFS *emu, EMUFS_REG_ID reg_id)
        
        if ((f_idx = fopen(name_f_idx, "rb")) == NULL) {
                PERR("No se puede abrir archivo");
-               /*    *err = 4; * EMUFS_ERROR_CANT_OPEN_FILE */
+               /* *err = EMUFS_ERROR_CANT_OPEN_FILE; */
                return EMUFS_NOT_FOUND;
        }
 
@@ -140,7 +141,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+"))==NULL ) return -1;
+       if ( (f_idx = fopen(name_f_idx,"r+"))==NULL ) return -1;
 
        fseek(f_idx, sizeof(EMUFS_IDX)*id_reg, SEEK_SET); 
        reg.id_reg = id_reg;
@@ -214,21 +215,22 @@ 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;
-               /* TODO : Verificar errores :-D */
                if (reg.location != EMUFS_NOT_FOUND) {
                        count++;
-                       tmp = realloc(tmp, count);
+                       tmp = realloc(tmp, count*sizeof(EMUFS_REG_ID));
                        tmp[count-1] = reg.id_reg;
-                       fprintf(stderr, "Nuevo registro de id = %lu\n", reg.id_reg);
                }
        }
        fclose(f_idx);
 
        (*cant) = count;
-       fprintf(stderr, "Mando %d registros\n", count);
        return tmp;
 }
 
+/** @todo FIXME borrar cuando se cambie emufs_gui/registros.c que es el unico
+ * que lo usa.
+ * @deprecated Usar emufs_idx_buscar_registro.
+ */
 int emufs_idx_existe_id(EMUFS *emu, int ID)
 {
        FILE *f_idx;
@@ -267,7 +269,6 @@ int emufs_idx_actualizar(EMUFS *emu, int ID, EMUFS_BLOCK_ID bloque)
                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);
@@ -277,3 +278,11 @@ int emufs_idx_actualizar(EMUFS *emu, int ID, EMUFS_BLOCK_ID bloque)
        fclose(f_idx);
        return 0;
 }
+
+long emufs_idx_get_file_size(EMUFS* efs, int* err)
+{
+       char name[255];
+       strcpy(name, efs->nombre);
+       strcat(name, EMUFS_IDX_EXT);
+       return emufs_common_get_file_size(name, err);
+}