1 files changed, 81 insertions, 37 deletions
diff --git a/programs/Makefile b/programs/Makefile
index 543eb7c..6aade89 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -19,8 +19,8 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # You can contact the author at :
-#  - LZ4 source repository : http://code.google.com/p/lz4/
-#  - LZ4 forum froup : https://groups.google.com/forum/#!forum/lz4c
+#  - LZ4 source repository : https://github.com/Cyan4973/lz4
+#  - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
 # ##########################################################################
 # lz4 : Command Line Utility, supporting gzip-like arguments
 # lz4c  : CLU, supporting also legacy lz4demo arguments
@@ -31,10 +31,10 @@
 # fullbench32: Same as fullbench, but forced to compile in 32-bits mode
 # ##########################################################################
 
-RELEASE?= r126
+RELEASE?= r128
 
 DESTDIR?=
-PREFIX ?= /usr
+PREFIX ?= /usr/local
 CFLAGS ?= -O3
 CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -pedantic -DLZ4_VERSION=\"$(RELEASE)\"
 FLAGS   = -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
@@ -92,10 +92,9 @@ frametest: $(LZ4DIR)/lz4frame.c $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxha
 frametest32: $(LZ4DIR)/lz4frame.c $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c frametest.c
 	$(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
 
-datagen : datagen.c
+datagen : datagen.c datagencli.c
 	$(CC)      $(FLAGS) $^ -o $@$(EXT)
 
-
 clean:
 	@rm -f core *.o *.test \
         lz4$(EXT) lz4c$(EXT) lz4c32$(EXT) \
@@ -113,22 +112,26 @@ ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
 install: lz4 lz4c
 	@echo Installing binaries
 	@install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
-	@install -m 755 lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4$(EXT)
-	@ln -sf lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4cat
-	@install -m 755 lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c$(EXT)
+	@install -m 755 lz4 $(DESTDIR)$(BINDIR)/lz4
+	@ln -sf lz4 $(DESTDIR)$(BINDIR)/lz4cat
+	@ln -sf lz4 $(DESTDIR)$(BINDIR)/unlz4
+	@install -m 755 lz4c $(DESTDIR)$(BINDIR)/lz4c
 	@echo Installing man pages
 	@install -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
-	@install -m 644 lz4c.1 $(DESTDIR)$(MANDIR)/lz4c.1
-	@install -m 644 lz4cat.1 $(DESTDIR)$(MANDIR)/lz4cat.1
+	@ln -sf lz4.1 $(DESTDIR)$(MANDIR)/lz4c.1
+	@ln -sf lz4.1 $(DESTDIR)$(MANDIR)/lz4cat.1
+	@ln -sf lz4.1 $(DESTDIR)$(MANDIR)/unlz4.1
 	@echo lz4 installation completed
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/lz4cat
-	[ -x $(DESTDIR)$(BINDIR)/lz4$(EXT) ] && rm -f $(DESTDIR)$(BINDIR)/lz4$(EXT)
-	[ -x $(DESTDIR)$(BINDIR)/lz4c$(EXT) ] && rm -f $(DESTDIR)$(BINDIR)/lz4c$(EXT)
+	rm -f $(DESTDIR)$(BINDIR)/unlz4
+	[ -x $(DESTDIR)$(BINDIR)/lz4 ] && rm -f $(DESTDIR)$(BINDIR)/lz4
+	[ -x $(DESTDIR)$(BINDIR)/lz4c ] && rm -f $(DESTDIR)$(BINDIR)/lz4c
 	[ -f $(DESTDIR)$(MANDIR)/lz4.1 ] && rm -f $(DESTDIR)$(MANDIR)/lz4.1
-	[ -f $(DESTDIR)$(MANDIR)/lz4c.1 ] && rm -f $(DESTDIR)$(MANDIR)/lz4c.1
-	[ -f $(DESTDIR)$(MANDIR)/lz4cat.1 ] && rm -f $(DESTDIR)$(MANDIR)/lz4cat.1
+	rm -f $(DESTDIR)$(MANDIR)/lz4c.1
+	rm -f $(DESTDIR)$(MANDIR)/lz4cat.1
+	rm -f $(DESTDIR)$(MANDIR)/unlz4.1
 	@echo lz4 programs successfully uninstalled
 
 test: test-lz4 test-lz4c test-frametest test-fullbench test-fuzzer test-mem
@@ -139,13 +142,32 @@ test-all: test test32
 
 test-travis: $(TRAVIS_TARGET)
 
-test-lz4: lz4 datagen
-	./datagen -g16KB  | ./lz4 -9     | ./lz4 -vdq > $(VOID)
-	./datagen         | ./lz4        | ./lz4 -vdq > $(VOID)
-	./datagen -g6M -p100 | ./lz4 -9BD | ./lz4 -vdq > $(VOID)
-	./datagen -g256MB | ./lz4 -vqB4D | ./lz4 -vdq > $(VOID)
-	./datagen -g6GB   | ./lz4 -vqB5D | ./lz4 -vdq > $(VOID)
-# test frame concatenation with null-length frame
+test-lz4-sparse: lz4 datagen
+	@echo ---- test sparse file support ----
+	./datagen -g50M -P100 | ./lz4 -B4D | ./lz4 -dv --sparse-support > tmpB4
+	./datagen -g50M -P100 | ./lz4 -B5D | ./lz4 -dv --sparse-support > tmpB5
+	./datagen -g50M -P100 | ./lz4 -B6D | ./lz4 -dv --sparse-support > tmpB6
+	./datagen -g50M -P100 | ./lz4 -B7D | ./lz4 -dv --sparse-support > tmpB7
+	ls -ls tmp*
+	./datagen -g50M -P100 | diff -s - tmpB4
+	./datagen -g50M -P100 | diff -s - tmpB5
+	./datagen -g50M -P100 | diff -s - tmpB6
+	./datagen -g50M -P100 | diff -s - tmpB7
+	./datagen -s1 -g1200007 -P100 | ./lz4 | ./lz4 -dv --sparse-support > tmpOdd   # Odd size file (to not finish on an exact nb of blocks)
+	./datagen -s1 -g1200007 -P100 | diff -s - tmpOdd
+	ls -ls tmpOdd
+	@rm tmp*
+
+test-lz4-contentSize: lz4 datagen
+	@echo ---- test original size support ----
+	./datagen -g15M > tmp
+	./lz4 -v tmp | ./lz4 -t
+	./lz4 -v --frame-content-size tmp | ./lz4 -d > tmp2
+	diff -s tmp tmp2
+	@rm tmp*
+
+test-lz4-frame-concatenation: lz4 datagen
+	@echo ---- test frame concatenation ----
 	@echo -n > empty.test
 	@echo hi > nonempty.test
 	cat nonempty.test empty.test nonempty.test > orig.test
@@ -156,20 +178,40 @@ test-lz4: lz4 datagen
 	sdiff orig.test result.test
 	@rm *.test
 	@echo frame concatenation test completed
-# test frame concatenation with null-length frame
 
+test-lz4: lz4 datagen test-lz4-sparse test-lz4-contentSize test-lz4-frame-concatenation
+	@echo ---- test lz4 basic compression/decompression ----
+	./datagen -g0     | ./lz4 -v     | ./lz4 -t
+	./datagen -g16KB  | ./lz4 -9     | ./lz4 -t
+	./datagen         | ./lz4        | ./lz4 -t
+	./datagen -g6M -P99 | ./lz4 -9BD | ./lz4 -t
+	./datagen -g17M   | ./lz4 -9v    | ./lz4 -tq
+	./datagen -g33M   | ./lz4 --no-frame-crc | ./lz4 -t
+	./datagen -g256MB | ./lz4 -vqB4D | ./lz4 -t
+	./datagen -g6GB   | ./lz4 -vqB5D | ./lz4 -t
+	./datagen -g6GB   | ./lz4 -vq9BD | ./lz4 -t
+	@echo ---- test multiple input files ----
+	@./datagen -s1 > file1
+	@./datagen -s2 > file2
+	@./datagen -s3 > file3
+	./lz4 -f -m file1 file2 file3
+	ls -l file*
+	@rm file1 file2 file3 file1.lz4 file2.lz4 file3.lz4
+	@echo ---- test pass-through ----
+	./datagen | ./lz4 -tf
 
 test-lz4c: lz4c datagen
-	./datagen -g256MB | ./lz4c -l -v    | ./lz4c   -vdq > $(VOID)
-
-test-lz4c32: lz4 lz4c32 lz4 datagen
-	./datagen -g16KB  | ./lz4c32 -9     | ./lz4c32 -vdq > $(VOID)
-	./datagen -g16KB  | ./lz4c32 -9     | ./lz4    -vdq > $(VOID)
-	./datagen         | ./lz4c32        | ./lz4c32 -vdq > $(VOID)
-	./datagen         | ./lz4c32        | ./lz4    -vdq > $(VOID)
-	./datagen -g256MB | ./lz4c32 -vqB4D | ./lz4c32 -vdq > $(VOID)
-	./datagen -g256MB | ./lz4c32 -vqB4D | ./lz4    -vdq > $(VOID)
-	./datagen -g6GB   | ./lz4c32 -vqB5D | ./lz4c32 -vdq > $(VOID)
+	./datagen -g256MB | ./lz4c -l -v    | ./lz4c   -t
+
+test-lz4c32: lz4 lz4c32 datagen
+	./datagen -g16KB  | ./lz4c32 -9     | ./lz4c32 -t
+	./datagen -g16KB  | ./lz4c32 -9     | ./lz4    -t
+	./datagen         | ./lz4c32        | ./lz4c32 -t
+	./datagen         | ./lz4c32        | ./lz4    -t
+	./datagen -g256MB | ./lz4c32 -vqB4D | ./lz4c32 -t
+	./datagen -g256MB | ./lz4c32 -vqB4D | ./lz4    -t
+	./datagen -g6GB   | ./lz4c32 -vqB5D | ./lz4c32 -t
+	./datagen -g6GB   | ./lz4c32 -vq9BD | ./lz4    -t
 
 test-fullbench: fullbench
 	./fullbench --no-prompt $(TEST_FILES)
@@ -190,13 +232,15 @@ test-frametest32: frametest32
 	./frametest32
 
 test-mem: lz4 datagen fuzzer frametest
+	valgrind --leak-check=yes ./datagen -g50M > $(VOID)
 	./datagen -g16KB > tmp
-	valgrind --leak-check=yes ./lz4 -9 -BD -f tmp /dev/null
+	valgrind --leak-check=yes ./lz4 -9 -BD -f tmp $(VOID)
 	./datagen -g16MB > tmp
-	valgrind --leak-check=yes ./lz4 -9 -B5D -f tmp /dev/null
+	valgrind --leak-check=yes ./lz4 -9 -B5D -f tmp tmp2
 	./datagen -g256MB > tmp
-	valgrind --leak-check=yes ./lz4 -B4D -f -vq tmp /dev/null
-	rm tmp
+	valgrind --leak-check=yes ./lz4 -t tmp2
+	valgrind --leak-check=yes ./lz4 -B4D -f -vq tmp $(VOID)
+	rm tmp*
 	valgrind --leak-check=yes ./fuzzer -i64 -t1
 	valgrind --leak-check=yes ./frametest -i256