X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/83d3320cb8c682ebc17edaae32e555a645424a1b..HEAD:/src/jacu.c?ds=inline diff --git a/src/jacu.c b/src/jacu.c index 4b35832..d8f6de3 100644 --- a/src/jacu.c +++ b/src/jacu.c @@ -1,5 +1,24 @@ +/*---------------------------------------------------------------------------- + * jacu - Just Another Compression Utility + *---------------------------------------------------------------------------- + * This file is part of jacu. + * + * jacu 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. + * + * jacu 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 jacu; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place, Suite 330, Boston, MA 02111-1307 USA + *---------------------------------------------------------------------------- + */ -/* Jacu Team - GPL */ #include "blocksorting/bs.h" #include "mtf/mtf.h" #include "zerogrouping/zerogrouping.h" @@ -12,6 +31,16 @@ long fsize(const char* filename); +/* Flags del archivo comprimido */ +#define FLAGS_ZG 0x1 +#define FLAGS_WS 0x2 +#define FLAGS_RESERVED_1 0x4 +#define FLAGS_RESERVED_2 0x8 +#define FLAGS_RESERVED_3 0x16 +#define FLAGS_RESERVED_4 0x64 +#define FLAGS_RESERVED_5 0x128 +#define FLAGS_RESERVED_6 0x255 + typedef struct _flags_ { int cflag; int dflag; @@ -20,11 +49,27 @@ typedef struct _flags_ { int qflag; int sflag; int mflag; + int rflag; /* Richard Dictionary :-) */ } t_Flags; -int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumensize, t_Flags *flags, char *staticmodel); +int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags *flags, char *staticmodel); int descomprimir(char *src, char *dst); +char is_flags_on(unsigned char flags, unsigned char flag) +{ + return (flags & flag); +} + +char flag_on(unsigned char flags, unsigned char flag) +{ + return (flags | flag); +} + +char flag_off(unsigned char flags, unsigned char flag) +{ + return (flags & (~flag)); +} + int main(int argc, char* argv[]) { long int volumesize = 0; @@ -35,7 +80,7 @@ int main(int argc, char* argv[]) memset(&flags, 0, sizeof(t_Flags)); - while ((ch = getopt(argc, argv, "scdzm:t:q:")) != -1) { + while ((ch = getopt(argc, argv, "rscdzm:t:q:")) != -1) { switch (ch) { case 'c': flags.cflag = 1; @@ -58,6 +103,8 @@ int main(int argc, char* argv[]) volumesize = atol(optarg); break; + case 'r': flags.rflag = 1; + break; case 'q': flags.qflag = 1; switch (atoi(optarg)) { @@ -85,13 +132,13 @@ int main(int argc, char* argv[]) } break; - default: fprintf(stderr, "Usage: %s [-cdzs][-q blksize][-t volsize][-m modeldumpfile] source target\n", argv[0]); + default: fprintf(stderr, "Usage: %s [-cdzsr][-q blksize][-t volsize][-m modeldumpfile] source target\n", argv[0]); return(2); } } if ( (argc == 1) || (flags.cflag & flags.dflag) || !(flags.cflag | flags.dflag) || ((argc - optind) < 2) || (flags.mflag & flags.sflag)) { - fprintf(stderr, "Usage: %s [-cdzs][-q compressionquality][-t volsize][-m modeldumpfile] source target\n", argv[0]); + fprintf(stderr, "Usage: %s [-cdzsr][-q compressionquality][-t volsize][-m modeldumpfile] source target\n", argv[0]); return (3); } if ((flags.tflag) && (volumesize <= 0l)) { @@ -119,7 +166,7 @@ long fsize(const char* filename) FILE* file; long file_size; - if (!(file = fopen(filename, "r"))) return -1; + if (!(file = fopen(filename, "ab"))) return -1; file_size = ftell(file); fclose(file); return file_size; @@ -135,8 +182,12 @@ int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags unsigned char *mtf; unsigned char *salida, *data; unsigned char *z; + unsigned char file_flags = 0; int z_len; + /* Abrimos el archivo a comprimir y encodeamos bloques */ + if ((fp = fopen(src, "rb")) == NULL) return 1; + /* Preparo el compresor huffman */ if ((shuff = shuff_init_encoder_bychunk(dst, volumesize*1024)) == NULL) return 1; if (flags->mflag == 1) shuff_loadmodel(shuff, staticmodel); @@ -146,28 +197,23 @@ int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags salida = malloc(sizeof(unsigned char)*pagesize+sizeof(Uint32)); bs = bs_create(pagesize); - /* Abrimos el archivo a comprimir y encodeamos bloques */ - fp = fopen(src, "rb"); - /* Guardamos el pagesize como header (huffencoded) */ shuff_scanfreq_chunk(shuff,(char*)&pagesize,sizeof(Uint32)); /* Guardamos cabecera para indicar si usamos ZG (huffencoded) */ if (flags->zflag) - shuff_scanfreq_chunk(shuff, "\001", 1); - else - shuff_scanfreq_chunk(shuff, "\000", 1); + file_flags = flag_on(file_flags, FLAGS_ZG); + if (flags->rflag) + file_flags = flag_on(file_flags, FLAGS_WS); + + shuff_scanfreq_chunk(shuff, &file_flags, 1); total = 0; while (!feof(fp)) { i = 0; - while ((!feof(fp)) && (i < pagesize)) { - data[i++] = fgetc(fp); - total++; - } + i = bs_readblock(fp, data, pagesize, flags->rflag); + total += i; - /* Saco un EOF que lee de mas */ - if (i