From 82bf5be9b0e4e5bd3dbdae4ec2aaa9fe8fc693fb Mon Sep 17 00:00:00 2001 From: "yann.collet.73@gmail.com" Date: Tue, 1 Oct 2013 20:32:43 +0000 Subject: git-svn-id: https://lz4.googlecode.com/svn/trunk@106 650e7d94-2a16-8b24-b05c-7c0b3f6821cd --- Makefile | 21 ++++++++++++++------- NEWS | 4 ++++ lz4.1 | 16 ++++++++-------- lz4cli.c | 8 ++++++-- 4 files changed, 32 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 1d6102e..545a781 100644 --- a/Makefile +++ b/Makefile @@ -30,11 +30,11 @@ # fullbench32: Same as fullbench, but forced to compile in 32-bits mode # ################################################################ -RELEASE=r105 +RELEASE=r106 PREFIX=/usr BINDIR=$(PREFIX)/bin MANDIR=$(PREFIX)/share/man/man1 -DISTNAME=lz4-$(RELEASE).tar.gz +DISTRIBNAME=lz4-$(RELEASE).tar.gz CC=gcc CFLAGS=-I. -std=c99 -Wall -W -Wundef -Wno-implicit-function-declaration @@ -46,12 +46,14 @@ else EXT = endif -SOURCES = bench.c bench.h fullbench.c fuzzer.c lz4.1 lz4.c lz4cli.c \ +TEXT = bench.c bench.h fullbench.c fuzzer.c lz4.1 lz4.c lz4cli.c \ lz4_format_description.txt lz4.h lz4hc.c lz4hc.h \ - LZ4_Streaming_Format.odt Makefile xxhash.c xxhash.h \ + Makefile xxhash.c xxhash.h \ NEWS COPYING \ cmake/CMakeLists.txt cmake/pack/release_COPYING.txt \ cmake/pack/CMakeLists.txt +NONTEXT = LZ4_Streaming_Format.odt +SOURCES = $(TEXT) $(NONTEXT) default: lz4 lz4c @@ -99,11 +101,16 @@ uninstall: dist: clean @install -dD -m 700 lz4-$(RELEASE)/cmake/pack/ - @for f in $(SOURCES); do \ + @for f in $(TEXT); do \ + tr -d '\r' < $$f > .tmp; \ + install -m 600 .tmp lz4-$(RELEASE)/$$f; \ + done + @rm .tmp + @for f in $(NONTEXT); do \ install -m 600 $$f lz4-$(RELEASE)/$$f; \ done - @tar -czf $(DISTNAME) lz4-$(RELEASE)/ + @tar -czf $(DISTRIBNAME) lz4-$(RELEASE)/ @rm -rf lz4-$(RELEASE) - @echo Distribution $(DISTNAME) built + @echo Distribution $(DISTRIBNAME) built endif diff --git a/NEWS b/NEWS index b278986..25a3e0a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +r106 : +Makefile : make dist modify text files in the package to respect Unix EoL convention +lz4cli : corrected small display bug in HC mode + r105 : Makefile : New install script and man page, contributed by Prasad Pandit lz4cli.c : Minor modifications, for easier extensibility diff --git a/lz4.1 b/lz4.1 index 0f9a38c..ac325e8 100644 --- a/lz4.1 +++ b/lz4.1 @@ -1,11 +1,11 @@ -+\" -+\" lz4.1: This is a manual page for 'lz4' program. This file is part of the -+\" lz4 project. -+\" -+ -+\" No hyphenation -+.hy 0 -+.nr HY 0 +\" +\" lz4.1: This is a manual page for 'lz4' program. This file is part of the +\" lz4 project. +\" + +\" No hyphenation +.hy 0 +.nr HY 0 .TH lz4 man .SH NAME diff --git a/lz4cli.c b/lz4cli.c index 8ae779d..9bf0aaf 100644 --- a/lz4cli.c +++ b/lz4cli.c @@ -103,7 +103,7 @@ // Constants //**************************** #define COMPRESSOR_NAME "LZ4 Compression CLI" -#define COMPRESSOR_VERSION "v1.0.5" +#define COMPRESSOR_VERSION "v1.0.6" #define COMPILED __DATE__ #define AUTHOR "Yann Collet" #define LZ4_EXTENSION ".lz4" @@ -344,7 +344,7 @@ int get_fileHandle(char* input_filename, char* output_filename, FILE** pfinput, if (!overwrite) { char ch; - DISPLAYLEVEL(2, "Warning : %s already exists\n", output_filename); + DISPLAYLEVEL(2, "Warning : %s already exists\n", output_filename); DISPLAYLEVEL(2, "Overwrite ? (Y/N) : "); if (displayLevel <= 1) EXM_THROW(11, "Operation aborted : %s already exists", output_filename); // No interaction possible ch = (char)getchar(); @@ -415,6 +415,7 @@ int legacy_compress_file(char* input_filename, char* output_filename, int compre // Status end = clock(); + DISPLAYLEVEL(2, "\r%79s\r", ""); DISPLAYLEVEL(2,"Compressed %llu bytes into %llu bytes ==> %.2f%%\n", (unsigned long long) filesize, (unsigned long long) compressedfilesize, (double)compressedfilesize/filesize*100); { @@ -565,6 +566,7 @@ int compress_file_blockDependency(char* input_filename, char* output_filename, i // Status end = clock(); + DISPLAYLEVEL(2, "\r%79s\r", ""); DISPLAYLEVEL(2, "Compressed %llu bytes into %llu bytes ==> %.2f%%\n", (unsigned long long) filesize, (unsigned long long) compressedfilesize, (double)compressedfilesize/filesize*100); { @@ -708,6 +710,7 @@ int compress_file(char* input_filename, char* output_filename, int compressionle // Final Status end = clock(); + DISPLAYLEVEL(2, "\r%79s\r", ""); DISPLAYLEVEL(2, "Compressed %llu bytes into %llu bytes ==> %.2f%%\n", (unsigned long long) filesize, (unsigned long long) compressedfilesize, (double)compressedfilesize/filesize*100); { @@ -988,6 +991,7 @@ int decodeFile(char* input_filename, char* output_filename) // Final Status end = clock(); + DISPLAYLEVEL(2, "\r%79s\r", ""); DISPLAYLEVEL(2, "Successfully decoded %llu bytes \n", filesize); { double seconds = (double)(end - start)/CLOCKS_PER_SEC; -- cgit v0.12