* Comento EMUFS para Doxygen

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

diff --git a/tipo3/emufs.c b/tipo3/emufs.c
index e696d86301e08656c1094a19ee8e87fa9a8177d6..ae302fdcea96359b4e9d2c594a1f34d9602b032e 100644 (file)
--- a/tipo3/emufs.c
+++ b/tipo3/emufs.c
@@ -1,18 +1,19 @@
-

 #include "emufs.h"
 #include "param_cte.h"
 
 /* Defino las extenciones que usan cada tipo de archivo */
 #include "emufs.h"
 #include "param_cte.h"
 
 /* Defino las extenciones que usan cada tipo de archivo */

-#define EXT_TIPO3_ID ".id3"
+#define EXT_TIPO3_ID ".idx"

 #define EXT_TIPO3_DATA ".dat"
 #define EXT_TIPO3_DISP ".fsc"
 #define EXT_TIPO3_DATA ".dat"
 #define EXT_TIPO3_DISP ".fsc"

-#define EXT_TIPO3_IDS ".idc"
-#define EXT_TIPO3_EXTRA ".ids"
+#define EXT_TIPO3_IDS ".ids"
+
+char *str_dup(const char *s);

 
 char *str_dup(const char *s)
 {
 
 char *str_dup(const char *s)
 {

+       char *tmp;

        if (s == NULL) return NULL;
        if (s == NULL) return NULL;

-       char *tmp = (char *)malloc(sizeof(char)*(strlen(s)+1));
+       tmp = (char *)malloc(sizeof(char)*(strlen(s)+1));

        strcpy(tmp, s);
        return tmp;
 }
        strcpy(tmp, s);
        return tmp;
 }


@@ -67,11 +68,7 @@ EMUFS *emufs_crear(const char *filename, char tipo, unsigned int tam_bloque, uns
                        strcat(name, EXT_TIPO3_IDS);
                        fp = fopen(name, "w");
                        fclose(fp);
                        strcat(name, EXT_TIPO3_IDS);
                        fp = fopen(name, "w");
                        fclose(fp);

-                       
-                       strcpy(name, filename);
-                       strcat(name, EXT_TIPO3_EXTRA);
-                       fp = fopen(name, "w");
-                       fclose(fp);
+

                break;
                default:
                        free(tmp);
                break;
                default:
                        free(tmp);


@@ -90,6 +87,8 @@ EMUFS *emufs_abrir(const char *filename)
 
        strcpy(name, filename);
        strcat(name, EXT_TIPO3_DATA);
 
        strcpy(name, filename);
        strcat(name, EXT_TIPO3_DATA);

+
+       /* Trato de determinar el tipo de archivo */

        fp = fopen(name, "r");
        if (fp == NULL) return NULL;
        fread(&tipo, sizeof(char), 1, fp);
        fp = fopen(name, "r");
        if (fp == NULL) return NULL;
        fread(&tipo, sizeof(char), 1, fp);


@@ -99,7 +98,10 @@ EMUFS *emufs_abrir(const char *filename)
        }
        
        tmp = (EMUFS *)malloc(sizeof(EMUFS));
        }
        
        tmp = (EMUFS *)malloc(sizeof(EMUFS));

-       if (tmp == NULL) return NULL;
+       if (tmp == NULL) {
+               fclose(fp);
+               return NULL;
+       }

 
        switch (tipo) {
                case T1:
 
        switch (tipo) {
                case T1:


@@ -137,16 +139,32 @@ int ver_archivo_FS(EMUFS *emu)
        strcpy(name_f_block_free,emu->nombre);
        strcat(name_f_block_free,".fsc");
 
        strcpy(name_f_block_free,emu->nombre);
        strcat(name_f_block_free,".fsc");
 

-       if ( (f_block_free = fopen("articulos.fsc","r"))==NULL ){
+       if ( (f_block_free = fopen(name_f_block_free,"r"))==NULL ){

                printf("no pude abrir el archivo %s\n",name_f_block_free);
                return -1;
        }
                printf("no pude abrir el archivo %s\n",name_f_block_free);
                return -1;
        }

-
+       fread(&reg,sizeof(reg),1,f_block_free);

        while ( !feof(f_block_free) ){
        while ( !feof(f_block_free) ){

-               fread(&reg,sizeof(reg),1,f_block_free);

                printf(" Bloque = %d   Espacio libre = %d\n",reg.block, reg.free_space);
                printf(" Bloque = %d   Espacio libre = %d\n",reg.block, reg.free_space);

+               fread(&reg,sizeof(reg),1,f_block_free);

        }
        
        fclose(f_block_free);
        }
        
        fclose(f_block_free);

+
+       /* Imprimo la lista de bloques/registros */
+       strcpy(name_f_block_free,emu->nombre);
+       strcat(name_f_block_free,".idx");
+       {
+               BLOCK_REG_T r;
+               f_block_free = fopen(name_f_block_free, "r");
+               fread(&r, sizeof(BLOCK_REG_T), 1, f_block_free);
+               while (!feof(f_block_free)) {
+                       printf("ID %ld en bloque %d\n", r.id_reg, r.block);
+                       fread(&r, sizeof(BLOCK_REG_T), 1, f_block_free);
+               }
+               fclose(f_block_free);
+       }
+       
+       

        return 0;
 }
        return 0;
 }