From 5b37837e6e872bb57c8c7d07d6d4ff94176b8c59 Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Thu, 10 Nov 2016 17:27:56 -0800 Subject: [PATCH] Fix license and remove references to zstd --- contrib/gen_manual/Makefile | 34 ++++++++++++++++++++----- contrib/gen_manual/README.md | 6 ++--- contrib/gen_manual/gen_manual.cpp | 41 +++++++++++++++++++++++++------ lib/README.md | 2 +- programs/lz4io.c | 8 +++--- programs/util.h | 2 +- 6 files changed, 70 insertions(+), 23 deletions(-) diff --git a/contrib/gen_manual/Makefile b/contrib/gen_manual/Makefile index 49616ee..adbcca2 100644 --- a/contrib/gen_manual/Makefile +++ b/contrib/gen_manual/Makefile @@ -1,11 +1,33 @@ -# ########################################################################## -# Copyright (c) 2016-present, Przemyslaw Skibinski +# ################################################################ +# Copyright (C) Przemyslaw Skibinski 2016-present # All rights reserved. # -# This source code is licensed under the BSD-style license found in the -# LICENSE file in the root directory of this source tree. An additional grant -# of patent rights can be found in the PATENTS file in the same directory. -# ########################################################################## +# BSD license +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, this +# list of conditions and the following disclaimer in the documentation and/or +# other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# You can contact the author at : +# - LZ4 source repository : https://github.com/Cyan4973/lz4 +# - LZ4 forum froup : https://groups.google.com/forum/#!forum/lz4c +# ################################################################ CFLAGS ?= -O3 diff --git a/contrib/gen_manual/README.md b/contrib/gen_manual/README.md index 3d146d4..853e623 100644 --- a/contrib/gen_manual/README.md +++ b/contrib/gen_manual/README.md @@ -1,5 +1,5 @@ -gen_manual - a program for automatic generation of zstd manual -============================================================ +gen_manual - a program for automatic generation of lz4 manual +============================================================= #### Introduction @@ -27,5 +27,5 @@ gen_manual [lz4_version] [input_file] [output_html] To compile program and generate lz4 manual we have used: ``` make -./gen_manual.exe 1.7.3 ../../lib/lz4.h zstd_manual.html +./gen_manual.exe 1.7.3 ../../lib/lz4.h lz4_manual.html ``` diff --git a/contrib/gen_manual/gen_manual.cpp b/contrib/gen_manual/gen_manual.cpp index caf03fc..2df081d 100644 --- a/contrib/gen_manual/gen_manual.cpp +++ b/contrib/gen_manual/gen_manual.cpp @@ -1,11 +1,36 @@ /* - * Copyright (c) 2016-present, Przemyslaw Skibinski - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - */ +Copyright (c) 2016-present, Przemyslaw Skibinski +All rights reserved. + +BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +* Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +You can contact the author at : +- LZ4 homepage : http://www.lz4.org +- LZ4 source repository : https://github.com/lz4/lz4 +*/ #include #include @@ -213,4 +238,4 @@ int main(int argc, char *argv[]) { ostream << "" << endl << "" << endl; return 0; -} \ No newline at end of file +} diff --git a/lib/README.md b/lib/README.md index 051ef54..3ca2776 100644 --- a/lib/README.md +++ b/lib/README.md @@ -10,7 +10,7 @@ The minimum required is **`lz4.c`** and **`lz4.h`**, which will provide the fast compression and decompression algorithm. -#### The High Compression variant od LZ4 +#### The High Compression variant of LZ4 For more compression at the cost of compression speed, the High Compression variant **lz4hc** is available. diff --git a/programs/lz4io.c b/programs/lz4io.c index 725d3a8..00576c2 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -258,7 +258,7 @@ static FILE* LZ4IO_openSrcFile(const char* srcFileName) SET_BINARY_MODE(stdin); } else { f = fopen(srcFileName, "rb"); - if ( f==NULL ) DISPLAYLEVEL(1, "zstd: %s: %s \n", srcFileName, strerror(errno)); + if ( f==NULL ) DISPLAYLEVEL(1, "%s: %s \n", srcFileName, strerror(errno)); } return f; @@ -285,10 +285,10 @@ static FILE* LZ4IO_openDstFile(const char* dstFileName) if (f != NULL) { /* dest exists, prompt for overwrite authorization */ fclose(f); if (g_displayLevel <= 1) { /* No interaction possible */ - DISPLAY("zstd: %s already exists; not overwritten \n", dstFileName); + DISPLAY("%s already exists; not overwritten \n", dstFileName); return NULL; } - DISPLAY("zstd: %s already exists; do you wish to overwrite (y/N) ? ", dstFileName); + DISPLAY("%s already exists; do you wish to overwrite (y/N) ? ", dstFileName); { int ch = getchar(); if ((ch!='Y') && (ch!='y')) { DISPLAY(" not overwritten \n"); @@ -297,7 +297,7 @@ static FILE* LZ4IO_openDstFile(const char* dstFileName) while ((ch!=EOF) && (ch!='\n')) ch = getchar(); /* flush rest of input line */ } } } f = fopen( dstFileName, "wb" ); - if (f==NULL) DISPLAYLEVEL(1, "zstd: %s: %s\n", dstFileName, strerror(errno)); + if (f==NULL) DISPLAYLEVEL(1, "%s: %s\n", dstFileName, strerror(errno)); } /* sparse file */ diff --git a/programs/util.h b/programs/util.h index d76ce6a..1ad61bc 100644 --- a/programs/util.h +++ b/programs/util.h @@ -427,7 +427,7 @@ UTIL_STATIC int UTIL_prepareFileList(const char *dirName, char** bufStart, size_ UTIL_STATIC int UTIL_prepareFileList(const char *dirName, char** bufStart, size_t* pos, char** bufEnd) { (void)bufStart; (void)bufEnd; (void)pos; - fprintf(stderr, "Directory %s ignored (zstd compiled without _WIN32 or _POSIX_C_SOURCE)\n", dirName); + fprintf(stderr, "Directory %s ignored (lz4 compiled without _WIN32 or _POSIX_C_SOURCE)\n", dirName); return 0; }