X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/87673889dd7bc0a18e9cefd5cae898ef0e864ba8..ccf1b7bc66344171e458324c6b702caa18c934ca:/src/jacu.c

diff --git a/src/jacu.c b/src/jacu.c
index fc4188f..e1d6eea 100644
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -8,6 +8,8 @@
 #include <stdio.h>
 #include <unistd.h>
 
+long get_file_size(const char* filename);
+
 int main(int argc, char* argv[])
 {	
 	int cflag = 0;
@@ -62,12 +64,15 @@ int main(int argc, char* argv[])
 		/* Comprimo */
 		/* No me gusta el tmpfile ... es para probar como anda todo junto */
 		FILE *fp, *fp_out;
-		unsigned long int i, j, total, k;
+		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(unsigned long int)*2);
+		salida = malloc(sizeof(char)*(pagesize)+sizeof(Uint32)*2);
 		bs = bs_create(pagesize);
 
 		fp = fopen(argv[optind], "rb");
@@ -87,21 +92,28 @@ 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(unsigned long int), i+sizeof(unsigned long int));
+			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);
@@ -117,6 +129,9 @@ int main(int argc, char* argv[])
 
 		/* borro el temporal */
 		unlink("tmp.comp");
+
+		/* Muestro bpb */
+		printf("Comprimido a %.04f bpb.\n", get_file_size(argv[optind+1])*8.0/get_file_size(argv[optind]));
 		return i;
 	}
 	
@@ -124,9 +139,9 @@ int main(int argc, char* argv[])
 		/* Descomprimo */
 		FILE *fp_out;
 		VFILE *fp_in;
-		unsigned long int block_size, k;
+		Uint32 block_size, k;
 		char *block, *mtf, *orig;
-		int *pos;
+		char *z;
 
 		shuff_decode_file(argv[optind], "tmp.comp"); /*argv[optind+1]);*/
 		fp_in = vfopen("tmp.comp", "r", 0);
@@ -134,17 +149,17 @@ int main(int argc, char* argv[])
 
 		while (!vfeof(fp_in)) {
 			block_size = 0;
-			vfread(&block_size, sizeof(unsigned long int), 1, fp_in);
+			vfread(&block_size, sizeof(Uint32), 1, fp_in);
 			if (block_size > 0) {
-				block = malloc((block_size+sizeof(unsigned long int))*sizeof(char));
+				block = malloc((block_size+sizeof(Uint32))*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);
+				mtf = jacu_mtf_inv(z, block, block_size);
 
-				memcpy(&k, block, sizeof(unsigned long int));
+				memcpy(&k, block, sizeof(Uint32));
 
-				bs_restore(orig, block+sizeof(unsigned long int), k, block_size);
+				bs_restore(orig, block+sizeof(Uint32), k, block_size);
 
 				fwrite(orig, block_size, sizeof(char), fp_out);
 				free(block);
@@ -158,3 +173,15 @@ int main(int argc, char* argv[])
 
 	return 0;
 }
+
+long get_file_size(const char* filename)
+{
+	FILE* file;
+	long  file_size;
+
+	if (!(file = fopen(filename, "ab"))) return -1;
+	file_size = ftell(file);
+	fclose(file);
+	return file_size;
+}
+