Commit graph

895 commits

Author SHA1 Message Date
Sébastien Cabaniols 9f3c995601 explicitely require bash so that autogen.sh now pass on ubuntu20/mint 2021-02-08 20:43:47 +01:00
Con Kolivas ce923dbd17
Merge pull request #179 from pete4abw/git-describe-version
Use git describe to present version number to configure.ac
2020-12-25 07:06:37 +11:00
Peter Hyman c2001e2281 Use git describe to present version number to configure.ac
gitdesc.sh assumes tag will have format v#.### and will return
major version, minor version, and micro version depending on
command.
gitdesc.sh will also add tag revision and HEAD commit if tag is
not equal to HEAD. So lrzip version may appear as
`#.###' or
`#.###-R-#######'
where `R' is count of commits since last tag.
usage
gitdesc.sh command [-r]
where command is one of:
all - entire git describe
commit - commit, omitting v
tagrev - tag revision count
major - major release version
ninor - minor release version
micro - micro release version + [tag release count-HEAD commit]
version - M.mic
-r -- get release tag only
2020-12-24 10:45:04 -06:00
Con Kolivas ff04150aaa
Merge pull request #176 from pete4abw/debugger_fix
Fix so that debugger will load and Assembler code will debug.
2020-11-15 16:23:29 +11:00
Con Kolivas f9217bf7b8
Merge pull request #175 from pete4abw/head_off_always_0
get_fileinfo always shows 0 file offset
2020-11-15 16:22:52 +11:00
Peter Hyman f5c19dbde8 Fix so that debugger will load and Assembler code will debug. 2020-11-14 16:30:28 -06:00
Peter Hyman 4b7301f435
Update lrzip.c
Offset always zero because of missing parenstheses.

OLD
Block   Comp    Percent Size
1       lzma    21.4%   22356255 / 104376320    Offset: 0       Head: 22356294
2       lzma    16.8%   17506482 / 104376320    Offset: 0       Head: 39862789
3       lzma    16.8%   17532322 / 104376320    Offset: 0       Head: 57395124

NEW
Block   Comp    Percent Size
1       lzma    21.4%   22356255 / 104376320    Offset: 56      Head: 22356294
2       lzma    16.8%   17506482 / 104376320    Offset: 22356324        Head: 39862789
3       lzma    16.8%   17532322 / 104376320    Offset: 39862819        Head: 57395124
2020-11-14 15:32:32 -06:00
Con Kolivas 8af8ad17e4 Fix error with failure to write with stdout due to different semantics with fwrite vs write. 2020-11-11 23:19:29 +11:00
Con Kolivas 597be1ffbd
Merge pull request #159 from ckolivas/revert-157-Fix_imply_lrz_ext
Revert "BUGFIX: lrzip -d, -t should allow a file with or without an lrz extension and add if necessary"
2020-06-01 13:17:48 +10:00
Con Kolivas de2930dc0a
Revert "BUGFIX: lrzip -d, -t should allow a file with or without an lrz extension and add if necessary" 2020-06-01 13:16:39 +10:00
Con Kolivas 1cfcd57fcf
Merge pull request #157 from pete4abw/Fix_imply_lrz_ext
BUGFIX: lrzip -d, -t should allow a file with or without an lrz extension and add if necessary
2020-05-29 07:16:17 +10:00
Peter Hyman f9b127cd5a BUGFIX: lrzip -d, -t should allow a file with or without an lrz extension and add it if necessary 2020-05-28 11:43:11 -05:00
Con Kolivas 7f3bf46203
Merge pull request #154 from ffontaine/master
lzma/C/Makefile.am: fix install with asm
2020-05-23 09:24:30 +10:00
Fabrice Fontaine 844b8c057c lzma/C/Makefile.am: fix install with asm
Commit 3734448abc fixed the build failure
due to .libs being missing but it raises a build failure when .libs is
already there:

nasm -I../ASM/x86/ -Dx64 -f elf64 -o 7zCrcOpt_asm.o ../../lzma/ASM/x86/7zCrcOpt_asm.asm
mkdir .libs
mkdir: cannot create directory '.libs': File exists

Fix this error by adding -p argument to mkdir

Fixes:
- http://autobuild.buildroot.org/results/1ca6db24ef26c57d4c129de7e98383e7e58b366b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2020-05-22 18:42:19 +02:00
Con Kolivas 8781292dd5
Merge pull request #152 from ffontaine/master
lzma/C/Makefile.am: fix install with asm
2020-05-16 17:45:02 +10:00
Fabrice Fontaine 3734448abc lzma/C/Makefile.am: fix install with asm
Since commit 9f16f65705, build with asm
can fail on:

nasm -I../ASM/x86/ -Dx64 -f elf64 -o 7zCrcOpt_asm.o ../../lzma/ASM/x86/7zCrcOpt_asm.asm
  CC       LzmaEnc.lo
  CC       LzmaLib.lo
  CC       Alloc.lo
  CC       Threads.lo
cp 7zCrcOpt_asm.o .libs/
cp: cannot create regular file '.libs/': Not a directory
make[4]: *** [Makefile:678: 7zCrcOpt_asm.lo] Error 1
make[4]: *** Waiting for unfinished jobs....

So create .libs directory before copying 7zCrcOpt_asm.o

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2020-05-16 09:33:48 +02:00
Con Kolivas 4101fc8279
Merge pull request #151 from ffontaine/master
Lrzip.h: add missing header for va_list on some platforms
2020-05-16 08:12:30 +10:00
Fabrice Fontaine 37c539d6da Lrzip.h: add missing header for va_list on some platforms
Signed-off-by: Sam Lancia <sam@gpsm.co.uk>
[Retrieved from:
https://git.buildroot.net/buildroot/tree/package/lrzip/0001-missing-stdarg.patch]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2020-05-16 00:10:38 +02:00
Con Kolivas 4f1adeaec4 Attempt to allocate buffer when it is larger than maxram instead of aborting without even trying. 2019-12-03 12:40:06 +11:00
Con Kolivas 86661e68bf Skip empty match blocks if they're found at the end as they may be created with incompressible data. 2019-12-03 12:22:11 +11:00
Con Kolivas 93d579a1b8 Fix misuse of static variable in a header. 2019-12-03 11:23:58 +11:00
Con Kolivas c90c71782e
Merge pull request #137 from pete4abw/fixasm
HOTFIX for compiling with --disable-asm or no assembler present
2019-12-03 07:09:01 +11:00
Peter Hyman db8d1d56e7 HOTFIX for compiling with --disable-asm or no assembler present 2019-12-02 12:30:26 -06:00
Con Kolivas ee14f163f7
Merge pull request #134 from pete4abw/lzma-memory
Small changes to control->threads and memory overhead for LZMA.
2019-12-02 22:31:55 +11:00
Con Kolivas 3d7eb6fbae
Merge pull request #128 from pete4abw/conf_file_fix
fix to allow compression in lrzip.conf to be overridden by command line
2019-12-02 22:31:22 +11:00
Con Kolivas a82adac548
Merge pull request #135 from pete4abw/fixasm
Update and bring back Assembler code for CRC check.
2019-12-02 22:30:40 +11:00
Con Kolivas 4af85e0496
Merge pull request #136 from pete4abw/set_priority
Fixups to nice handling. Users can't normally lower niceness.
2019-12-02 22:28:15 +11:00
Con Kolivas ffd4a2df50
Merge pull request #121 from pete4abw/lrztar
lrztar -o fix
2019-12-02 22:26:50 +11:00
Peter Hyman 9b20563ef5 Fixups to nice handling. Users can't normally lower niceness. 2019-11-26 04:50:31 -06:00
Peter Hyman 9f16f65705 Update and bring back Assembler code for CRC check. 2019-11-25 08:44:46 -06:00
Peter Hyman 1e16f7bd02 Small changes to control->threads and memory overhead for LZMA. 2019-11-25 08:30:34 -06:00
Con Kolivas 02a7bdc6c4
Merge pull request #131 from pete4abw/infofix
Fix lrzip info display when last chunk has no compression
2019-11-04 08:31:09 +11:00
Peter Hyman 785562a753 Fix lrzip info display when last chunk has no compression 2019-11-03 15:18:48 -06:00
Peter Hyman 8eb867e5f0 fix to allow compression in lrzip.conf to be overridden by command line choice. 2019-10-27 11:17:46 -05:00
Peter Hyman 0906e3d099 lrztar -o fix 2019-06-30 11:53:20 -05:00
Con Kolivas b922018128
Merge pull request #113 from pete4abw/master
update to lrzip.conf.5 manpage and example file.
2019-06-19 20:44:20 +10:00
Peter Hyman 2f012cb3ea Fix to allow override of compression set in lrzip.conf 2019-06-19 05:36:21 -05:00
Peter Hyman 67ddcae772 Merge branch 'master' of https://github.com/ckolivas/lrzip 2019-05-30 06:46:16 -05:00
Con Kolivas edb357ecde
Merge pull request #114 from danieldjewell/master
Fix Android Detection in lrzip_private.h
2019-05-28 13:50:05 +10:00
Daniel Jewell a8f0dc3a31 Fix Android Detection in lrzip_private.h
lrzip_private.h was checking for "ANDROID" but
it should be __ANDROID__

lrzip now compiles just fine on android, it seems
2019-05-27 20:34:50 -07:00
Peter Hyman b1b5f81d81 update to lrzip.conf.5 manpage and example file. 2019-05-12 12:35:13 -05:00
Con Kolivas 79f505165b
Merge pull request #106 from areading/ar/thread_race_segfault
Fix thread race causing segfault during decompression
2019-02-24 17:14:54 +11:00
Andrew Reading c2714b9eab Compile with -pthread instead of just -lpthread.
In Linux, GCC appears to process -pthread as '-D_REENTRANT -lpthread'.
Just in case the _REENTRANT still does something useful on a target
platform, this commit adds this missing -pthread flag during
compilation.
2019-02-23 21:15:38 -08:00
Andrew Reading 8eba9a202e Make threaded decompression more robust on failure.
This changes the decompression worker thread to signal the main thread
in case of failure, allowing the main thread to handle this
appropriately instead of just assuming the resulting data is always good.
2019-02-23 21:09:44 -08:00
Andrew Reading 1a1723834b Fix segfault from thread race condition during decompression.
This fixes an issue where the main thread would not wait for all worker
threads to fully join before attempting to process their result buffers:
new_thread was true up until to the final N-1 calls, at which point the
input stream will have ended and new_thread would be false, then
bypassing the pthread_join()s.

The new_thread condition isn't actually necessary at all, so it has been
entirely removed.
2019-02-23 21:01:24 -08:00
Con Kolivas 9819e861a5
Merge pull request #101 from emallickhossain/patch-1
Fix tar cowardly failing
2018-09-18 22:19:02 +10:00
Mallick Hossain de08f0ef40
Fix tar cowardly failing
Since .tar archive was not specified, compression was failing.
2018-09-13 09:36:24 -04:00
Con Kolivas a81248e47d Cope with corrupt/crafted archive stream overruns. 2018-05-28 15:06:04 +10:00
Con Kolivas 3cadc63e39 Minor memleak clean ups on failures. 2018-05-28 14:39:26 +10:00
Con Kolivas 907b66b8cb Check for invalid expected sizes and abort. 2018-05-25 13:12:54 +10:00