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

 actualmente y 6 RESERVED

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index 1b7c0e30d8e62c03530df04147aa95d5fbc54f0b..a71e2619fea21c11416414108adb595861227d98 100644 (file)
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -313,6 +313,11 @@ int bs_readblock(FILE *fp, char *data, Uint32 pagesize, int usar_dic)
        while ((!feof(fp)) && ((i+buffer_pos) < pagesize)) {
                c = fgetc(fp);
                
        while ((!feof(fp)) && ((i+buffer_pos) < pagesize)) {
                c = fgetc(fp);
                

+               if (usar_dic != 1) {
+                       data[i++] = c;
+                       continue;
+               }
+

                if (c == ESCAPE_CHARACTER) {
                        data[i++] = c;
                        data[i++] = 0xF;
                if (c == ESCAPE_CHARACTER) {
                        data[i++] = c;
                        data[i++] = 0xF;


@@ -322,11 +327,6 @@ int bs_readblock(FILE *fp, char *data, Uint32 pagesize, int usar_dic)
 
                hint = check_hint(c);
 
 
                hint = check_hint(c);
 

-               if (usar_dic != 1) {
-                       data[i++] = c;
-                       continue;
-               }
-

                switch (hint) {
                        case -1:
                                /* No hay hints, vacio el buffer y luego saco el c */
                switch (hint) {
                        case -1:
                                /* No hay hints, vacio el buffer y luego saco el c */


@@ -382,14 +382,11 @@ char *bs_finalblock(char *data, Uint32 len, Uint32 *new_size)
                        } else {
                                /* Va una palabra!! */
                                tmp = data[i];
                        } else {
                                /* Va una palabra!! */
                                tmp = data[i];

-                               printf("%d\n", data[i]);

                                size += dic[(size_t)tmp].len;
                                out = (char *)realloc(out, size*sizeof(char));
                                for(j=0; j<dic[(size_t)tmp].len; j++) {
                                size += dic[(size_t)tmp].len;
                                out = (char *)realloc(out, size*sizeof(char));
                                for(j=0; j<dic[(size_t)tmp].len; j++) {

-                                       printf("%c", dic[(size_t)tmp].word[j]);

                                        out[size-dic[(size_t)tmp].len+j] = dic[(size_t)tmp].word[j];
                                }
                                        out[size-dic[(size_t)tmp].len+j] = dic[(size_t)tmp].word[j];
                                }

-                               printf("\n");

                                /* Salteo el caracter siguiente al de escape */
                        }
                } else {
                                /* Salteo el caracter siguiente al de escape */
                        }
                } else {

diff --git a/src/jacu.c b/src/jacu.c
index 8f9beb0fb2f9230153d0bca58abbba76aadb646b..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;


@@ -24,7 +34,22 @@ typedef struct _flags_ {
 } t_Flags;
 
 int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags *flags, char *staticmodel);
 } 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 *flags);
+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[])
 {      
 
 int main(int argc, char* argv[])
 {      


@@ -111,7 +136,7 @@ int main(int argc, char* argv[])
        }
        
        if (flags.dflag == 1) { 
        }
        
        if (flags.dflag == 1) { 

-               return descomprimir(argv[optind], argv[optind+1], &flags);
+               return descomprimir(argv[optind], argv[optind+1]);

        }
 
        return 0;
        }
 
        return 0;


@@ -138,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 */


@@ -157,9 +183,11 @@ 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)) {
 
        total = 0;
        while (!feof(fp)) {


@@ -219,7 +247,7 @@ int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags
        return 0;
 }
 
        return 0;
 }
 

-int descomprimir(char *src, char *dst, t_Flags *flags)
+int descomprimir(char *src, char *dst)

 {
        /* Descomprimo */
        FILE *fp_out;
 {
        /* Descomprimo */
        FILE *fp_out;


@@ -227,7 +255,7 @@ int descomprimir(char *src, char *dst, t_Flags *flags)
        unsigned char *block, *mtf, *orig;
        unsigned char *z;
        Uint32 z_len=0,moredata = 0,decoded = 0;
        unsigned char *block, *mtf, *orig;
        unsigned char *z;
        Uint32 z_len=0,moredata = 0,decoded = 0;

-       unsigned char use_zg = 0,retbytes = 0;
+       unsigned char file_flags = 0,retbytes = 0;

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


@@ -240,7 +268,7 @@ int descomprimir(char *src, char *dst, t_Flags *flags)
        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));


@@ -255,7 +283,7 @@ int descomprimir(char *src, char *dst, t_Flags *flags)
                        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;


@@ -298,9 +326,10 @@ int descomprimir(char *src, char *dst, t_Flags *flags)
                        /* 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));
 

-                       /* XXX AHORA METO EL FLAG EN EL ARCHIVO; DON'T WORRRRRYYYYYYY XXX */
-                       if (flags->rflag == 1)
-                               orig = bs_finalblock(orig, decoded-sizeof(Uint32), &decoded);
+                       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);
 
                        fwrite(orig, decoded, sizeof(unsigned char), fp_out);
                        free(mtf);