Fixed mezcla de data types utilizando los nuevos tipos definidos por Luca - by Bugo

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

diff --git a/emufs/fsc.c b/emufs/fsc.c
index f5d6d06b6af13b09ca62f91d0ce825b1a07cae56..05218a6c19893cc596688e792826d28d101349e8 100644 (file)
--- a/emufs/fsc.c
+++ b/emufs/fsc.c
@@ -1,43 +1,86 @@
+/* vim: set noexpandtab tabstop=4 shiftwidth=4:
+ *----------------------------------------------------------------------------
+ *                                  emufs
+ *----------------------------------------------------------------------------
+ * This file is part of emufs.
+ *
+ * emufs is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * emufs is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with emufs; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA  02111-1307  USA
+ *----------------------------------------------------------------------------
+ * Creado:  vie abr  9 16:17:50 ART 2004
+ * Autores: Nicolás Dimov <sagardua@uolsinectis.com.ar>
+ *          Leandro Lucarella <llucare@fi.uba.ar>
+ *----------------------------------------------------------------------------
+ *
+ * $Id$
+ *
+ */
+
+/** \file
+ *
+ * Archivo para administrar el espacio libre disponible.
+ * 
+ * Implementación del archivo para administrar el espacio libre disponible.
+ *
+ */
+

 #include "fsc.h"
 #include "fsc.h"

-#include "tipo3.h"
+#include <string.h>
+#include <unistd.h>
+
+int emufs_fsc_crear(EMUFS* efs)
+{
+       return emufs_crear_archivo_auxiliar(efs->nombre, EMUFS_FSC_EXT);
+}

 
 

-int emufs_fsc_agregar(EMUFS *emu, int num_bloque, int fs)
+int emufs_fsc_agregar(EMUFS *emu, EMUFS_BLOCK_ID num_bloque, EMUFS_FREE fs)

 {
        FILE *f_fsc;
 {
        FILE *f_fsc;

-       BLOCK_FREE_T reg;
+       EMUFS_FSC reg;

        char name_f_fsc[255];
        
        strcpy(name_f_fsc,emu->nombre);
        char name_f_fsc[255];
        
        strcpy(name_f_fsc,emu->nombre);

-       strcat(name_f_fsc,".fsc");
+       strcat(name_f_fsc, EMUFS_FSC_EXT);

        
        /*cargo el registro*/
        reg.block = num_bloque; 
        reg.free_space = fs;
        /*lo guardo en el archivo al final  "a+"*/
        if ( (f_fsc = fopen(name_f_fsc,"a+"))==NULL ) return -1;
        
        /*cargo el registro*/
        reg.block = num_bloque; 
        reg.free_space = fs;
        /*lo guardo en el archivo al final  "a+"*/
        if ( (f_fsc = fopen(name_f_fsc,"a+"))==NULL ) return -1;

-       fwrite(&reg,sizeof(BLOCK_FREE_T),1,f_fsc);
+       fwrite(&reg,sizeof(EMUFS_FSC),1,f_fsc);

        fclose(f_fsc);
        return 0;
 }
 
 /* busca el bloque y le resta fs de espacio libre */
        fclose(f_fsc);
        return 0;
 }
 
 /* busca el bloque y le resta fs de espacio libre */

-int emufs_fsc_actualizar(EMUFS *emu, int num_bloque, int fs)
+int emufs_fsc_actualizar(EMUFS *emu, EMUFS_BLOCK_ID num_bloque, EMUFS_FREE fs)

 {
        FILE *f_fsc;
 {
        FILE *f_fsc;

-       BLOCK_FREE_T reg;
+       EMUFS_FSC reg;

        char name_f_fsc[255];
        
        strcpy(name_f_fsc,emu->nombre);
        char name_f_fsc[255];
        
        strcpy(name_f_fsc,emu->nombre);

-       strcat(name_f_fsc,".fsc");
+       strcat(name_f_fsc, EMUFS_FSC_EXT);

 
        /*busco el bloque que modifique*/
        if ( (f_fsc = fopen(name_f_fsc,"r+")) == NULL) return -1; 
        while ( !feof(f_fsc) ){
 
        /*busco el bloque que modifique*/
        if ( (f_fsc = fopen(name_f_fsc,"r+")) == NULL) return -1; 
        while ( !feof(f_fsc) ){

-               if ( fread(&reg,sizeof(BLOCK_FREE_T),1,f_fsc) != 1) continue;
+               if ( fread(&reg,sizeof(EMUFS_FSC),1,f_fsc) != 1) continue;

                if ( reg.block == num_bloque ){
                        reg.free_space = fs;
                if ( reg.block == num_bloque ){
                        reg.free_space = fs;

-                       fseek(f_fsc,-sizeof(BLOCK_FREE_T),SEEK_CUR);
-                       fwrite(&reg,sizeof(BLOCK_FREE_T),1,f_fsc);
+                       fseek(f_fsc,-sizeof(EMUFS_FSC),SEEK_CUR);
+                       fwrite(&reg,sizeof(EMUFS_FSC),1,f_fsc);

                        break;
                }
        }
                        break;
                }
        }


@@ -46,14 +89,14 @@ int emufs_fsc_actualizar(EMUFS *emu, int num_bloque, int fs)
 }
 
 /* me devuelve el ID del bloque donde quepa un registro, y guarda en fs el espacio libre que queda en el bloque */
 }
 
 /* me devuelve el ID del bloque donde quepa un registro, y guarda en fs el espacio libre que queda en el bloque */

