Test de Calgary sobre JACU vs GZIP vs BZIP2 done, me falta el pic en mi maquina que...

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

diff --git a/src/jacu.c b/src/jacu.c
index 1648e82eb0b6599a62c98fcf1e861af59f6ef9ed..8f9beb0fb2f9230153d0bca58abbba76aadb646b 100644 (file)
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -24,7 +24,7 @@ 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);
+int descomprimir(char *src, char *dst, t_Flags *flags);

 
 int main(int argc, char* argv[])
 {      
 
 int main(int argc, char* argv[])
 {      


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

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

        }
 
        return 0;
        }
 
        return 0;


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

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

 {
        /* Descomprimo */
        FILE *fp_out;
        Uint32 block_size = 0, k;
        unsigned char *block, *mtf, *orig;
        unsigned char *z;
 {
        /* Descomprimo */
        FILE *fp_out;
        Uint32 block_size = 0, k;
        unsigned char *block, *mtf, *orig;
        unsigned char *z;

-       int z_len=0,moredata = 0,decoded = 0;
+       Uint32 z_len=0,moredata = 0,decoded = 0;

        unsigned char use_zg = 0,retbytes = 0;
        HUFF_STATE *shuff;
 
        unsigned char use_zg = 0,retbytes = 0;
        HUFF_STATE *shuff;
 


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

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