summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 07:24:30 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 07:24:30 +0000
commit54ec5ca53eb5d88daf91b3a6fafdbea43d764fa7 (patch)
treeed32990f53223b13952aa9660c83c23cfa63eb18
parentAdding debian version 1.6~pre3-1. (diff)
downloadlzip-54ec5ca53eb5d88daf91b3a6fafdbea43d764fa7.tar.xz
lzip-54ec5ca53eb5d88daf91b3a6fafdbea43d764fa7.zip
Merging upstream version 1.6.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r--ChangeLog25
-rw-r--r--Makefile.in47
-rw-r--r--NEWS6
-rwxr-xr-xconfigure4
-rw-r--r--doc/lzdiff.148
-rw-r--r--doc/lzgrep.142
-rw-r--r--doc/lzip.14
-rw-r--r--doc/lzip.info22
-rw-r--r--doc/lzip.texinfo4
-rw-r--r--doc/lziprecover.135
-rw-r--r--main.cc2
11 files changed, 180 insertions, 59 deletions
diff --git a/ChangeLog b/ChangeLog
index dcba1f1..de24425 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,28 +1,21 @@
-2009-06-03 Antonio Diaz Diaz <ant_diaz@teleline.es>
+2009-06-22 Antonio Diaz Diaz <ant_diaz@teleline.es>
- * Version 1.6-pre3 released.
- * Added decompression support for Sync Flush marker.
- * Removed some "bashisms" from lzdiff and lzgrep.
- * Dictionary size for options "-1" to "-4" has been changed.
-
-2009-05-21 Antonio Diaz Diaz <ant_diaz@teleline.es>
-
- * Version 1.6-pre2 released.
+ * Version 1.6 released.
* Decompression time has been reduced by 17%.
+ * Added decompression support for Sync Flush marker.
* Added support for .tbz extension to lzdiff and lzgrep.
* Added man pages for lzdiff, lzgrep and lziprecover.
* encoder.cc (Matchfinder): Reduce memory use to 9x if input file
is smaller than dictionary size limit.
- * testsuite/check.sh: Test lziprecover.
- * Export LC_ALL=C in all scripts.
-
-2009-04-27 Antonio Diaz Diaz <ant_diaz@teleline.es>
-
- * Version 1.6-pre1 released.
- * Makefile.in: Extra files are now installed by default.
* decoder.cc: Added extra flush calls to improve partial
decompression of corrupt files.
* "--test" no more needs "/dev/null".
+ * Removed some "bashisms" from lzdiff and lzgrep.
+ * Dictionary size for options "-1" to "-4" has been changed.
+ * main.cc (signal_handler): Declared as `extern "C"'.
+ * Makefile.in: Extra files are now installed by default.
+ * testsuite/check.sh: Test lziprecover.
+ * Added "export LC_ALL=C" to all scripts.
2009-04-12 Antonio Diaz Diaz <ant_diaz@teleline.es>
diff --git a/Makefile.in b/Makefile.in
index 1b9d4fb..decce04 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,8 +9,8 @@ SHELL = /bin/sh
objs = arg_parser.o decoder.o encoder.o main.o
-.PHONY : all install install-info install-man install-extra install-strip \
- uninstall uninstall-info uninstall-man uninstall-extra \
+.PHONY : all install install-info install-man install-strip \
+ uninstall uninstall-info uninstall-man \
doc info man check dist clean distclean
all : $(progname) lziprecover
@@ -47,14 +47,8 @@ info : $(VPATH)/doc/$(progname).info
$(VPATH)/doc/$(progname).info : $(VPATH)/doc/$(progname).texinfo
cd $(VPATH)/doc && makeinfo $(progname).texinfo
-man : $(VPATH)/doc/$(progname).1 $(VPATH)/doc/lziprecover.1 \
- $(VPATH)/doc/lzdiff.1 $(VPATH)/doc/lzgrep.1
-
-$(VPATH)/doc/$(progname).1 : $(progname)
- help2man -o $(VPATH)/doc/$(progname).1 ./$(progname)
-
-$(VPATH)/doc/lziprecover.1 : lziprecover
- help2man -o $(VPATH)/doc/lziprecover.1 --no-info ./lziprecover
+man : $(VPATH)/doc/lzdiff.1 $(VPATH)/doc/lzgrep.1 \
+ $(VPATH)/doc/$(progname).1 $(VPATH)/doc/lziprecover.1
$(VPATH)/doc/lzdiff.1 : $(VPATH)/lzdiff
help2man -o $(VPATH)/doc/lzdiff.1 --no-info $(VPATH)/lzdiff
@@ -62,15 +56,24 @@ $(VPATH)/doc/lzdiff.1 : $(VPATH)/lzdiff
$(VPATH)/doc/lzgrep.1 : $(VPATH)/lzgrep
help2man -o $(VPATH)/doc/lzgrep.1 --no-info $(VPATH)/lzgrep
+$(VPATH)/doc/$(progname).1 : $(progname)
+ help2man -o $(VPATH)/doc/$(progname).1 ./$(progname)
+
+$(VPATH)/doc/lziprecover.1 : lziprecover
+ help2man -o $(VPATH)/doc/lziprecover.1 --no-info ./lziprecover
+
Makefile : $(VPATH)/configure $(VPATH)/Makefile.in
./config.status
check : all $(VPATH)/testsuite/check.sh
@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite
-install : all install-info install-man install-extra
+install : all install-info install-man
if test ! -d $(DESTDIR)$(bindir) ; then $(INSTALL) -d $(DESTDIR)$(bindir) ; fi
+ $(INSTALL_SCRIPT) $(VPATH)/lzdiff $(DESTDIR)$(bindir)/lzdiff
+ $(INSTALL_SCRIPT) $(VPATH)/lzgrep $(DESTDIR)$(bindir)/lzgrep
$(INSTALL_PROGRAM) ./$(progname) $(DESTDIR)$(bindir)/$(progname)
+ $(INSTALL_PROGRAM) ./lziprecover $(DESTDIR)$(bindir)/lziprecover
install-info :
if test ! -d $(DESTDIR)$(infodir) ; then $(INSTALL) -d $(DESTDIR)$(infodir) ; fi
@@ -79,19 +82,19 @@ install-info :
install-man :
if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL) -d $(DESTDIR)$(mandir)/man1 ; fi
+ $(INSTALL_DATA) $(VPATH)/doc/lzdiff.1 $(DESTDIR)$(mandir)/man1/lzdiff.1
+ $(INSTALL_DATA) $(VPATH)/doc/lzgrep.1 $(DESTDIR)$(mandir)/man1/lzgrep.1
$(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(progname).1
-
-install-extra : lziprecover
- if test ! -d $(DESTDIR)$(bindir) ; then $(INSTALL) -d $(DESTDIR)$(bindir) ; fi
- $(INSTALL_SCRIPT) $(VPATH)/lzdiff $(DESTDIR)$(bindir)/lzdiff
- $(INSTALL_SCRIPT) $(VPATH)/lzgrep $(DESTDIR)$(bindir)/lzgrep
- $(INSTALL_PROGRAM) ./lziprecover $(DESTDIR)$(bindir)/lziprecover
+ $(INSTALL_DATA) $(VPATH)/doc/lziprecover.1 $(DESTDIR)$(mandir)/man1/lziprecover.1
install-strip : all
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
-uninstall : uninstall-info uninstall-man uninstall-extra
+uninstall : uninstall-info uninstall-man
+ -rm -f $(DESTDIR)$(bindir)/lzdiff
+ -rm -f $(DESTDIR)$(bindir)/lzgrep
-rm -f $(DESTDIR)$(bindir)/$(progname)
+ -rm -f $(DESTDIR)$(bindir)/lziprecover
uninstall-info :
-install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(progname).info
@@ -100,11 +103,6 @@ uninstall-info :
uninstall-man :
-rm -f $(DESTDIR)$(mandir)/man1/$(progname).1
-uninstall-extra :
- -rm -f $(DESTDIR)$(bindir)/lzdiff
- -rm -f $(DESTDIR)$(bindir)/lzgrep
- -rm -f $(DESTDIR)$(bindir)/lziprecover
-
dist :
ln -sf $(VPATH) $(DISTNAME)
tar -cvf $(DISTNAME).tar \
@@ -116,9 +114,12 @@ dist :
$(DISTNAME)/NEWS \
$(DISTNAME)/README \
$(DISTNAME)/configure \
+ $(DISTNAME)/doc/lzdiff.1 \
+ $(DISTNAME)/doc/lzgrep.1 \
$(DISTNAME)/doc/$(progname).1 \
$(DISTNAME)/doc/$(progname).info \
$(DISTNAME)/doc/$(progname).texinfo \
+ $(DISTNAME)/doc/lziprecover.1 \
$(DISTNAME)/lzdiff \
$(DISTNAME)/lzgrep \
$(DISTNAME)/testsuite/COPYING.lz \
diff --git a/NEWS b/NEWS
index 0d39426..26f2f60 100644
--- a/NEWS
+++ b/NEWS
@@ -16,11 +16,13 @@ dictionary size limit.
Flush calls have been added to decompressor to allow partial recovery
of the uncompressed data when decompressing a corrupt file.
-Lzdiff, lzgrep and lziprecover are now installed by default.
-
The dependence of "--test" on the existence of "/dev/null" has been
removed.
Some "bashisms" have been removed from lzdiff and lzgrep.
Dictionary size for options "-1" to "-4" has been changed.
+
+A build problem with the Sun C++ compiler has been fixed.
+
+Lzdiff, lzgrep and lziprecover are now installed by default.
diff --git a/configure b/configure
index b917d94..7ca05a6 100755
--- a/configure
+++ b/configure
@@ -5,13 +5,13 @@
# This configure script is free software: you have unlimited permission
# to copy, distribute and modify it.
#
-# Date of this version: 2009-06-03
+# Date of this version: 2009-06-22
invocation_name=$0
args=
no_create=
progname=lzip
-progversion=1.6-pre3
+progversion=1.6
srctrigger=lzip.h
# clear some things potentially inherited from environment.
diff --git a/doc/lzdiff.1 b/doc/lzdiff.1
new file mode 100644
index 0000000..b531605
--- /dev/null
+++ b/doc/lzdiff.1
@@ -0,0 +1,48 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH LZDIFF "1" "May 2009" "Lzdiff 0.5" "User Commands"
+.SH NAME
+Lzdiff \- manual page for Lzdiff 0.5
+.SH SYNOPSIS
+.B lzdiff
+[\fIOPTIONS\fR] [\fIDIFF_OPTIONS\fR] \fIFILE1 \fR[\fIFILE2\fR]
+.SH DESCRIPTION
+Lzdiff \- Diff/cmp wrapper for compressed files.
+.PP
+Lzdiff is a wrapper script around the diff and cmp commands that allows
+transparent comparison of any combination of compressed and
+non\-compressed files. If any given file is compressed, its uncompressed
+content is used. The supported compressors are gzip, bzip2 and lzip.
+.PP
+Compares FILE1 to FILE2. If FILE2 is omitted, compares FILE1 to the
+uncompressed contents of FILE1.[gz|bz2|lz] (depending on the default
+compressor selected). DIFF_OPTIONS are passed directly to diff or cmp.
+The exit status from diff or cmp is preserved.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-gzip\fR
+use gzip as default decompressor
+.TP
+\fB\-\-bzip2\fR
+use bzip2 as default decompressor
+.TP
+\fB\-\-lzip\fR
+use lzip as default decompressor (default)
+.TP
+\fB\-\-diff\fR
+use diff to compare files (default)
+.TP
+\fB\-\-cmp\fR
+use cmp to compare files
+.SH "REPORTING BUGS"
+Report bugs to lzip\-bug@nongnu.org
+Lzip home page: http://www.nongnu.org/lzip/lzip.html
+.SH COPYRIGHT
+Copyright \(co 2009 Antonio Diaz Diaz.
+This script is free software: you have unlimited permission
+to copy, distribute and modify it.
diff --git a/doc/lzgrep.1 b/doc/lzgrep.1
new file mode 100644
index 0000000..b4d7183
--- /dev/null
+++ b/doc/lzgrep.1
@@ -0,0 +1,42 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH LZGREP "1" "May 2009" "Lzgrep 0.5" "User Commands"
+.SH NAME
+Lzgrep \- manual page for Lzgrep 0.5
+.SH SYNOPSIS
+.B lzgrep
+[\fIOPTIONS\fR] [\fIGREP_OPTIONS\fR] \fIPATTERN \fR[\fIFILES\fR]
+.SH DESCRIPTION
+Lzgrep \- Grep wrapper for compressed files.
+.PP
+Lzgrep is a wrapper script around the grep command that allows
+transparent search on any combination of compressed and non\-compressed
+files. If any given file is compressed, its uncompressed content is
+used. If a given file does not exist, lzgrep tries the compressed file
+name corresponding to the default compressor selected. The supported
+compressors are gzip, bzip2 and lzip.
+.PP
+GREP_OPTIONS are passed directly to grep.
+The exit status from grep is preserved.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-gzip\fR
+use gzip as default decompressor
+.TP
+\fB\-\-bzip2\fR
+use bzip2 as default decompressor
+.TP
+\fB\-\-lzip\fR
+use lzip as default decompressor (default)
+.SH "REPORTING BUGS"
+Report bugs to lzip\-bug@nongnu.org
+Lzip home page: http://www.nongnu.org/lzip/lzip.html
+.SH COPYRIGHT
+Copyright \(co 2009 Antonio Diaz Diaz.
+This script is free software: you have unlimited permission
+to copy, distribute and modify it.
diff --git a/doc/lzip.1 b/doc/lzip.1
index 0ec87e3..46661ef 100644
--- a/doc/lzip.1
+++ b/doc/lzip.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH LZIP "1" "June 2009" "Lzip 1.6-pre3" "User Commands"
+.TH LZIP "1" "June 2009" "Lzip 1.6" "User Commands"
.SH NAME
-Lzip \- manual page for Lzip 1.6-pre3
+Lzip \- manual page for Lzip 1.6
.SH SYNOPSIS
.B lzip
[\fIoptions\fR] [\fIfiles\fR]
diff --git a/doc/lzip.info b/doc/lzip.info
index dc66a8b..342940b 100644
--- a/doc/lzip.info
+++ b/doc/lzip.info
@@ -11,7 +11,7 @@ File: lzip.info, Node: Top, Next: Introduction, Up: (dir)
Lzip
****
-This manual is for Lzip (version 1.6-pre3, 3 June 2009).
+This manual is for Lzip (version 1.6, 22 June 2009).
* Menu:
@@ -559,15 +559,15 @@ Concept Index

Tag Table:
Node: Top224
-Node: Introduction965
-Node: Algorithm4288
-Node: Invoking Lzip6514
-Node: File Format10861
-Node: Examples12815
-Node: Lzdiff14648
-Node: Lzgrep15967
-Node: Lziprecover17002
-Node: Problems17699
-Node: Concept Index18224
+Node: Introduction961
+Node: Algorithm4284
+Node: Invoking Lzip6510
+Node: File Format10857
+Node: Examples12811
+Node: Lzdiff14644
+Node: Lzgrep15963
+Node: Lziprecover16998
+Node: Problems17695
+Node: Concept Index18220

End Tag Table
diff --git a/doc/lzip.texinfo b/doc/lzip.texinfo
index ec20af9..de1f2ad 100644
--- a/doc/lzip.texinfo
+++ b/doc/lzip.texinfo
@@ -5,8 +5,8 @@
@finalout
@c %**end of header
-@set UPDATED 3 June 2009
-@set VERSION 1.6-pre3
+@set UPDATED 22 June 2009
+@set VERSION 1.6
@dircategory Data Compression
@direntry
diff --git a/doc/lziprecover.1 b/doc/lziprecover.1
new file mode 100644
index 0000000..6173847
--- /dev/null
+++ b/doc/lziprecover.1
@@ -0,0 +1,35 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH LZIPRECOVER "1" "June 2009" "Lziprecover 1.6" "User Commands"
+.SH NAME
+Lziprecover \- manual page for Lziprecover 1.6
+.SH SYNOPSIS
+.B lziprecover
+[\fIoptions\fR] \fIfile\fR
+.SH DESCRIPTION
+Lziprecover \- Member recoverer program for lzip compressed files.
+.PP
+Searches for members in .lz files, and writes each member in its own .lz
+file. You can then use `lzip \fB\-t\fR' to test the integrity of the resulting
+files, and decompress those which are undamaged.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+suppress all messages
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+be verbose (a 2nd \fB\-v\fR gives more)
+.SH "REPORTING BUGS"
+Report bugs to lzip\-bug@nongnu.org
+Lzip home page: http://www.nongnu.org/lzip/lzip.html
+.SH COPYRIGHT
+Copyright \(co 2009 Antonio Diaz Diaz.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/main.cc b/main.cc
index 2cb998c..52a77d9 100644
--- a/main.cc
+++ b/main.cc
@@ -541,7 +541,7 @@ int decompress( const int inhandle, const Pretty_print & pp,
}
-void signal_handler( const int ) throw()
+extern "C" void signal_handler( int ) throw()
{
show_error( "Control-C or similar caught, quitting." );
cleanup_and_fail( 0 );