Bugfix. Habían muchos int* que debían ser char*, por favor fijense si estoy errado...

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

diff --git a/src/jacu.c b/src/jacu.c
index 8e748122f4e123061de97246fabb8d3aa1a18b23..fc4188f0f0b2916c7ab52734c0a35bc7bd4709cf 100644 (file)
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -1,7 +1,8 @@
 
 

-#include "statichuff/statichuff.h"

 #include "blocksorting/bs.h"
 #include "mtf/mtf.h"
 #include "blocksorting/bs.h"
 #include "mtf/mtf.h"

+#include "zerogrouping/zerogrouping.h"
+#include "statichuff/statichuff.h"

 #include "vfile/vfile.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include "vfile/vfile.h"
 #include <stdlib.h>
 #include <stdio.h>


@@ -11,6 +12,7 @@ int main(int argc, char* argv[])
 {      
        int cflag = 0;
        int dflag = 0;
 {      
        int cflag = 0;
        int dflag = 0;

+       int zflag = 0;

        int tflag = 0;
        int pflag = 0;
        long int volumesize = 0;
        int tflag = 0;
        int pflag = 0;
        long int volumesize = 0;


@@ -18,7 +20,7 @@ int main(int argc, char* argv[])
        int ch;
        t_BlockSort *bs;
                        
        int ch;
        t_BlockSort *bs;
                        

-       while ((ch = getopt(argc, argv, "cdt:p:")) != -1) { 
+       while ((ch = getopt(argc, argv, "cdzt:p:")) != -1) { 

                 
                switch (ch) { 
                        case 'c': cflag = 1; 
                 
                switch (ch) { 
                        case 'c': cflag = 1; 


@@ -27,6 +29,9 @@ int main(int argc, char* argv[])
                        case 'd': dflag = 1; 
                                          break; 
 
                        case 'd': dflag = 1; 
                                          break; 
 

+                       case 'z': zflag = 1; 
+                                         break; 
+

                        case 't': tflag = 1; 
                                          volumesize = atol(optarg);
                                          break; 
                        case 't': tflag = 1; 
                                          volumesize = atol(optarg);
                                          break; 


@@ -58,14 +63,16 @@ int main(int argc, char* argv[])
                /* No me gusta el tmpfile ... es para probar como anda todo junto */
                FILE *fp, *fp_out;
                unsigned long int i, j, total, k;
                /* No me gusta el tmpfile ... es para probar como anda todo junto */
                FILE *fp, *fp_out;
                unsigned long int i, j, total, k;

-               int *mtf;
+               char *mtf;

                char *salida, *data, c;
                data = malloc(sizeof(char)*pagesize);
                char *salida, *data, c;
                data = malloc(sizeof(char)*pagesize);

-               /* Reservo lugar tambien para guardar el k */
+               /* Reservo lugar tambien para guardar el k y el tamaño  */

                salida = malloc(sizeof(char)*(pagesize)+sizeof(unsigned long int)*2);
                bs = bs_create(pagesize);
                salida = malloc(sizeof(char)*(pagesize)+sizeof(unsigned long int)*2);
                bs = bs_create(pagesize);

+

                fp = fopen(argv[optind], "rb");
                fp_out = fopen("tmp.comp", "wb");
                fp = fopen(argv[optind], "rb");
                fp_out = fopen("tmp.comp", "wb");

+

                c = fgetc(fp);
                total = 0;
                while (!feof(fp)) {
                c = fgetc(fp);
                total = 0;
                while (!feof(fp)) {


@@ -75,17 +82,39 @@ int main(int argc, char* argv[])
                                c = fgetc(fp);
                                total++;
                        }
                                c = fgetc(fp);
                                total++;
                        }

+

                        /* Hago el BS */
                        bs_solve(data, salida, bs, &k, i);
                        /* Hago el BS */
                        bs_solve(data, salida, bs, &k, i);

-                       /* Le aplico el MTF */
-                       mtf = jacu_mtf(salida, i+sizeof(unsigned long int)*2);
-                       for(j=0; j<i; j++)
-                               fputc(mtf[j], fp_out);
+
+                       /* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
+                       mtf = jacu_mtf(salida+sizeof(unsigned long int), i+sizeof(unsigned long int));
+
+                       /* Si me lo piden, aplico ZG. */
+                       if (zflag)
+                       {
+                               size_t len;
+                               char buff[2];
+                               ZG zg;
+                               zg_init(&zg);
+                               for (j = 0; j < i; ++j)
+                                       if ((len = zg_group(&zg, buff, mtf[j]))) fwrite(buff, 1, len, fp_out);
+                       }
+                       else
+                       {
+                               for(j=0; j<i; j++)
+                                       fputc(mtf[j], fp_out);
+                       }
+                       free(mtf);

                }
                }

+
+               /* Limpiando */

                fclose(fp);
                fclose(fp_out);
                bs_destroy(bs);
                fclose(fp);
                fclose(fp_out);
                bs_destroy(bs);

+
+               /* Comprimo con huffman */

                i = shuff_encode_file("tmp.comp",argv[optind+1], volumesize);
                i = shuff_encode_file("tmp.comp",argv[optind+1], volumesize);

+

                /* borro el temporal */
                unlink("tmp.comp");
                return i;
                /* borro el temporal */
                unlink("tmp.comp");
                return i;


@@ -93,8 +122,39 @@ int main(int argc, char* argv[])
        
        if (dflag == 1) { 
                /* Descomprimo */
        
        if (dflag == 1) { 
                /* Descomprimo */

-               return shuff_decode_file(argv[optind],argv[optind+1]);
+               FILE *fp_out;
+               VFILE *fp_in;
+               unsigned long int block_size, k;
+               char *block, *mtf, *orig;
+               int *pos;
+
+               shuff_decode_file(argv[optind], "tmp.comp"); /*argv[optind+1]);*/
+               fp_in = vfopen("tmp.comp", "r", 0);
+               fp_out = fopen(argv[optind+1], "wb");
+
+               while (!vfeof(fp_in)) {
+                       block_size = 0;
+                       vfread(&block_size, sizeof(unsigned long int), 1, fp_in);
+                       if (block_size > 0) {
+                               block = malloc((block_size+sizeof(unsigned long int))*sizeof(char));
+                               orig = malloc(block_size*sizeof(char));
+                               vfread(block, block_size, sizeof(char), fp_in);
+
+                               mtf = jacu_mtf_inv(block, /*XXX NO LO TENGO XXX */pos, block_size);
+
+                               memcpy(&k, block, sizeof(unsigned long int));
+
+                               bs_restore(orig, block+sizeof(unsigned long int), k, block_size);
+
+                               fwrite(orig, block_size, sizeof(char), fp_out);
+                               free(block);
+                               free(orig);
+                               free(mtf);
+                       }
+               }
+               vfclose(fp_in);
+               fclose(fp_out);

        }
        }

-               
+

        return 0;
 }
        return 0;
 }