-int emufs_fsc_buscar_lugar(EMUFS *emu, unsigned long tam, int *fs)
+EMUFS_BLOCK_ID emufs_fsc_buscar_lugar(EMUFS *emu, EMUFS_FREE tam, EMUFS_FREE *fs)

 {
        FILE *f_fsc;
 {
        FILE *f_fsc;

-       BLOCK_FREE_T reg;
+       EMUFS_FSC reg;

        char name_f_fsc[255];
        
        strcpy(name_f_fsc,emu->nombre);
        char name_f_fsc[255];
        
        strcpy(name_f_fsc,emu->nombre);

-       strcat(name_f_fsc,".fsc");
+       strcat(name_f_fsc, EMUFS_FSC_EXT);

 
        if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
 
 
        if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
 


@@ -63,10 +106,10 @@ int emufs_fsc_buscar_lugar(EMUFS *emu, unsigned long tam, int *fs)
        reg.block = -1;
        *fs = emu->tam_bloque;
        while( !feof(f_fsc) ){
        reg.block = -1;
        *fs = emu->tam_bloque;
        while( !feof(f_fsc) ){

-               if (fread(&reg,sizeof(BLOCK_FREE_T),1,f_fsc) != 1) continue;
-               if ( reg.free_space >= tam+sizeof(int)) 
+               if (fread(&reg,sizeof(EMUFS_FSC),1,f_fsc) != 1) continue;
+               if (reg.free_space >= tam) {

                        break;
                        break;

-               else {
+               } else {

                        reg.block = -1;
                        *fs = emu->tam_bloque;
                }
                        reg.block = -1;
                        *fs = emu->tam_bloque;
                }


@@ -78,19 +121,19 @@ int emufs_fsc_buscar_lugar(EMUFS *emu, unsigned long tam, int *fs)
        return reg.block;
 }
 
        return reg.block;
 }
 

-int emufs_fsc_get_fs(EMUFS *emu, int num_bloque)
+EMUFS_FREE emufs_fsc_get_fs(EMUFS *emu, EMUFS_BLOCK_ID num_bloque)

 {
        FILE *f_fsc;
 {
        FILE *f_fsc;

-       BLOCK_FREE_T reg;
+       EMUFS_FSC reg;

        char name_f_fsc[255];
        
        strcpy(name_f_fsc,emu->nombre);
        char name_f_fsc[255];
        
        strcpy(name_f_fsc,emu->nombre);

-       strcat(name_f_fsc,".fsc");
+       strcat(name_f_fsc, EMUFS_FSC_EXT);

 
        if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
 
        while ( !feof(f_fsc) ){
 
        if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
 
        while ( !feof(f_fsc) ){

-               if ( fread(&reg,sizeof(BLOCK_FREE_T),1,f_fsc) != 1 ) continue;
+               if ( fread(&reg,sizeof(EMUFS_FSC),1,f_fsc) != 1 ) continue;

                if ( reg.block == num_bloque )
                        break;
        }
                if ( reg.block == num_bloque )
                        break;
        }


@@ -98,3 +141,4 @@ int emufs_fsc_get_fs(EMUFS *emu, int num_bloque)
        fclose(f_fsc);
        return reg.free_space;
 }
        fclose(f_fsc);
        return reg.free_space;
 }

+