Merging upstream version 1.1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
b7818a4f94
commit
e938d945e2
13 changed files with 29 additions and 32 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,14 +1,10 @@
|
|||
2013-07-07 Antonio Diaz Diaz <antonio@gnu.org>
|
||||
2013-08-02 Antonio Diaz Diaz <antonio@gnu.org>
|
||||
|
||||
* Version 1.1-rc2 released.
|
||||
* Fixed all uses of decompressed/uncompressed.
|
||||
|
||||
2013-07-04 Antonio Diaz Diaz <antonio@gnu.org>
|
||||
|
||||
* Version 1.1-rc1 released.
|
||||
* Version 1.1 released.
|
||||
* Added options '--bz2', '--gz', '--lz' and '--xz' to all utilities.
|
||||
* Added runtime configuration file 'zutilsrc'.
|
||||
* New function 'good_status' checks exit status of all children.
|
||||
* Fixed all uses of decompressed/uncompressed in the documentation.
|
||||
|
||||
2013-05-31 Antonio Diaz Diaz <antonio@gnu.org>
|
||||
|
||||
|
|
4
INSTALL
4
INSTALL
|
@ -19,9 +19,9 @@ Procedure
|
|||
---------
|
||||
1. Unpack the archive if you have not done so already:
|
||||
|
||||
lzip -cd zutils[version].tar.lz | tar -xf -
|
||||
tar -xf zutils[version].tar.lz
|
||||
or
|
||||
gzip -cd zutils[version].tar.gz | tar -xf -
|
||||
lzip -cd zutils[version].tar.lz | tar -xf -
|
||||
|
||||
This creates the directory ./zutils[version] containing the source from
|
||||
the main archive.
|
||||
|
|
2
NEWS
2
NEWS
|
@ -8,5 +8,5 @@ allows the user change the compressor to be used for each format.
|
|||
|
||||
The checking of the exit status of compressors has been improved.
|
||||
|
||||
The use of "decompressed" and "uncompressed" in the documentation have
|
||||
The use of "decompressed" and "uncompressed" in the documentation has
|
||||
been revised.
|
||||
|
|
4
configure
vendored
4
configure
vendored
|
@ -6,9 +6,9 @@
|
|||
# to copy, distribute and modify it.
|
||||
|
||||
pkgname=zutils
|
||||
pkgversion=1.1-rc2
|
||||
pkgversion=1.1
|
||||
progname=zutils
|
||||
srctrigger=${pkgname}rc
|
||||
srctrigger=doc/${pkgname}.texinfo
|
||||
|
||||
# clear some things potentially inherited from environment.
|
||||
LC_ALL=C
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
|
||||
.TH ZCAT "1" "July 2013" "Zcat (zutils) 1.1-rc2" "User Commands"
|
||||
.TH ZCAT "1" "August 2013" "Zcat (zutils) 1.1" "User Commands"
|
||||
.SH NAME
|
||||
Zcat \- decompress and concatenate files to standard output
|
||||
.SH SYNOPSIS
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
|
||||
.TH ZCMP "1" "July 2013" "Zcmp (zutils) 1.1-rc2" "User Commands"
|
||||
.TH ZCMP "1" "August 2013" "Zcmp (zutils) 1.1" "User Commands"
|
||||
.SH NAME
|
||||
Zcmp \- decompress and compare two files byte by byte
|
||||
.SH SYNOPSIS
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
|
||||
.TH ZDIFF "1" "July 2013" "Zdiff (zutils) 1.1-rc2" "User Commands"
|
||||
.TH ZDIFF "1" "August 2013" "Zdiff (zutils) 1.1" "User Commands"
|
||||
.SH NAME
|
||||
Zdiff \- decompress and compare two files line by line
|
||||
.SH SYNOPSIS
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
|
||||
.TH ZGREP "1" "July 2013" "Zgrep (zutils) 1.1-rc2" "User Commands"
|
||||
.TH ZGREP "1" "August 2013" "Zgrep (zutils) 1.1" "User Commands"
|
||||
.SH NAME
|
||||
Zgrep \- search compressed files for a regular expression
|
||||
.SH SYNOPSIS
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
|
||||
.TH ZTEST "1" "July 2013" "Ztest (zutils) 1.1-rc2" "User Commands"
|
||||
.TH ZTEST "1" "August 2013" "Ztest (zutils) 1.1" "User Commands"
|
||||
.SH NAME
|
||||
Ztest \- verify integrity of compressed files
|
||||
.SH SYNOPSIS
|
||||
|
|
|
@ -12,7 +12,7 @@ File: zutils.info, Node: Top, Next: Introduction, Up: (dir)
|
|||
Zutils Manual
|
||||
*************
|
||||
|
||||
This manual is for Zutils (version 1.1-rc2, 7 July 2013).
|
||||
This manual is for Zutils (version 1.1, 2 August 2013).
|
||||
|
||||
* Menu:
|
||||
|
||||
|
@ -626,16 +626,16 @@ Concept index
|
|||
|
||||
Tag Table:
|
||||
Node: Top224
|
||||
Node: Introduction1097
|
||||
Node: Common options3155
|
||||
Node: The zutilsrc file4404
|
||||
Node: Zcat5330
|
||||
Node: Zcmp7252
|
||||
Node: Zdiff9576
|
||||
Node: Zgrep12079
|
||||
Node: Ztest14916
|
||||
Node: Problems16141
|
||||
Node: Concept index16670
|
||||
Node: Introduction1095
|
||||
Node: Common options3153
|
||||
Node: The zutilsrc file4402
|
||||
Node: Zcat5328
|
||||
Node: Zcmp7250
|
||||
Node: Zdiff9574
|
||||
Node: Zgrep12077
|
||||
Node: Ztest14914
|
||||
Node: Problems16139
|
||||
Node: Concept index16668
|
||||
|
||||
End Tag Table
|
||||
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
@finalout
|
||||
@c %**end of header
|
||||
|
||||
@set UPDATED 7 July 2013
|
||||
@set VERSION 1.1-rc2
|
||||
@set UPDATED 2 August 2013
|
||||
@set VERSION 1.1
|
||||
|
||||
@dircategory Data Compression
|
||||
@direntry
|
||||
|
@ -177,6 +177,7 @@ format, with the syntax:
|
|||
where <format> is one of @samp{bz2}, @samp{gz}, @samp{lz} or @samp{xz}.
|
||||
@end enumerate
|
||||
|
||||
|
||||
@node Zcat
|
||||
@chapter Zcat
|
||||
@cindex zcat
|
||||
|
|
2
main.cc
2
main.cc
|
@ -384,7 +384,7 @@ int main( const int argc, const char * const argv[] )
|
|||
if( grep_show_name < 0 )
|
||||
grep_show_name = ( filenames.size() != 1 || recursive );
|
||||
|
||||
int retval = ( ( program_mode == m_zgrep ) ? 1 : 0 );
|
||||
int retval = ( program_mode == m_zgrep ) ? 1 : 0;
|
||||
while( !filenames.empty() )
|
||||
{
|
||||
input_filename = filenames.front();
|
||||
|
|
2
zcmp.cc
2
zcmp.cc
|
@ -223,7 +223,7 @@ int cmp( const long long max_size, const int infd[2],
|
|||
unsigned long long byte_number = 1;
|
||||
unsigned long long line_number = 1;
|
||||
// remaining number of bytes to compare
|
||||
long long rest = ( ( max_size >= 0 ) ? max_size : buffer_size );
|
||||
long long rest = ( max_size >= 0 ) ? max_size : buffer_size;
|
||||
// buffers with space for sentinels at the end
|
||||
uint8_t * const buffer0 = new uint8_t[2*(buffer_size+1)];
|
||||
uint8_t * const buffer1 = buffer0 + buffer_size + 1;
|
||||
|
|
Loading…
Add table
Reference in a new issue