Merge branch 'dev' of github.com:Cyan4973/lz4 into dev

6 files changed, 194 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index ac48b65..863c866 100644
--- a/Makefile
+++ b/Makefile
@@ -118,6 +118,8 @@ versionstest: clean
 	@cd test; $(MAKE)
 
 streaming-examples:
+	cd lib; $(MAKE) -e
+	cd programs; $(MAKE) -e lz4
 	cd examples; $(MAKE) -e test
 
 prg-travis:
diff --git a/cmake_unofficial/CMakeLists.txt b/cmake_unofficial/CMakeLists.txt
index 4c3eb65..a986f43 100644
--- a/cmake_unofficial/CMakeLists.txt
+++ b/cmake_unofficial/CMakeLists.txt
@@ -17,7 +17,12 @@ ENDIF()
 option(BUILD_TOOLS "Build the command line tools" ON)
 option(BUILD_LIBS  "Build the libraries in addition to the tools" ON)
 
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+IF("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR
+   "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
+  SET(GNU_COMPATIBLE_COMPILER 1)
+ENDIF()
+
+if(GNU_COMPATIBLE_COMPILER)
 if(UNIX AND BUILD_LIBS)
     add_definitions(-fPIC)
 endif()
@@ -68,7 +73,7 @@ endif()
 if(MSVC)
 ADD_DEFINITIONS("-W4")
 endif()
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+if(GNU_COMPATIBLE_COMPILER)
 ADD_DEFINITIONS("-Wall")
 endif()
 if(CMAKE_COMPILER_IS_GNUCXX)
@@ -78,7 +83,7 @@ ADD_DEFINITIONS("-Wshadow")
 ADD_DEFINITIONS("-Wcast-align")
 ADD_DEFINITIONS("-Wstrict-prototypes")
 endif(CMAKE_COMPILER_IS_GNUCXX)
-if((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND
+if(GNU_COMPATIBLE_COMPILER AND
    (NOT CMAKE_SYSTEM_NAME MATCHES "SunOS"))
 ADD_DEFINITIONS("-std=c99")
 endif()
diff --git a/examples/.gitignore b/examples/.gitignore
new file mode 100644
index 0000000..4893866
--- /dev/null
+++ b/examples/.gitignore
@@ -0,0 +1,8 @@
+/Makefile.lz4*
+/printVersion
+/doubleBuffer
+/ringBuffer
+/ringBufferHC
+/lineCompress
+/frameCompress
+/*.exe
diff --git a/examples/Makefile b/examples/Makefile
index 808b511..b7f6eca 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -33,6 +33,7 @@ FLAGS  := -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
 
 TESTFILE= Makefile
 LZ4DIR := ../lib
+LZ4 = ../programs/lz4
 
 
 # Define *.exe as extension for Windows systems
@@ -47,7 +48,7 @@ endif
 
 default: all
 
-all: printVersion doubleBuffer ringBuffer ringBufferHC lineCompress
+all: printVersion doubleBuffer ringBuffer ringBufferHC lineCompress frameCompress
 
 printVersion: $(LZ4DIR)/lz4.c printVersion.c
 	$(CC)      $(FLAGS) $^ -o $@$(EXT)
@@ -64,15 +65,21 @@ ringBufferHC: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c HCStreaming_ringBuffer.c
 lineCompress: $(LZ4DIR)/lz4.c blockStreaming_lineByLine.c
 	$(CC)      $(FLAGS) $^ -o $@$(EXT)
 
+frameCompress: frameCompress.c
+	$(CC)      $(FLAGS) $^ -o $@$(EXT) -L$(LZ4DIR) -llz4
+
 test : all
 	./printVersion$(EXT)
 	./doubleBuffer$(EXT) $(TESTFILE)
 	./ringBuffer$(EXT)   $(TESTFILE)
 	./ringBufferHC$(EXT) $(TESTFILE)
 	./lineCompress$(EXT) $(TESTFILE)
+	LD_LIBRARY_PATH=$(LZ4DIR) ./frameCompress$(EXT) $(TESTFILE)
+	$(LZ4) -vt $(TESTFILE).lz4
 
 clean:
 	@rm -f core *.o *.dec *-0 *-9 *-8192 *.lz4s \
-        printVersion$(EXT) doubleBuffer$(EXT) ringBuffer$(EXT) ringBufferHC$(EXT) lineCompress$(EXT)
+	 printVersion$(EXT) doubleBuffer$(EXT) ringBuffer$(EXT) ringBufferHC$(EXT) \
+	 lineCompress$(EXT) frameCompress$(EXT)
 	@echo Cleaning completed
 
diff --git a/examples/frameCompress.c b/examples/frameCompress.c
new file mode 100644
index 0000000..7b13579
--- /dev/null
+++ b/examples/frameCompress.c
@@ -0,0 +1,165 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <lz4frame.h>
+
+#define BUF_SIZE (16*1024)
+#define LZ4_HEADER_SIZE 19
+#define LZ4_FOOTER_SIZE 4
+
+static const LZ4F_preferences_t lz4_preferences = {
+	{ 5, 0, 0, 0, 0, { 0, 0 } },
+	0,
+	0,
+	{ 0, 0, 0, 0 },
+};
+
+static int compress_file(FILE *in, FILE *out, size_t *size_in, size_t *size_out) {
+	LZ4F_errorCode_t r;
+	LZ4F_compressionContext_t ctx;
+	char *src, *buf = NULL;
+	size_t size, n, k, count_in = 0, count_out, offset = 0, frame_size;
+
+	r = LZ4F_createCompressionContext(&ctx, LZ4F_VERSION);
+	if (LZ4F_isError(r)) {
+		printf("Failed to create context: error %zu", r);
+		return 1;
+	}
+	r = 1;
+
+	src = malloc(BUF_SIZE);
+	if (!src) {
+		printf("Not enough memory");
+		goto cleanup;
+	}
+
+	frame_size = LZ4F_compressBound(BUF_SIZE, &lz4_preferences);
+	size =  frame_size + LZ4_HEADER_SIZE + LZ4_FOOTER_SIZE;
+	buf = malloc(size);
+	if (!buf) {
+		printf("Not enough memory");
+		goto cleanup;
+	}
+
+	n = offset = count_out = LZ4F_compressBegin(ctx, buf, size, &lz4_preferences);
+	if (LZ4F_isError(n)) {
+		printf("Failed to start compression: error %zu", n);
+		goto cleanup;
+	}
+
+	printf("Buffer size is %zu bytes, header size %zu bytes\n", size, n);
+
+	for (;;) {
+		k = fread(src, 1, BUF_SIZE, in);
+		if (k == 0)
+			break;
+		count_in += k;
+
+		n = LZ4F_compressUpdate(ctx, buf + offset, size - offset, src, k, NULL);
+		if (LZ4F_isError(n)) {
+			printf("Compression failed: error %zu", n);
+			goto cleanup;
+		}
+
+		offset += n;
+		count_out += n;
+		if (size - offset < frame_size + LZ4_FOOTER_SIZE) {
+			printf("Writing %zu bytes\n", offset);
+
+			k = fwrite(buf, 1, offset, out);
+			if (k < offset) {
+				if (ferror(out))
+					printf("Write failed");
+				else
+					printf("Short write");
+				goto cleanup;
+			}
+
+			offset = 0;
+		}
+	}
+
+	n = LZ4F_compressEnd(ctx, buf + offset, size - offset, NULL);
+	if (LZ4F_isError(n)) {
+		printf("Failed to end compression: error %zu", n);
+		goto cleanup;
+	}
+
+	offset += n;
+	count_out += n;
+	printf("Writing %zu bytes\n", offset);
+
+	k = fwrite(buf, 1, offset, out);
+	if (k < offset) {
+		if (ferror(out))
+			printf("Write failed");
+		else
+			printf("Short write");
+		goto cleanup;
+	}
+
+	*size_in = count_in;
+	*size_out = count_out;
+	r = 0;
+ cleanup:
+	if (ctx)
+		LZ4F_freeCompressionContext(ctx);
+	free(src);
+	free(buf);
+	return r;
+}
+
+static int compress(const char *input, const char *output) {
+	char *tmp = NULL;
+	FILE *in = NULL, *out = NULL;
+	size_t size_in = 0, size_out = 0;
+	int r = 1;
+
+	if (!output) {
+		size_t len = strlen(input);
+
+		output = tmp = malloc(len + 5);
+		if (!tmp) {
+			printf("Not enough memory");
+			return 1;
+		}
+		strcpy(tmp, input);
+		strcpy(tmp + len, ".lz4");
+	}
+
+	in = fopen(input, "rb");
+	if (!in) {
+		fprintf(stderr, "Failed to open input file %s: %s\n", input, strerror(errno));
+		goto cleanup;
+	}
+
+	out = fopen(output, "wb");
+	if (!out) {
+		fprintf(stderr, "Failed to open output file %s: %s\n", output, strerror(errno));
+		goto cleanup;
+	}
+
+	r = compress_file(in, out, &size_in, &size_out);
+	if (r == 0)
+		printf("%s: %zu → %zu bytes, %.1f%%\n",
+		       input, size_in, size_out,
+		       (double)size_out / size_in * 100);
+ cleanup:
+	if (in)
+		fclose(in);
+	if (out)
+		fclose(out);
+	free(tmp);
+	return r;
+}
+
+int main(int argc, char **argv) {
+	if (argc < 2 || argc > 3) {
+		fprintf(stderr, "Syntax: %s <input> <output>\n", argv[0]);
+		return EXIT_FAILURE;
+	}
+
+	return compress(argv[1], argv[2]);
+}
diff --git a/programs/.gitignore b/programs/.gitignore
new file mode 100644
index 0000000..f7fc991
--- /dev/null
+++ b/programs/.gitignore
@@ -0,0 +1,2 @@
+/lz4
+/*.exe