saco el conflict

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

diff --git a/emufs/emufs.c b/emufs/emufs.c
index cd59b39ada88430d14f69974a21536c0b8e0ad4e..de9856ed02b674e141a722d88831b8dc2f5df650 100644 (file)
--- a/emufs/emufs.c
+++ b/emufs/emufs.c
@@ -290,7 +290,18 @@ EMUFS *emufs_abrir(const char *filename)
 
 int emufs_destruir(EMUFS *e)
 {
 
 int emufs_destruir(EMUFS *e)
 {

+       INDICE *del, *cur;
+

        if (e == NULL) return 1;
        if (e == NULL) return 1;

+
+       /* libero indices */
+       cur = e->indices;
+       while (cur) {
+               del = cur;
+               cur = cur->sig;
+               emufs_indice_destruir(e, cur);
+       }
+

        free(e->nombre);
        free(e);
        return 0;
        free(e->nombre);
        free(e);
        return 0;


@@ -496,7 +507,6 @@ EMUFS_BLOCK_ID emufs_create_new_block(EMUFS *emu)
        dummy = (char*)malloc(emu->tam_bloque);
        memset(dummy, 0, emu->tam_bloque);
        fwrite(dummy, emu->tam_bloque, 1, fp);
        dummy = (char*)malloc(emu->tam_bloque);
        memset(dummy, 0, emu->tam_bloque);
        fwrite(dummy, emu->tam_bloque, 1, fp);

-       printf("new_block ftell = %d\n", ftell(fp));

        switch(emu->tipo){
                case T1: num = (ftell(fp)-sizeof(EMUFS_Tipo)-sizeof(EMUFS_BLOCK_SIZE))/emu->tam_bloque;
                        break;
        switch(emu->tipo){
                case T1: num = (ftell(fp)-sizeof(EMUFS_Tipo)-sizeof(EMUFS_BLOCK_SIZE))/emu->tam_bloque;
                        break;