X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/20b0b8b6db70b1a0c9b4c211f43e91562af6c54c..d53cc94464bba53e0be1297ca0cc746901ec113b:/src/jacu.c?ds=inline

diff --git a/src/jacu.c b/src/jacu.c
index 75ca87c..8f9beb0 100644
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -20,10 +20,11 @@ typedef struct _flags_ {
 	int qflag;
 	int sflag;
 	int mflag;
+	int rflag; /* Richard Dictionary :-) */
 } 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[])
 {	
@@ -35,7 +36,7 @@ int main(int argc, char* argv[])
 			
 	memset(&flags, 0, sizeof(t_Flags));
 
-	while ((ch = getopt(argc, argv, "scdzm:t:q:")) != -1) { 
+	while ((ch = getopt(argc, argv, "rscdzm:t:q:")) != -1) { 
 		 
 		switch (ch) { 
 			case 'c': flags.cflag = 1; 
@@ -58,6 +59,8 @@ int main(int argc, char* argv[])
 				volumesize = atol(optarg);
 				break; 
 
+			case 'r': flags.rflag = 1;
+				break;
 			case 'q': flags.qflag = 1; 
 				switch (atoi(optarg))
 				{
@@ -85,13 +88,13 @@ int main(int argc, char* argv[])
 				}
 				break; 
 
-			default: fprintf(stderr, "Usage: %s [-cdzs][-q blksize][-t volsize][-m modeldumpfile] source target\n", argv[0]); 
+			default: fprintf(stderr, "Usage: %s [-cdzsr][-q blksize][-t volsize][-m modeldumpfile] source target\n", argv[0]); 
 					 return(2);
 		}
 	}
 		
 	if ( (argc == 1) || (flags.cflag & flags.dflag) || !(flags.cflag | flags.dflag) || ((argc - optind) < 2) || (flags.mflag & flags.sflag)) {
-		fprintf(stderr, "Usage: %s [-cdzs][-q compressionquality][-t volsize][-m modeldumpfile] source target\n", argv[0]); 
+		fprintf(stderr, "Usage: %s [-cdzsr][-q compressionquality][-t volsize][-m modeldumpfile] source target\n", argv[0]); 
 		return (3);
 	}
 	if ((flags.tflag) && (volumesize <= 0l)) {
@@ -108,7 +111,7 @@ int main(int argc, char* argv[])
 	}
 	
 	if (flags.dflag == 1) { 
-		return descomprimir(argv[optind], argv[optind+1]);
+		return descomprimir(argv[optind], argv[optind+1], &flags);
 	}
 
 	return 0;
@@ -161,7 +164,7 @@ int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags
 	total = 0;
 	while (!feof(fp)) {
 		i = 0;
-		i = bs_readblock(fp, data, pagesize);
+		i = bs_readblock(fp, data, pagesize, flags->rflag);
 		total += i;
 
 
@@ -216,14 +219,14 @@ int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags
 	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;
-	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;
 
@@ -295,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));
 
-			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);
 		}