Agrego manejo de flags en el header, en total se puden usar hasta 8 flahs. 2 usadas

[z.facultad/75.06/jacu.git] / src / jacu.c

diff --git a/src/jacu.c b/src/jacu.c
index 75ca87ccadfeccf070a53fdaf7b7194be5ed85f3..042a332cae0f1613bd1ec976a730ce4c44443543 100644 (file)
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -12,6 +12,16 @@
 
 long fsize(const char* filename);
 
 
 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;
 typedef struct _flags_ {
        int cflag;
        int dflag;


@@ -20,11 +30,27 @@ typedef struct _flags_ {
        int qflag;
        int sflag;
        int mflag;
        int qflag;
        int sflag;
        int mflag;

+       int rflag; /* Richard Dictionary :-) */

 } t_Flags;
 
 int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags *flags, char *staticmodel);
 int descomprimir(char *src, char *dst);
 
 } t_Flags;
 
 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;
 int main(int argc, char* argv[])
 {      
        long int volumesize = 0;


@@ -35,7 +61,7 @@ int main(int argc, char* argv[])
                        
        memset(&flags, 0, sizeof(t_Flags));
 
                        
        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; 
                 
                switch (ch) { 
                        case 'c': flags.cflag = 1; 


@@ -58,6 +84,8 @@ int main(int argc, char* argv[])
                                volumesize = atol(optarg);
                                break; 
 
                                volumesize = atol(optarg);
                                break; 
 

+                       case 'r': flags.rflag = 1;
+                               break;

                        case 'q': flags.qflag = 1; 
                                switch (atoi(optarg))
                                {
                        case 'q': flags.qflag = 1; 
                                switch (atoi(optarg))
                                {


@@ -85,13 +113,13 @@ int main(int argc, char* argv[])
                                }
                                break; 
 
                                }
                                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)) {
                                         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)) {
                return (3);
        }
        if ((flags.tflag) && (volumesize <= 0l)) {


@@ -135,6 +163,7 @@ int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags
        unsigned char *mtf;
        unsigned char *salida, *data;
        unsigned char *z;
        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 */
        int z_len;
        
        /* Abrimos el archivo a comprimir y encodeamos bloques */


@@ -154,14 +183,16 @@ int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags
 
        /* Guardamos cabecera para indicar si usamos ZG (huffencoded) */
        if (flags->zflag)
 
        /* 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;
 
        total = 0;
        while (!feof(fp)) {
                i = 0;

-               i = bs_readblock(fp, data, pagesize);
+               i = bs_readblock(fp, data, pagesize, flags->rflag);

                total += i;
 
 
                total += i;
 
 


@@ -223,8 +254,8 @@ int descomprimir(char *src, char *dst)
        Uint32 block_size = 0, k;
        unsigned char *block, *mtf, *orig;
        unsigned char *z;
        Uint32 block_size = 0, k;
        unsigned char *block, *mtf, *orig;
        unsigned char *z;

-       int z_len=0,moredata = 0,decoded = 0;
-       unsigned char use_zg = 0,retbytes = 0;
+       Uint32 z_len=0,moredata = 0,decoded = 0;
+       unsigned char file_flags = 0,retbytes = 0;

        HUFF_STATE *shuff;
 
        /* Inicializo el descompresor */
        HUFF_STATE *shuff;
 
        /* Inicializo el descompresor */


@@ -237,7 +268,7 @@ int descomprimir(char *src, char *dst)
        if (!(moredata = shuff_decode_chunk(shuff,(char*)&block_size,sizeof(Uint32),&decoded))) return 1;
 
        /* Descomprimo byte que indica si se usa ZG */
        if (!(moredata = shuff_decode_chunk(shuff,(char*)&block_size,sizeof(Uint32),&decoded))) return 1;
 
        /* Descomprimo byte que indica si se usa ZG */

-       if (!(moredata = shuff_decode_chunk(shuff, &use_zg, 1, &decoded))) return 1;
+       if (!(moredata = shuff_decode_chunk(shuff, &file_flags, 1, &decoded))) return 1;

 
        /* Creo buffers */
        block = malloc(block_size*sizeof(unsigned char)+sizeof(Uint32));
 
        /* Creo buffers */
        block = malloc(block_size*sizeof(unsigned char)+sizeof(Uint32));


@@ -252,7 +283,7 @@ int descomprimir(char *src, char *dst)
                        moredata = shuff_decode_chunk(shuff,z,z_len,&decoded);                          
                        
                        /* Veo si se uso Zero Grouping para comprimir */
                        moredata = shuff_decode_chunk(shuff,z,z_len,&decoded);                          
                        
                        /* Veo si se uso Zero Grouping para comprimir */

-                       if (use_zg) {
+                       if (is_flags_on(file_flags, FLAGS_ZG)) {

                                ZG zg;
                                unsigned char zgbuffer[255];
                                unsigned char zgbyte = 0;
                                ZG zg;
                                unsigned char zgbuffer[255];
                                unsigned char zgbyte = 0;


@@ -295,7 +326,12 @@ int descomprimir(char *src, char *dst)
                        /* Obtengo el chunk original aplicando BS Inverso */
                        bs_restore(orig, mtf+sizeof(Uint32), k, decoded - sizeof(Uint32));
 
                        /* Obtengo el chunk original aplicando BS Inverso */
                        bs_restore(orig, mtf+sizeof(Uint32), k, decoded - sizeof(Uint32));
 

-                       fwrite(orig, decoded - sizeof(Uint32), sizeof(unsigned char), fp_out);
+                       decoded -= sizeof(Uint32);
+                       if (is_flags_on(file_flags, FLAGS_WS)) {
+                               orig = bs_finalblock(orig, decoded, &decoded);
+                       }
+
+                       fwrite(orig, decoded, sizeof(unsigned char), fp_out);

                        free(mtf);
                        free(z);
                }
                        free(mtf);
                        free(z);
                }