X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/3b6ca5c121131942b4a57d4d4c5c594bf8045c95..6d6d7068e6cde94ff373ccfd25f1f9533fc75e70:/src/jacu.c?ds=sidebyside

diff --git a/src/jacu.c b/src/jacu.c
index e870c99..ee98a05 100644
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -67,6 +67,9 @@ int main(int argc, char* argv[])
 		Uint32 i, j, total, k;
 		char *mtf;
 		char *salida, *data, c;
+		char *z;
+		int z_len;
+
 		data = malloc(sizeof(char)*pagesize);
 		/* Reservo lugar tambien para guardar el k y el tamaño  */
 		salida = malloc(sizeof(char)*(pagesize)+sizeof(Uint32)*2);
@@ -89,24 +92,32 @@ int main(int argc, char* argv[])
 			bs_solve(data, salida, bs, &k, i);
 
 			/* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
-			mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32));
+			mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32), &z, &z_len);
 
 			/* Si me lo piden, aplico ZG. */
-			if (zflag)
-			{
+			if (zflag) {
 				size_t len;
 				char buff[2];
 				ZG zg;
 				zg_init(&zg);
+				/* TODO HACER LO MISMO QUE EN EL ELSE XXX */
 				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++)
+			} else {
+				/* Guardo el PageSize */
+				for(j=0; j<sizeof(Uint32); j++)
+					fputc(mtf[j], fp_out);
+
+				/* Guardo el Z len y el Z */
+				fwrite(&z_len, sizeof(int), 1, fp_out);
+				fwrite(z, z_len, sizeof(char), fp_out);
+
+				/* Guardo la salida del MTF */
+				for(j=sizeof(Uint32); j<i; j++)
 					fputc(mtf[j], fp_out);
 			}
 			free(mtf);
+			free(z);
 		}
 
 		/* Limpiando */
@@ -128,22 +139,27 @@ int main(int argc, char* argv[])
 	if (dflag == 1) { 
 		/* Descomprimo */
 		FILE *fp_out;
-		VFILE *fp_in;
+		FILE *fp_in;
 		Uint32 block_size, k;
 		char *block, *mtf, *orig;
 		char *z;
+		int z_len;
 
 		shuff_decode_file(argv[optind], "tmp.comp"); /*argv[optind+1]);*/
-		fp_in = vfopen("tmp.comp", "r", 0);
+		fp_in = fopen("tmp.comp", "rb");
 		fp_out = fopen(argv[optind+1], "wb");
 
-		while (!vfeof(fp_in)) {
+		while (!feof(fp_in)) {
 			block_size = 0;
-			vfread(&block_size, sizeof(Uint32), 1, fp_in);
+			fread(&block_size, sizeof(Uint32), 1, fp_in);
+			fread(&z_len, sizeof(int), 1, fp_in);
+			z = malloc(sizeof(char)*z_len);
+			fread(z, z_len, sizeof(char), fp_in);
+
 			if (block_size > 0) {
-				block = malloc((block_size+sizeof(Uint32))*sizeof(char));
+				block = malloc(block_size*sizeof(char)+sizeof(Uint32));
 				orig = malloc(block_size*sizeof(char));
-				vfread(block, block_size, sizeof(char), fp_in);
+				fread(block, block_size, sizeof(char), fp_in);
 
 				mtf = jacu_mtf_inv(z, block, block_size);
 
@@ -157,7 +173,7 @@ int main(int argc, char* argv[])
 				free(mtf);
 			}
 		}
-		vfclose(fp_in);
+		fclose(fp_in);
 		fclose(fp_out);
 	}