X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/37100ced5f987acf14c097fe4c31e197d30f4eb5..816b508c140a36259ad9864d1b655b8336e9ac30:/src/jacu.c?ds=sidebyside

diff --git a/src/jacu.c b/src/jacu.c
index 68f929d..3d18ed3 100644
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -2,6 +2,7 @@
 #include "statichuff/statichuff.h"
 #include "blocksorting/bs.h"
 #include "mtf/mtf.h"
+#include "vfile/vfile.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -11,67 +12,90 @@ int main(int argc, char* argv[])
 	int cflag = 0;
 	int dflag = 0;
 	int tflag = 0;
+	int pflag = 0;
 	long int volumesize = 0;
+	size_t pagesize = 32768; /* 32KB */
 	int ch;
 	t_BlockSort *bs;
 			
-	while ((ch = getopt(argc, argv, "cdt:")) != -1) { 
+	while ((ch = getopt(argc, argv, "cdt:p:")) != -1) { 
 		 
 		switch (ch) { 
 			case 'c': cflag = 1; 
 					  break;
-			
+
 			case 'd': dflag = 1; 
 					  break; 
-			
+
 			case 't': tflag = 1; 
-					  volumesize = atoi(optarg);					  
+					  volumesize = atol(optarg);
 					  break; 
-			
-			default: fprintf(stderr, "Usage: %s [-cdt] sourcefile targetfile\n", argv[0]); 
+
+			case 'p': pflag = 1; 
+					  pagesize = atoi(optarg);
+					  break; 
+
+			default: fprintf(stderr, "Usage: %s [-cdpt] sourcefile targetfile\n", argv[0]); 
 					 return(2);
 		}
 	}
 		
 	if ( (argc == 1) || (cflag & dflag) || !(cflag | dflag) || ((argc - optind) < 2) ) {
 		fprintf(stderr, "Usage: %s [-cdt] sourcefile targetfile\n", argv[0]); 
-		if ((tflag == 1) && (volumesize <= 0)) fprintf(stderr,"Error: The volume size must be a non-zero value\n");
-		return (2);		
+		return (3);
+	}
+	if ((tflag) && (volumesize <= 0l)) {
+		fprintf(stderr,"Error: The volume size must be a non-zero value\n");
+		return (4);
+	}
+	if ((pflag) && (pagesize <= 1u)) {
+		fprintf(stderr,"Error: El tamaño de página debe ser mayor a 1 byte.\n");
+		return (5);
 	}
 		
 	if (cflag == 1) {
 		/* Comprimo */
 		/* No me gusta el tmpfile ... es para probar como anda todo junto */
 		FILE *fp, *fp_out;
-		unsigned long int len, i, j, total, k;
-		int *mtf;
+		unsigned long int i, j, total, k;
+		char *mtf;
 		char *salida, *data, c;
-		len = 4096;
-		data = malloc(sizeof(char)*len);
-		salida = malloc(sizeof(char)*(len));
-		bs = bs_create(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);
+		bs = bs_create(pagesize);
+
 		fp = fopen(argv[optind], "rb");
 		fp_out = fopen("tmp.comp", "wb");
+
 		c = fgetc(fp);
 		total = 0;
 		while (!feof(fp)) {
 			i = 0;
-			while ((!feof(fp)) && (i < len)) {
+			while ((!feof(fp)) && (i < pagesize)) {
 				data[i++] = c;
 				c = fgetc(fp);
 				total++;
 			}
+
 			/* Hago el BS */
 			bs_solve(data, salida, bs, &k, i);
-			/* Le aplico el MTF */
-			mtf = jacu_mtf(salida, 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));
 			for(j=0; j<i; j++)
 				fputc(mtf[j], fp_out);
+			free(mtf);
 		}
+
+		/* Limpiando */
 		fclose(fp);
 		fclose(fp_out);
 		bs_destroy(bs);
+
+		/* Comprimo con huffman */
 		i = shuff_encode_file("tmp.comp",argv[optind+1], volumesize);
+
 		/* borro el temporal */
 		unlink("tmp.comp");
 		return i;
@@ -79,8 +103,39 @@ int main(int argc, char* argv[])
 	
 	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;
 }