From 86a61940d1d5da3a699fbf12c87e91a7228deda2 Mon Sep 17 00:00:00 2001 From: Alan Kennedy Date: Sun, 20 Jun 2004 22:07:25 +0000 Subject: [PATCH] Huffman ya comprime multivolumen, pero aun funciona descompresion de multivolumen o volumen unico. Pareceria que el problema esta en el vfwrite. Agrego el vfile.c desde el statichuffman.c pero a lo guapo, asi que quizas no compile el test del all in one, no soy bueno con los makefiles, alguien que lo vea --- src/statichuff/main.c | 5 ++-- src/statichuff/statichuff.c | 49 ++++++++++++++++++------------------- src/statichuff/statichuff.h | 2 +- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/statichuff/main.c b/src/statichuff/main.c index de98c2b..aa7cde8 100644 --- a/src/statichuff/main.c +++ b/src/statichuff/main.c @@ -30,13 +30,13 @@ int main(int argc, char* argv[]) if ( (argc == 1) || (cflag & dflag) || !(cflag | dflag) || ((argc - optind) < 2) ) { fprintf(stderr, "Usage: %s [-cdt] sourcefile targetfile\n", argv[0]); - if ((tflag == 1) && (volumesize <= 0)) fprintf(stderr,"Error: The volume size must be a non-zero value\n"); + if ((tflag == 1) && (volumesize < 0)) fprintf(stderr,"Error: The volume size must be a non-zero value\n"); return (2); } if (cflag == 1) { /* Comprimo */ - return shuff_encode_file(argv[optind],argv[optind+1]); + return shuff_encode_file(argv[optind],argv[optind+1],volumesize*1024); } if (dflag == 1) { @@ -46,4 +46,3 @@ int main(int argc, char* argv[]) return 0; } - diff --git a/src/statichuff/statichuff.c b/src/statichuff/statichuff.c index 6d6de7f..0a3fa01 100644 --- a/src/statichuff/statichuff.c +++ b/src/statichuff/statichuff.c @@ -1,8 +1,9 @@ #include "statichuff.h" +#include "../vfile/vfile.h" #include -void putbit(char bit, char restart, char flush, FILE *fp) +void putbit(char bit, char restart, char flush, VFILE *fp) { static unsigned long int bits_buffer = 0; static unsigned char bits_used = 0; @@ -10,7 +11,7 @@ void putbit(char bit, char restart, char flush, FILE *fp) /* me obligan a emitir el output */ if ((flush == 1) && (bits_used > 0)) { bits_buffer = bits_buffer << ((sizeof(unsigned long int)*8) - bits_used); - fwrite(&bits_buffer,sizeof(unsigned long int),1,fp); + vfwrite(&bits_buffer,sizeof(unsigned long int),1,fp); bits_buffer = 0; bits_used = 0; return; @@ -27,7 +28,7 @@ void putbit(char bit, char restart, char flush, FILE *fp) /* lleno el buffer, escribo */ if (bits_used == 32) { - fwrite(&bits_buffer,sizeof(unsigned long int),1,fp); + vfwrite(&bits_buffer,sizeof(unsigned long int),1,fp); bits_buffer = 0; bits_used = 0; } @@ -75,7 +76,7 @@ int shuff_scanfreq(char *inputfile, t_freq *freqtable) for (i = 0; i < 256; ++i) freqtable[i] = 0; /* Abrimos el file */ - if ((fp = fopen(inputfile,"rb")) == NULL) return 0; + if ((fp = fopen(inputfile,"r")) == NULL) return 0; while (!feof(fp)) { /* Contamos las frecuencias */ symbol = fgetc(fp); @@ -90,7 +91,7 @@ int shuff_scanfreq(char *inputfile, t_freq *freqtable) } fclose(fp); - return 1; + return 1; } SHUFFNODE *shuff_buildlist(t_freq *freqtable, int *nonzerofreqs) @@ -189,25 +190,24 @@ void shuff_buildcodes(SHUFFCODE *table, SHUFFNODE *node, int level, int code) } } - - -int shuff_encode_symbols(t_freq *ftable, SHUFFCODE *ctable, char* inputfile, char *outputfile) +int shuff_encode_symbols(t_freq *ftable, SHUFFCODE *ctable, char* inputfile, char *outputfile, long volsize) { - FILE *fpsource,*fpdest; + FILE *fpsource; + VFILE *fpdest; int symbol,i; unsigned long int sourcesize; char bit; SHUFFCODE symbolcode; /* Abrimos el file */ - if ((fpsource = fopen(inputfile,"rb")) == NULL) return 0; - if ((fpdest = fopen(outputfile,"wb")) == NULL) return 0; + if ((fpsource = fopen(inputfile,"r")) == NULL) return 0; + if ((fpdest = vfopen(outputfile,"w",volsize)) == NULL) return 0; /* Guardamos el size el archivo original e inputlist como header */ fseek(fpsource,0,SEEK_END); sourcesize = ftell(fpsource); - fwrite(&sourcesize,sizeof(unsigned long int),1,fpdest); - fwrite(ftable,sizeof(t_freq),256,fpdest); + vfwrite(&sourcesize,sizeof(unsigned long int),1,fpdest); + vfwrite(ftable,sizeof(t_freq),256,fpdest); /* Encodeo */ fseek(fpsource,0,SEEK_SET); @@ -227,11 +227,11 @@ int shuff_encode_symbols(t_freq *ftable, SHUFFCODE *ctable, char* inputfile, cha /* Hacemos un flush de lo que haya quedado en el buffer de salida */ putbit(0,0,1,fpdest); fclose(fpsource); - fclose(fpdest); + vfclose(fpdest); return 1; } -int shuff_encode_file(char *inputfile, char *outputfile) +int shuff_encode_file(char *inputfile, char *outputfile, long volsize) { /* Locals */ t_freq *freqtable = (t_freq*)malloc(sizeof(t_freq)*256); @@ -253,7 +253,7 @@ int shuff_encode_file(char *inputfile, char *outputfile) /*shuff_printcodes(codetable,freqtable);*/ /* Encodeo byte per byte */ - shuff_encode_symbols(freqtable,codetable,inputfile,outputfile); + shuff_encode_symbols(freqtable,codetable,inputfile,outputfile,volsize); /* Free up memory baby yeah */ free(freqtable); @@ -286,24 +286,24 @@ int shuff_decode_file(char *inputfile, char *outputfile) SHUFFNODE *codetree,*currnode; t_freq *ftable = (t_freq*)malloc(sizeof(t_freq)*256); unsigned long int bytesleft,codebuffer; - FILE *fpsource; + VFILE *fpsource; FILE *fpdest; unsigned short int decoded_symbol; int bitsleft,freqcount = 0; /* Levanto cuantos bytes decodeo y la freq table */ - if ((fpsource = fopen(inputfile,"rb")) == NULL) return 0; - if ((fpdest = fopen(outputfile,"wb")) == NULL) return 0; - fread(&bytesleft,sizeof(unsigned long int),1,fpsource); - fread(ftable,sizeof(unsigned long int),256,fpsource); + if ((fpsource = vfopen(inputfile,"r",0)) == NULL) return 0; + if ((fpdest = fopen(outputfile,"w")) == NULL) return 0; + vfread(&bytesleft,sizeof(unsigned long int),1,fpsource); + vfread(ftable,sizeof(unsigned long int),256,fpsource); inputlist = shuff_buildlist(ftable, &freqcount); codetree = shuff_buildtree(inputlist,freqcount); currnode = codetree; - while (!feof(fpsource) && (bytesleft > 0)) { + while (!feof(fpsource->fp) && (bytesleft > 0)) { /* Leo un buffer de 32 bits */ - if (fread(&codebuffer,sizeof(unsigned long int),1,fpsource) != 1) continue; + if (vfread(&codebuffer,sizeof(unsigned long int),1,fpsource) != 1) continue; bitsleft = sizeof(unsigned long int) * 8; /* Proceso el buffer sacando simbolos hasta que se me agote */ @@ -318,7 +318,7 @@ int shuff_decode_file(char *inputfile, char *outputfile) } } - fclose(fpsource); + vfclose(fpsource); fclose(fpdest); /* Free up memory baby yeah */ @@ -327,4 +327,3 @@ int shuff_decode_file(char *inputfile, char *outputfile) return 1; } - diff --git a/src/statichuff/statichuff.h b/src/statichuff/statichuff.h index 8c3502d..5699ebb 100644 --- a/src/statichuff/statichuff.h +++ b/src/statichuff/statichuff.h @@ -20,6 +20,6 @@ typedef struct t_code { } SHUFFCODE; int shuff_decode_file(char *inputfile, char *outputfile); -int shuff_encode_file(char *inputfile, char *outputfile); +int shuff_encode_file(char *inputfile, char *outputfile, long volsize); #endif /* _STATICHUFF_H_ */ -- 2.43.0