* Modifico el main para que acepte el modo Luca y el modo Gazer :-)

[z.facultad/75.06/jacu.git] / otros / blocksorting / main.c

diff --git a/otros/blocksorting/main.c b/otros/blocksorting/main.c
index 5f36f541a9f1aacd84d38d13df06a7616e0d4888..70280179c3566d737aa10619d90cc66c48f5a830 100644 (file)
--- a/otros/blocksorting/main.c
+++ b/otros/blocksorting/main.c
@@ -5,18 +5,21 @@ int main(int argc, char *argv[])
 {
        char *data; 
        char *salida;
-       unsigned long int len, i, k;
+       unsigned long int len, i, k, total;
        FILE *fp;
        char c;
        t_BlockSort *bs;
        
-/*     if (argc != 3) {
-               printf("Modo de uso : %s <archivo datos> <tamaño pagina>\n", argv[0]);
-               return 0;
+       if (argc == 3) {
+               fp = fopen(argv[1], "r");
+               len = atoi(argv[2]);
+       } else if (argc == 2) {
+               fp = stdin; /*fopen(argv[1], "r");*/
+               len = atoi(argv[1]);
+       } else {
+               printf("no, no\n");
+               return 1;
        }
-*/
-       fp = stdin; /*fopen(argv[1], "r");*/
-       len = atoi(argv[1]);
 
        data = malloc(sizeof(char)*len);
        salida = malloc(sizeof(char)*(len+1));
@@ -24,21 +27,27 @@ int main(int argc, char *argv[])
        salida[len] = '\0';
        bs = bs_create(len);
 
-       while ((c = fgetc(fp)) != EOF) {
+       c = fgetc(fp);
+       total = 0;
+       while (!feof(fp)) {
                i = 0;
-               while ((c!=EOF) && (i < len)) {
+               while ((!feof(fp)) && (i < len)) {
                        data[i++] = c;
                        c = fgetc(fp);
+                       total++;
                }
                bs_solve(data, salida, bs, &k, i);
 
                /* XXX ACA SALIDA DEBERIA PASAR A LA SIGUIENTE ETAPA XXX */
-               /*printf("%s -> %ld\n", salida, k);*/
-               printf("%s", salida);
+               if (argc == 3) 
+                       printf("%s -> %ld\n", salida, k);
+               else
+                       printf("%s", salida);
        }
        fclose(fp);
        bs_destroy(bs);
 
+       printf("Total bytes : %ld\n", total);
        free(data);
        free(salida);
        return 0;