From bdbf8e64012d4c5737f2bebbe2a0174ddb4923b8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 8 Nov 2015 05:38:54 +0100 Subject: Merging upstream version 1.3~rc1. Signed-off-by: Daniel Baumann --- ChangeLog | 5 +++++ NEWS | 2 ++ README | 5 +++++ configure | 2 +- doc/zcat.1 | 2 +- doc/zcmp.1 | 2 +- doc/zdiff.1 | 2 +- doc/zgrep.1 | 2 +- doc/ztest.1 | 2 +- doc/zupdate.1 | 2 +- doc/zutils.info | 24 ++++++++++++------------ doc/zutils.texi | 4 ++-- rc.cc | 7 ++++--- zupdate.cc | 1 + zutils.cc | 1 + 15 files changed, 39 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index d539a3a..aa0225d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-07-27 Antonio Diaz Diaz + + * Version 1.3-rc1 released. + * Added two missing #includes. + 2014-07-18 Antonio Diaz Diaz * Version 1.3-pre2 released. diff --git a/NEWS b/NEWS index 1f0ed14..d2c03fd 100644 --- a/NEWS +++ b/NEWS @@ -8,3 +8,5 @@ The license has been changed to GPL version 2 or later. It has been documented that the "--format" option does not verify the format, allowing for example the processing of compress'd (.Z) files with gzip. + +Minor fixes. diff --git a/README b/README index 0658c51..e20111c 100644 --- a/README +++ b/README @@ -22,6 +22,11 @@ NOTE: Bzip2 and lzip provide well-defined values of exit status, which makes them safe to use with zutils. Gzip and xz may return ambiguous warning values, making them less reliable back ends for zutils. +FORMAT NOTE: If the "--format" option is given, the corresponding files +are passed to the decompressor without verifying their format, allowing +for example the processing of compress'd (.Z) files with gzip: +"zcmp --format=gz file.Z file.lz". + LANGUAGE NOTE: Uncompressed = not compressed = plain data; it may never have been compressed. Decompressed is used to refer to data which has undergone the process of decompression. diff --git a/configure b/configure index 9fd5fa9..fdf4fcb 100755 --- a/configure +++ b/configure @@ -6,7 +6,7 @@ # to copy, distribute and modify it. pkgname=zutils -pkgversion=1.3-pre2 +pkgversion=1.3-rc1 srctrigger=doc/${pkgname}.texi # clear some things potentially inherited from environment. diff --git a/doc/zcat.1 b/doc/zcat.1 index 58b1335..975a53a 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 2014" "zcat (zutils) 1.3-pre2" "User Commands" +.TH ZCAT "1" "July 2014" "zcat (zutils) 1.3-rc1" "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 60ffae4..2710610 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 2014" "zcmp (zutils) 1.3-pre2" "User Commands" +.TH ZCMP "1" "July 2014" "zcmp (zutils) 1.3-rc1" "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 146a7e3..28559cb 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 2014" "zdiff (zutils) 1.3-pre2" "User Commands" +.TH ZDIFF "1" "July 2014" "zdiff (zutils) 1.3-rc1" "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 203938a..f832883 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 2014" "zgrep (zutils) 1.3-pre2" "User Commands" +.TH ZGREP "1" "July 2014" "zgrep (zutils) 1.3-rc1" "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 44fcbc5..e43fc6a 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 2014" "ztest (zutils) 1.3-pre2" "User Commands" +.TH ZTEST "1" "July 2014" "ztest (zutils) 1.3-rc1" "User Commands" .SH NAME ztest \- verify integrity of compressed files .SH SYNOPSIS diff --git a/doc/zupdate.1 b/doc/zupdate.1 index ef23251..6cb7cde 100644 --- a/doc/zupdate.1 +++ b/doc/zupdate.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZUPDATE "1" "July 2014" "zupdate (zutils) 1.3-pre2" "User Commands" +.TH ZUPDATE "1" "July 2014" "zupdate (zutils) 1.3-rc1" "User Commands" .SH NAME zupdate \- recompress bzip2, gzip, xz files to lzip files .SH SYNOPSIS diff --git a/doc/zutils.info b/doc/zutils.info index 7cc74aa..9db1862 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.3-pre2, 17 July 2014). +This manual is for Zutils (version 1.3-rc1, 27 July 2014). * Menu: @@ -708,17 +708,17 @@ Concept index  Tag Table: Node: Top222 -Node: Introduction1156 -Node: Common options3503 -Node: The zutilsrc file4752 -Node: Zcat5678 -Node: Zcmp7600 -Node: Zdiff9924 -Node: Zgrep12427 -Node: Ztest15395 -Node: Zupdate16619 -Node: Problems19007 -Node: Concept index19541 +Node: Introduction1155 +Node: Common options3502 +Node: The zutilsrc file4751 +Node: Zcat5677 +Node: Zcmp7599 +Node: Zdiff9923 +Node: Zgrep12426 +Node: Ztest15394 +Node: Zupdate16618 +Node: Problems19006 +Node: Concept index19540  End Tag Table diff --git a/doc/zutils.texi b/doc/zutils.texi index f09e5e9..dee89b3 100644 --- a/doc/zutils.texi +++ b/doc/zutils.texi @@ -6,8 +6,8 @@ @finalout @c %**end of header -@set UPDATED 17 July 2014 -@set VERSION 1.3-pre2 +@set UPDATED 27 July 2014 +@set VERSION 1.3-rc1 @dircategory Data Compression @direntry diff --git a/rc.cc b/rc.cc index 3b78f2b..211bcee 100644 --- a/rc.cc +++ b/rc.cc @@ -122,8 +122,8 @@ bool parse_rc_line( const std::string & line, return false; } const std::string name( line, l, i - l ); int format_index = -1; - for( int i = 0; i < num_formats; ++i ) - if( name == format_names[i] ) { format_index = i; break; } + for( int j = 0; j < num_formats; ++j ) + if( name == format_names[j] ) { format_index = j; break; } if( format_index < 0 ) { if( verbosity >= 0 ) std::fprintf( stderr, "%s %d: bad format name '%s'\n", @@ -226,7 +226,8 @@ void parse_compressor( const std::string & arg, const int format_index, const char * get_compressor_name( const int format_index ) { - if( format_index >= 0 && format_index < num_formats ) + if( format_index >= 0 && format_index < num_formats && + compressor_names[format_index].size() ) return compressor_names[format_index].c_str(); return 0; } diff --git a/zupdate.cc b/zupdate.cc index 2b3244b..ddaa0eb 100644 --- a/zupdate.cc +++ b/zupdate.cc @@ -32,6 +32,7 @@ #include #include #include +#include #if defined(__MSVCRT__) || defined(__OS2__) #include #endif diff --git a/zutils.cc b/zutils.cc index 8d7b6c8..012a678 100644 --- a/zutils.cc +++ b/zutils.cc @@ -18,6 +18,7 @@ #define _FILE_OFFSET_BITS 64 #include +#include #include #include #include -- cgit v1.2.3