From c040b46a29aa27e1b969f0190c117981d7720c6a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 8 Nov 2015 05:27:57 +0100 Subject: Merging upstream version 1.1. Signed-off-by: Daniel Baumann --- ChangeLog | 10 +++------- INSTALL | 4 ++-- NEWS | 2 +- configure | 4 ++-- doc/zcat.1 | 2 +- doc/zcmp.1 | 2 +- doc/zdiff.1 | 2 +- doc/zgrep.1 | 2 +- doc/ztest.1 | 2 +- doc/zutils.info | 22 +++++++++++----------- doc/zutils.texinfo | 5 +++-- main.cc | 2 +- zcmp.cc | 2 +- 13 files changed, 29 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 250e1db..52ee031 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,10 @@ -2013-07-07 Antonio Diaz Diaz +2013-08-02 Antonio Diaz Diaz - * Version 1.1-rc2 released. - * Fixed all uses of decompressed/uncompressed. - -2013-07-04 Antonio Diaz Diaz - - * 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 diff --git a/INSTALL b/INSTALL index fc824b2..ddb4949 100644 --- a/INSTALL +++ b/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. diff --git a/NEWS b/NEWS index b43d32d..045e9f9 100644 --- a/NEWS +++ b/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. diff --git a/configure b/configure index 2d5898f..4976e51 100755 --- a/configure +++ b/configure @@ -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 diff --git a/doc/zcat.1 b/doc/zcat.1 index 4312728..fce9e04 100644 --- a/doc/zcat.1 +++ b/doc/zcat.1 @@ -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 diff --git a/doc/zcmp.1 b/doc/zcmp.1 index e171601..ccb6692 100644 --- a/doc/zcmp.1 +++ b/doc/zcmp.1 @@ -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 diff --git a/doc/zdiff.1 b/doc/zdiff.1 index 260d8dd..4cdcdb3 100644 --- a/doc/zdiff.1 +++ b/doc/zdiff.1 @@ -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 diff --git a/doc/zgrep.1 b/doc/zgrep.1 index cc85d0a..275221f 100644 --- a/doc/zgrep.1 +++ b/doc/zgrep.1 @@ -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 diff --git a/doc/ztest.1 b/doc/ztest.1 index f9c4825..02b15e2 100644 --- a/doc/ztest.1 +++ b/doc/ztest.1 @@ -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 diff --git a/doc/zutils.info b/doc/zutils.info index 866d975..4cba8af 100644 --- a/doc/zutils.info +++ b/doc/zutils.info @@ -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 diff --git a/doc/zutils.texinfo b/doc/zutils.texinfo index 61a8762..ea635ba 100644 --- a/doc/zutils.texinfo +++ b/doc/zutils.texinfo @@ -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 is one of @samp{bz2}, @samp{gz}, @samp{lz} or @samp{xz}. @end enumerate + @node Zcat @chapter Zcat @cindex zcat diff --git a/main.cc b/main.cc index 672d159..e6d2d18 100644 --- a/main.cc +++ b/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(); diff --git a/zcmp.cc b/zcmp.cc index 48731a3..8f362c3 100644 --- a/zcmp.cc +++ b/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; -- cgit v1.2.3