Commit Graph

2152 Commits

Author SHA1 Message Date
Lzu Tao
dd54ea01a2 contrib: Make Meson build non optional
* Update ninja version to 1.9 in CI.
* Update default project version in meson script.
2019-04-27 01:41:03 +07:00
Yann Collet
ce55e7eef9
Merge pull request #699 from brendene/compressBound
Include block checksum in worst case scenario calculation of dstCapacity
2019-04-25 20:26:04 -07:00
Brenden Eng
9e056bc032 Include block checksum in worst case scenario calculation of dstCapacity 2019-04-25 22:37:39 -04:00
Yann Collet
8453e071f1
Merge pull request #698 from lz4/tidy
several minor style changes recommended by clang-tidy
2019-04-24 11:50:50 -07:00
Yann Collet
ba99eac4d0 several minor style changes recommended by clang-tidy 2019-04-24 10:03:02 -07:00
Yann Collet
f9781a6643
Merge pull request #697 from ldv-alt/fixes/test-amalgamation
Fix test-amalgamation
2019-04-23 17:20:03 -07:00
Yann Collet
49c20c498b
Merge pull request #696 from lz4/mactest
Fix dynamic library compilation on Mac OS-X
2019-04-23 15:08:46 -07:00
Dmitry V. Levin
0d3f85df65 test-amalgamation: split the rule
Change test-amalgamation to follow each-rule-makes-a-single-target idiom.

Fixes: a7e8d394 ("[amalgamation] add test")
2019-04-23 21:18:11 +00:00
Dmitry V. Levin
8069d2ae6f test-amalgamation: fix compilation options
Use the same compilation options to compile lz4_all.c and other object files.

Fixes: a7e8d394 ("[amalgamation] add test")
2019-04-23 21:18:11 +00:00
Dmitry V. Levin
10726d4c56 test-amalgamation: use a single cat command
Use the list of prerequisites instead of listing those files manually,
this way they will never fall out of sync.

Also update the amalgamation example to use a single cat command.

Fixes: a7e8d394 ("[amalgamation] add test")
Fixes: b192c86b ("[amalgamation] lz4frame.c")
2019-04-23 21:18:11 +00:00
Dmitry V. Levin
7937e86255 test-amalgamation: fix the list of prerequisites
Add $(LZ4DIR)/lz4frame.c to the list of prerequisites as the rule uses
that file.

Fixes: b192c86b ("[amalgamation] lz4frame.c")
2019-04-23 21:18:11 +00:00
Yann Collet
8c2ab8607e
Merge pull request #695 from lembacon/makefile-os
lib/Makefile: Fix detection of `Darwin`.
2019-04-23 14:09:40 -07:00
Yann Collet
2b68501ece added library build test on Mac OS-X 2019-04-23 12:29:39 -07:00
Chongyu Zhu
024216ef73
lib/Makefile: Fix detection of Darwin. 2019-04-24 03:13:19 +08:00
Yann Collet
f665291e6c
Merge pull request #693 from JPeterMugaas/master
More build imrpvements
2019-04-23 09:20:41 -07:00
JPeterMugaas
7136489d33 More build imrpvements
Moved a few other tests to Makefiles.inc.  Other things might need to go there.
Made a test for symlink appropriateness.  Windows can NOT handle them the same way Unix-like operating systems do (if at all).  This is mostly the same as the Visual C projects.
embed version info into .dll and .exes that are redistributed.
2019-04-23 07:44:00 -04:00
Yann Collet
229b016f50 Merge branch 'dev' of github.com:Cyan4973/lz4 into dev 2019-04-22 17:45:40 -07:00
Yann Collet
1e700b6f85 updated NEWS for v1.9.1 2019-04-22 17:45:24 -07:00
Yann Collet
291b3d8b7e
Merge pull request #691 from lz4/list
--list
2019-04-22 17:43:01 -07:00
Yann Collet
35b83a921f fix: no leak when LZ4F_dctx creation fails
strange, because it previous implementation, it would `exit()`,
so it should not matter ...
2019-04-22 16:06:22 -07:00
Yann Collet
c4fe7a2047
Merge pull request #689 from JPeterMugaas/jpm-makefile
Jpm makefile - as described in https://github.com/lz4/lz4/issues/688
2019-04-22 15:29:50 -07:00
Yann Collet
5a50247d5f updated code comments 2019-04-22 15:24:44 -07:00
Yann Collet
a685d5cffc --list gives block type 2019-04-22 15:14:53 -07:00
Yann Collet
f401f1de7e --list can resume after a failed file 2019-04-22 15:01:20 -07:00
JPeterMugaas
5e6807fd95 Make programs/Makefile use the includes. 2019-04-22 17:38:43 -04:00
Yann Collet
0d4c885abb refactored --list function
better handling of special conditions,
better scoping of variables.

