X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/37100ced5f987acf14c097fe4c31e197d30f4eb5..7e0696972e32e6cab306020b0fca853810087211:/src/blocksorting/main.c

diff --git a/src/blocksorting/main.c b/src/blocksorting/main.c
index 704c570..56e849b 100644
--- a/src/blocksorting/main.c
+++ b/src/blocksorting/main.c
@@ -1,6 +1,21 @@
 
 #include "bs.h"
 
+void print_v(char *txt, char *data, Uint32 len)
+{
+	Uint32 i;
+
+	printf("%s", txt);
+	
+	for(i=0; i<len; i++) {
+		if (data[i] == '\n')
+			printf("#");
+		else
+			printf("%c", data[i]);
+	}
+	printf("\n");
+}
+
 int main(int argc, char *argv[])
 {
 	char *data; 
@@ -15,7 +30,7 @@ int main(int argc, char *argv[])
 		fp = fopen(argv[1], "r");
 		len = atoi(argv[2]);
 	} else if (argc == 2) {
-		fp = stdin; /*fopen(argv[1], "r");*/
+		fp = stdin;
 		len = atoi(argv[1]);
 	} else {
 		printf("no, no\n");
@@ -23,7 +38,7 @@ int main(int argc, char *argv[])
 	}
 
 	data = malloc(sizeof(char)*len);
-	salida = malloc(sizeof(char)*(len+1));
+	salida = malloc(sizeof(char)*(len+1+sizeof(unsigned long int)));
 	orig = malloc(sizeof(char)*(len+1));
 
 	salida[len] = '\0';
@@ -31,30 +46,28 @@ int main(int argc, char *argv[])
 
 	bs = bs_create(len);
 
-	c = fgetc(fp);
 	total = 0;
 	while (!feof(fp)) {
 		i = 0;
-		while ((!feof(fp)) && (i < len)) {
-			data[i++] = c;
-			c = fgetc(fp);
-			total++;
-		}
+		i = bs_readblock(fp, data, len, 1);
+		
+		total += i;
+		
 		bs_solve(data, salida, bs, &k, i);
 
 		/* XXX ACA SALIDA DEBERIA PASAR A LA SIGUIENTE ETAPA XXX */
 		if (argc == 3) {
-			printf("BS : %s -> %ld\n", salida, k);
-			bs_restore(orig, salida, k, i);
-			printf("Orig : %s\n", orig);
+			bs_restore(orig, salida+sizeof(Uint32), k, i);
+			print_v("Leido     : ", data, i);
+			print_v("BS        : ", salida+sizeof(Uint32), i);
+			/*print_v("Restorado : ", orig, i);*/
 		} else
-			printf("(%s)\n", salida);
+			fwrite(salida, 1, i, stdout);
 	}
 	fclose(fp);
 	bs_destroy(bs);
 
-	printf("Total bytes : %ld\n", total);
-	free(data);
+	/*printf("Total bytes : %ld\n", total);*/
 	free(salida);
 	free(orig);
 	return 0;