X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/blobdiff_plain/c7cf7f97785bf9d5e49a3e2015233a8b222903db..885b60b3ea2aed49543ea87490ff971a68a5c2f1:/tipo3/emufs.c diff --git a/tipo3/emufs.c b/tipo3/emufs.c index 71e9dd0..4d74097 100644 --- a/tipo3/emufs.c +++ b/tipo3/emufs.c @@ -1,18 +1,17 @@ - #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_IDS ".idc" -#define EXT_TIPO3_EXTRA ".ids" +#define EXT_TIPO3_IDS ".ids" char *str_dup(const char *s) { + char *tmp; 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; } @@ -67,11 +66,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); - - strcpy(name, filename); - strcat(name, EXT_TIPO3_EXTRA); - fp = fopen(name, "w"); - fclose(fp); + break; default: free(tmp); @@ -151,13 +146,13 @@ int ver_archivo_FS(EMUFS *emu) /* Imprimo la lista de bloques/registros */ strcpy(name_f_block_free,emu->nombre); - strcat(name_f_block_free,".id3"); + 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 %d en bloque %d\n", r.id_reg, r.block); + 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);