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

diff --git a/src/blocksorting/main.c b/src/blocksorting/main.c
index 704c570..91582a9 100644
--- a/src/blocksorting/main.c
+++ b/src/blocksorting/main.c
@@ -15,7 +15,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 +23,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)*2));
 	orig = malloc(sizeof(char)*(len+1));
 
 	salida[len] = '\0';
@@ -40,21 +40,25 @@ int main(int argc, char *argv[])
 			c = fgetc(fp);
 			total++;
 		}
+		/* lleno data mano! */
+		srand(time(NULL));
+		{
+			size_t jj;
+			for(jj=0; jj<i;jj++)
+				data[jj] = rand()%255;
+		}
 		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)*2, k, 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;