Also : updated man page
2019-04-22 14:01:19 -07:00
JPeterMugaas
2acddd9918 Fix a test for mingw 2019-04-22 16:06:04 -04:00
JPeterMugaas
b48f823f90 Try to put some tests I made in ONE place. I also moved a test for "install" in one place to try to isolate it. 2019-04-22 15:48:48 -04:00
Yann Collet
ae5cea9112 fixed C90 compliance
re-structure code, have everything into a single section of lz4io.c
2019-04-22 12:27:25 -07:00
Yann Collet
4ae437c98e
Merge pull request #690 from gabrielstedman/dev
Implement --list
2019-04-22 12:19:28 -07:00
JPeterMugaas
773b66547f Initial commits from diff I submitted earlier 2019-04-22 13:48:59 -04:00
gabrielstedman
84f978a2f3 FR #598 - Correctly initialize cfinfo & cast malloc res to (char*) 2019-04-22 11:07:08 +01:00
gabrielstedman
e31b6dc03c FR #598 - Make fileSize unsigned long long 2019-04-22 10:35:29 +01:00
gabrielstedman
0acebbe53d FR #598 - Move LZ4F_compFileInfo_t def to lz4frame.h discard output_file
assert if in om_list mode
2019-04-22 10:02:46 +01:00
gabrielstedman
9d0960c354 Merge https://github.com/lz4/lz4 into dev 2019-04-22 09:56:51 +01:00
gabrielstedman
2133366da0 FR #598 - Make LZ4IO_getCompressedFileInfo internal and reword func 2019-04-22 09:00:20 +01:00
Yann Collet
15af05ffce
Merge pull request #686 from lz4/clistdout
cli: warning for stdout as default output
2019-04-21 20:20:41 -07:00
Yann Collet
22fae16c6f ensure tests work when stdout is not the console
ensure this case is continuously tested on travis.

Update documentation on implicit output,
invite to not rely on implicit output in scripts.
2019-04-21 17:01:03 -07:00
Yann Collet
467e352de9 tests/Makefile : created CMP variable
for potential redirection, if need be.

note : should probably converge all comparison operations onto CMP
2019-04-21 12:42:13 -07:00
gabrielstedman
5fdc6d201e FR #598 Improve initial design, test mallocs, support C90. 2019-04-21 18:20:40 +01:00
gabrielstedman
55484191c4 correctly use unisgned int for index 2019-04-21 00:20:38 +01:00
gabrielstedman
55ab3c48ae Add --list option to display compressed file information. 2019-04-21 00:01:03 +01:00
Yann Collet
5f8ac02b77 cli: display a warning whenever default output is stdout while input != stdin
This behavior has been preserved for compatibility with existing ecosystem.
But it's problematic, as some environment start `lz4` without identifying stdout as console by default,
leading to a change of behavior for a same line of script.

A more sensible policy would be to default to stdout only when input is stdin.

Soft change for the time being : keep the behavior, just print a warning message.
User should prefer `-c` to explicitly select `stdout`.

Also : updated tests in Makefile to explicitly select `stdout` with `-c`.
2019-04-19 17:08:40 -07:00
Yann Collet
7a4e3b1fac bumped version number
to v1.9.1
2019-04-19 11:59:49 -07:00
Yann Collet
40e82df003
Merge pull request #684 from lz4/cxxlz4f
lz4frame: initializers compatibility with C++
2019-04-19 11:51:29 -07:00
Yann Collet
af35920c81 lz4frame: initializers compatibility with C++
fix #679, reported by @degski
2019-04-19 10:23:50 -07:00
Yann Collet
10b9e91227
Merge pull request #683 from lz4/fuzasan
fixed read-after input in LZ4_decompress_safe()
2019-04-18 20:57:56 -07:00
Yann Collet
213edce4be
Merge pull request #682 from lz4/visual
fix minor Visual warnings
2019-04-18 18:51:28 -07:00
Yann Collet
ae199124e5 fixed read-after input in LZ4_decompress_safe() 2019-04-18 18:50:51 -07:00
Yann Collet
4e4f1ad623 ensure list of names is large enough 2019-04-18 17:26:01 -07:00