me quedo un pritnf dando vueltas por ahi

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

diff --git a/emufs/fsc.c b/emufs/fsc.c
index a3aad0e6cf0058b31343e3040dabc74518ff0d06..562ae32fa2bd905b597718761a15cd1a6733365e 100644 (file)
--- a/emufs/fsc.c
+++ b/emufs/fsc.c
@@ -55,12 +55,23 @@ int emufs_fsc_agregar(EMUFS *emu, EMUFS_BLOCK_ID marker, EMUFS_FREE freespace)
        strcpy(name_f_fsc,emu->nombre);
        strcat(name_f_fsc, EMUFS_FSC_EXT);
        
+       /* Lo guardo en el archivo al final "a+"*/
+       if ( (f_fsc = fopen(name_f_fsc,"r+"))==NULL ) return -1;
+       /* lo busco.. si esta lo modifico y si no lo agrego */
+       fseek(f_fsc,0,SEEK_SET);
+       while ( !feof(f_fsc) ){
+               if ( fread(&reg,sizeof(EMUFS_FSC),1,f_fsc) != 1) continue;
+               if ( reg.marker == marker ){
+                       fseek(f_fsc,-sizeof(EMUFS_FSC),SEEK_CUR);
+                       reg.freespace = freespace;
+                       fwrite(&reg,sizeof(EMUFS_FSC),1,f_fsc);
+                       fclose(f_fsc);
+                       return 0;
+               }
+       }
        /* Cargo el registro */
        reg.marker = marker;
        reg.freespace = freespace;
-
-       /* Lo guardo en el archivo al final "a+"*/
-       if ( (f_fsc = fopen(name_f_fsc,"a+"))==NULL ) return -1;
        fwrite(&reg,sizeof(EMUFS_FSC),1,f_fsc);
        fclose(f_fsc);
        return 0;
@@ -280,6 +291,17 @@ EMUFS_BLOCK_ID emufs_fsc_buscar_lugar(EMUFS *emu, EMUFS_FREE reg_size, EMUFS_FRE
 
        if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return EMUFS_NOT_FOUND;
 
+       if ( emu->tam_reg > emu->tam_bloque-sizeof(EMUFS_REG_ID) ){
+               fseek(f_fsc,0,SEEK_SET);
+               while(!feof(f_fsc)){
+                       if (fread(&reg,sizeof(EMUFS_FSC),1,f_fsc) != 1) continue;
+                       if (reg.freespace == emu->tam_bloque) {
+                               fclose(f_fsc);
+                               *freespace = reg.freespace;
+                               return reg.marker;
+                       }
+               }
+       }       
        /* Inicializamos la estructura para devolver algun valor en concreto */
        /* en caso de que no se halle un espacio libre apropiado */
        while(!feof(f_fsc)){
@@ -352,20 +374,31 @@ int emufs_fsc_get_max_min_fs(EMUFS *emu, EMUFS_FREE *min, EMUFS_FREE *max)
        strcpy(name_f_fsc,emu->nombre);
        strcat(name_f_fsc, EMUFS_FSC_EXT);
 
-       *min = ULONG_MAX;
-       *max = 0;
        if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
-       
-       while ( !feof(f_fsc) ){
-               fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc);
-               if (  reg.freespace < *min )
-                       *min = reg.freespace;
-               if ( reg.freespace > *max )
-                       *max = reg.freespace;
+               
+       /* Si el file esta vacio, devuelvo valores nulos */
+       fseek(f_fsc,0,SEEK_END);
+       if (ftell(f_fsc) == 0) {
+               *min = 0;
+               *max = 0;
+               return 0;               
+       }
+       else
+       {
+               /* Busco Min y Max */
+               *min = ULONG_MAX;
+               *max = 0;               
+               fseek(f_fsc,0,SEEK_SET);                
+               while ( !feof(f_fsc) ){
+                       if ( fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc) != 1) continue;
+                       if (  reg.freespace < *min )
+                               *min = reg.freespace;
+                       if ( reg.freespace > *max )
+                               *max = reg.freespace;
+               }
+               fclose(f_fsc);
+               return 0;               
        }
-
-       fclose(f_fsc);
-       return 0;
 }
 
 EMUFS_FREE emufs_fsc_get_media_fs(EMUFS *emu)
@@ -382,11 +415,43 @@ EMUFS_FREE emufs_fsc_get_media_fs(EMUFS *emu)
        if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
        
        while ( !feof(f_fsc) ){
-               fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc);
+               if ( fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc) != 1) continue;           
                total_fs += reg.freespace;
                ++gap_count;
        }
 
        fclose(f_fsc);
-       return total_fs/gap_count;
+       
+       if (gap_count > 0) return total_fs/gap_count;
+       else return 0;
+}
+
+int emufs_fsc_get_cant_bloques_vacios(EMUFS *emu)
+{
+       FILE *f_fsc;
+       EMUFS_FSC reg;
+       char name_f_fsc[255];
+       int cant=0;
+       
+       strcpy(name_f_fsc,emu->nombre);
+       strcat(name_f_fsc, EMUFS_FSC_EXT);
+
+       if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
+       while ( !feof(f_fsc) ){
+               fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc);
+               if ( reg.freespace == emu->tam_bloque )
+                       cant++;
+       }
+               
+       fclose(f_fsc);
+       return cant;
+}
+
+int emufs_fsc_truncate(EMUFS* efs, EMUFS_BLOCK_ID blocks)
+{
+       char name_f_fsc[255];
+
+       strcpy(name_f_fsc, efs->nombre);
+       strcat(name_f_fsc, EMUFS_FSC_EXT);
+       return truncate(name_f_fsc, blocks * sizeof(EMUFS_FSC));
 }