Ajusto compilacion

diff --git a/src/Makefile b/src/Makefile
index 8a2578bb0e2e333300767dd122caa3fccb709fb5..24cf5555d273878c5894860099bb85c04d7b212d 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -25,7 +25,7 @@
 #
 
 TARGETS=jacu
-COMMON=mtf/mtf.o blocksorting/bs.o statichuff/statichuff.o
+COMMON=mtf/mtf.o blocksorting/bs.o statichuff/statichuff.o vfile/vfile.o vfile/common.c
 SRCS=jacu.c
 
 #CFLAGS=-O3 -Wall -DNDEBUG

diff --git a/src/blocksorting/main.c b/src/blocksorting/main.c
index 2c8abb925789144bff1ad2536bd11a5bd89aa016..704c570653a3a3a15482f28d98c51cecf3732746 100644 (file)
--- a/src/blocksorting/main.c
+++ b/src/blocksorting/main.c
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
                        bs_restore(orig, salida, k, i);
                        printf("Orig : %s\n", orig);
                } else
-                       printf("%s", salida);
+                       printf("(%s)\n", salida);
        }
        fclose(fp);
        bs_destroy(bs);

diff --git a/src/jacu.c b/src/jacu.c
index 45b314cd12595c370bbce74f558143f6855d4b1c..68f929d3846f21c2e2ebed8ab2ca874624e93e5d 100644 (file)
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -71,7 +71,7 @@ int main(int argc, char* argv[])
                fclose(fp);
                fclose(fp_out);
                bs_destroy(bs);
-               i = shuff_encode_file("tmp.comp",argv[optind+1]);
+               i = shuff_encode_file("tmp.comp",argv[optind+1], volumesize);
                /* borro el temporal */
                unlink("tmp.comp");
                return i;

diff --git a/src/statichuff/Makefile b/src/statichuff/Makefile
index 416844409b4a86b7194a6023a15e21545b40d019..bce1cf796e1865c0edb9f14b11a5862f589edc0a 100644 (file)
--- a/src/statichuff/Makefile
+++ b/src/statichuff/Makefile
@@ -25,7 +25,7 @@
 #
 
 TARGETS=shuff
-COMMON=statichuff.o
+COMMON=statichuff.o ../vfile/vfile.o
 SRCS=shuff.c statichuff.c
 
 #CFLAGS=-O3 -Wall -DNDEBUG
@@ -33,7 +33,7 @@ CFLAGS=-ggdb -Wall -DDEBUG
 
 all: $(TARGETS)
 
-shuff: $(COMMON) shuff.o
+shuff: $(COMMON) main.o
 
 depend:
        makedepend -- $(CFLAGS) -- $(SRCS)
@@ -45,25 +45,13 @@ clean:
 
 # DO NOT DELETE
 
-shuff.o: statichuff.h /usr/include/stdio.h /usr/include/features.h
-shuff.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-shuff.o: /usr/lib/gcc-lib/i486-linux/3.3.4/include/stddef.h
-shuff.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-shuff.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-shuff.o: /usr/include/_G_config.h /usr/include/wchar.h
-shuff.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-shuff.o: /usr/lib/gcc-lib/i486-linux/3.3.4/include/stdarg.h
-shuff.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-shuff.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-shuff.o: /usr/include/bits/confname.h /usr/include/malloc.h
 statichuff.o: statichuff.h /usr/include/stdio.h /usr/include/features.h
 statichuff.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-statichuff.o: /usr/lib/gcc-lib/i486-linux/3.3.4/include/stddef.h
 statichuff.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
 statichuff.o: /usr/include/bits/typesizes.h /usr/include/libio.h
 statichuff.o: /usr/include/_G_config.h /usr/include/wchar.h
 statichuff.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-statichuff.o: /usr/lib/gcc-lib/i486-linux/3.3.4/include/stdarg.h
 statichuff.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
 statichuff.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-statichuff.o: /usr/include/bits/confname.h /usr/include/stdlib.h
+statichuff.o: /usr/include/bits/confname.h ../vfile/vfile.h
+statichuff.o: /usr/include/stdlib.h