diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | INSTALL | 12 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | arg_parser.cc | 3 | ||||
| -rw-r--r-- | arg_parser.h | 3 | ||||
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | doc/zcat.1 | 6 | ||||
| -rw-r--r-- | doc/zcmp.1 | 8 | ||||
| -rw-r--r-- | doc/zdiff.1 | 8 | ||||
| -rw-r--r-- | doc/zgrep.1 | 6 | ||||
| -rw-r--r-- | doc/ztest.1 | 6 | ||||
| -rw-r--r-- | doc/zupdate.1 | 6 | ||||
| -rw-r--r-- | doc/zutils.info | 26 | ||||
| -rw-r--r-- | doc/zutils.texi | 7 | ||||
| -rw-r--r-- | rc.cc | 5 | ||||
| -rw-r--r-- | rc.h | 2 | ||||
| -rw-r--r-- | recursive.cc | 2 | ||||
| -rwxr-xr-x | testsuite/check.sh | 6 | ||||
| -rw-r--r-- | zcat.cc | 2 | ||||
| -rw-r--r-- | zcmp.cc | 2 | ||||
| -rw-r--r-- | zcmpdiff.cc | 2 | ||||
| -rw-r--r-- | zdiff.cc | 2 | ||||
| -rw-r--r-- | zgrep.cc | 2 | ||||
| -rw-r--r-- | ztest.cc | 4 | ||||
| -rw-r--r-- | zupdate.cc | 2 | ||||
| -rw-r--r-- | zutils.cc | 2 | ||||
| -rw-r--r-- | zutils.h | 2 |
28 files changed, 75 insertions, 83 deletions
@@ -1,17 +1,9 @@ -2014-07-27 Antonio Diaz Diaz <antonio@gnu.org> +2014-08-30 Antonio Diaz Diaz <antonio@gnu.org> - * Version 1.3-rc1 released. - * Added two missing #includes. - -2014-07-18 Antonio Diaz Diaz <antonio@gnu.org> - - * Version 1.3-pre2 released. + * Version 1.3 released. * testsuite/check.sh: Fixed two values of expected exit status. * zutils.texi: Documented that '--format' does not verify format. - -2014-06-28 Antonio Diaz Diaz <antonio@gnu.org> - - * Version 1.3-pre1 released. + * Added two missing #includes. * License changed to GPL version 2 or later. 2014-02-01 Antonio Diaz Diaz <antonio@gnu.org> @@ -118,7 +110,7 @@ * Version 0.1 released. -Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. +Copyright (C) 2009-2014 Antonio Diaz Diaz. This file is a collection of facts, and thus it is not copyrightable, but just in case, you have unlimited permission to copy, distribute and @@ -1,11 +1,13 @@ Requirements ------------ -You will need a C++ compiler, (de)compressors for bzip2 and gzip -formats, and a compressor for the lzip format. -I use gcc 4.8.1 and 3.3.6, but the code should compile with any +You will need a C++ compiler. +I use gcc 4.9.1 and 3.3.6, but the code should compile with any standards compliant compiler. Gcc is available at http://gcc.gnu.org. +Compressors for bzip2, gzip and lzip formats are required to run the +tests. + If you are installing zutils along with GNU gzip and want to keep the gzip scripts, the recommended method is to configure gzip as follows: @@ -42,7 +44,7 @@ the main archive. 5. Type 'make install' to install the programs and any data files and documentation. - You can install only the programs, the info manual or the man pages + You can install only the programs, the info manual or the man pages by typing 'make install-bin', 'make install-info' or 'make install-man' respectively. @@ -64,7 +66,7 @@ After running 'configure', you can run 'make' and 'make install' as explained above. -Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. +Copyright (C) 2009-2014 Antonio Diaz Diaz. This file is free documentation: you have unlimited permission to copy, distribute and modify it. @@ -3,10 +3,10 @@ Changes in version 1.3: Two incomplete values of expected exit status producing sporadic failures of the tests have been fixed. -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. + +The license has been changed to GPL version 2 or later. @@ -32,7 +32,7 @@ have been compressed. Decompressed is used to refer to data which has undergone the process of decompression. -Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. +Copyright (C) 2009-2014 Antonio Diaz Diaz. This file is free documentation: you have unlimited permission to copy, distribute and modify it. diff --git a/arg_parser.cc b/arg_parser.cc index ef4bbd0..74f9298 100644 --- a/arg_parser.cc +++ b/arg_parser.cc @@ -1,6 +1,5 @@ /* Arg_parser - POSIX/GNU command line argument parser. (C++ version) - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 - Antonio Diaz Diaz. + Copyright (C) 2006-2014 Antonio Diaz Diaz. This library is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/arg_parser.h b/arg_parser.h index 1b88f62..d80c353 100644 --- a/arg_parser.h +++ b/arg_parser.h @@ -1,6 +1,5 @@ /* Arg_parser - POSIX/GNU command line argument parser. (C++ version) - Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 - Antonio Diaz Diaz. + Copyright (C) 2006-2014 Antonio Diaz Diaz. This library is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,12 +1,12 @@ #! /bin/sh # configure script for Zutils - Utilities dealing with compressed files -# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. +# Copyright (C) 2009-2014 Antonio Diaz Diaz. # # This configure script is free software: you have unlimited permission # to copy, distribute and modify it. pkgname=zutils -pkgversion=1.3-rc1 +pkgversion=1.3 srctrigger=doc/${pkgname}.texi # clear some things potentially inherited from environment. @@ -71,8 +71,8 @@ while [ $# != 0 ] ; do echo " CPPFLAGS=OPTIONS command line options for the preprocessor [${CPPFLAGS}]" echo " CXXFLAGS=OPTIONS command line options for the C++ compiler [${CXXFLAGS}]" echo " LDFLAGS=OPTIONS command line options for the linker [${LDFLAGS}]" - echo " DIFF=NAME diff program to use with zdiff [diff]" - echo " GREP=NAME grep program to use with zgrep [grep]" + echo " DIFF=NAME diff program to use with zdiff [${DIFF}]" + echo " GREP=NAME grep program to use with zgrep [${GREP}]" echo exit 0 ;; --version | -V) @@ -177,7 +177,7 @@ echo "GREP = ${GREP}" rm -f Makefile cat > Makefile << EOF # Makefile for Zutils - Utilities dealing with compressed files -# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. +# Copyright (C) 2009-2014 Antonio Diaz Diaz. # This file was generated automatically by configure. Do not edit. # # This Makefile is free software: you have unlimited permission @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZCAT "1" "July 2014" "zcat (zutils) 1.3-rc1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. +.TH ZCAT "1" "August 2014" "zcat (zutils) 1.3" "User Commands" .SH NAME zcat \- decompress and concatenate files to standard output .SH SYNOPSIS .B zcat -[\fIoptions\fR] [\fIfiles\fR] +[\fI\,options\/\fR] [\fI\,files\/\fR] .SH DESCRIPTION Zcat copies each given file ("\-" means standard input), to standard output. If any given file is compressed, its decompressed content is @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZCMP "1" "July 2014" "zcmp (zutils) 1.3-rc1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. +.TH ZCMP "1" "August 2014" "zcmp (zutils) 1.3" "User Commands" .SH NAME zcmp \- decompress and compare two files byte by byte .SH SYNOPSIS .B zcmp -[\fIoptions\fR] \fIfile1 \fR[\fIfile2\fR] +[\fI\,options\/\fR] \fI\,file1 \/\fR[\fI\,file2\/\fR] .SH DESCRIPTION Zcmp compares two files ("\-" means standard input), and if they differ, tells the first byte and line number where they differ. Bytes @@ -39,7 +39,7 @@ output version information and exit \fB\-b\fR, \fB\-\-print\-bytes\fR print differing bytes .TP -\fB\-\-format\fR=\fI[\fR<fmt1>][,<fmt2>] +\fB\-\-format\fR=\fI\,[\/\fR<fmt1>][,<fmt2>] force given formats (bz2, gz, lz, xz) .TP \fB\-i\fR, \fB\-\-ignore\-initial=\fR<n>[,<n2>] diff --git a/doc/zdiff.1 b/doc/zdiff.1 index 28559cb..5675471 100644 --- a/doc/zdiff.1 +++ b/doc/zdiff.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZDIFF "1" "July 2014" "zdiff (zutils) 1.3-rc1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. +.TH ZDIFF "1" "August 2014" "zdiff (zutils) 1.3" "User Commands" .SH NAME zdiff \- decompress and compare two files line by line .SH SYNOPSIS .B zdiff -[\fIoptions\fR] \fIfile1 \fR[\fIfile2\fR] +[\fI\,options\/\fR] \fI\,file1 \/\fR[\fI\,file2\/\fR] .SH DESCRIPTION Zdiff compares two files ("\-" means standard input), and if they differ, shows the differences line by line. If any given file is @@ -57,7 +57,7 @@ try hard to find a smaller set of changes \fB\-E\fR, \fB\-\-ignore\-tab\-expansion\fR ignore changes due to tab expansion .TP -\fB\-\-format\fR=\fI[\fR<fmt1>][,<fmt2>] +\fB\-\-format\fR=\fI\,[\/\fR<fmt1>][,<fmt2>] force given formats (bz2, gz, lz, xz) .TP \fB\-i\fR, \fB\-\-ignore\-case\fR diff --git a/doc/zgrep.1 b/doc/zgrep.1 index f832883..20574aa 100644 --- a/doc/zgrep.1 +++ b/doc/zgrep.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZGREP "1" "July 2014" "zgrep (zutils) 1.3-rc1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. +.TH ZGREP "1" "August 2014" "zgrep (zutils) 1.3" "User Commands" .SH NAME zgrep \- search compressed files for a regular expression .SH SYNOPSIS .B zgrep -[\fIoptions\fR] \fI<pattern> \fR[\fIfiles\fR] +[\fI\,options\/\fR] \fI\,<pattern> \/\fR[\fI\,files\/\fR] .SH DESCRIPTION Zgrep is a front end to the grep program that allows transparent search on any combination of compressed and uncompressed files. If any given diff --git a/doc/ztest.1 b/doc/ztest.1 index e43fc6a..66ddc70 100644 --- a/doc/ztest.1 +++ b/doc/ztest.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZTEST "1" "July 2014" "ztest (zutils) 1.3-rc1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. +.TH ZTEST "1" "August 2014" "ztest (zutils) 1.3" "User Commands" .SH NAME ztest \- verify integrity of compressed files .SH SYNOPSIS .B ztest -[\fIoptions\fR] [\fIfiles\fR] +[\fI\,options\/\fR] [\fI\,files\/\fR] .SH DESCRIPTION Ztest verifies the integrity of the specified compressed files. Uncompressed files are ignored. If no files are specified, the integrity diff --git a/doc/zupdate.1 b/doc/zupdate.1 index 6cb7cde..4f862f2 100644 --- a/doc/zupdate.1 +++ b/doc/zupdate.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZUPDATE "1" "July 2014" "zupdate (zutils) 1.3-rc1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. +.TH ZUPDATE "1" "August 2014" "zupdate (zutils) 1.3" "User Commands" .SH NAME zupdate \- recompress bzip2, gzip, xz files to lzip files .SH SYNOPSIS .B zupdate -[\fIoptions\fR] [\fIfiles\fR] +[\fI\,options\/\fR] [\fI\,files\/\fR] .SH DESCRIPTION Zupdate recompresses files from bzip2, gzip, and xz formats to lzip format. The originals are compared with the new files and then deleted. diff --git a/doc/zutils.info b/doc/zutils.info index 9db1862..ac3c7a5 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-rc1, 27 July 2014). +This manual is for Zutils (version 1.3, 30 August 2014). * Menu: @@ -29,7 +29,7 @@ This manual is for Zutils (version 1.3-rc1, 27 July 2014). * Concept index:: Index of concepts - Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2009-2014 Antonio Diaz Diaz. This manual is free documentation: you have unlimited permission to copy, distribute and modify it. @@ -708,17 +708,17 @@ Concept index Tag Table: Node: Top222 -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 +Node: Introduction1128 +Node: Common options3475 +Node: The zutilsrc file4724 +Node: Zcat5650 +Node: Zcmp7572 +Node: Zdiff9896 +Node: Zgrep12399 +Node: Ztest15367 +Node: Zupdate16591 +Node: Problems18979 +Node: Concept index19513 End Tag Table diff --git a/doc/zutils.texi b/doc/zutils.texi index dee89b3..6737c72 100644 --- a/doc/zutils.texi +++ b/doc/zutils.texi @@ -6,8 +6,8 @@ @finalout @c %**end of header -@set UPDATED 27 July 2014 -@set VERSION 1.3-rc1 +@set UPDATED 30 August 2014 +@set VERSION 1.3 @dircategory Data Compression @direntry @@ -49,8 +49,7 @@ This manual is for Zutils (version @value{VERSION}, @value{UPDATED}). @end menu @sp 1 -Copyright @copyright{} 2009, 2010, 2011, 2012, 2013, 2014 -Antonio Diaz Diaz. +Copyright @copyright{} 2009-2014 Antonio Diaz Diaz. This manual is free documentation: you have unlimited permission to copy, distribute and modify it. @@ -1,5 +1,5 @@ /* Zutils - Utilities dealing with compressed files - Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2009-2014 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -227,7 +227,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 && - compressor_names[format_index].size() ) + compressor_names[format_index].size() && + compressor_names[format_index][0] != '-' ) return compressor_names[format_index].c_str(); return 0; } @@ -1,5 +1,5 @@ /* Zutils - Utilities dealing with compressed files - Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2009-2014 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/recursive.cc b/recursive.cc index 72be833..8c39121 100644 --- a/recursive.cc +++ b/recursive.cc @@ -1,5 +1,5 @@ /* Zutils - Utilities dealing with compressed files - Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2009-2014 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/testsuite/check.sh b/testsuite/check.sh index 1cf52a2..c2d67f4 100755 --- a/testsuite/check.sh +++ b/testsuite/check.sh @@ -1,6 +1,6 @@ #! /bin/sh # check script for Zutils - Utilities dealing with compressed files -# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. +# Copyright (C) 2009-2014 Antonio Diaz Diaz. # # This script is free software: you have unlimited permission # to copy, distribute and modify it. @@ -22,8 +22,8 @@ extensions="bz2 gz lz" compressor_needed() { echo "${compressors} are needed to run tests" ; exit 1 ; } framework_failure() { echo "failure in testing framework" ; exit 1 ; } -if [ ! -f "${ZCAT}" ] || [ ! -x "${ZCAT}" ] ; then - echo "${ZCAT}: cannot execute" +if [ ! -f "${ZUPDATE}" ] || [ ! -x "${ZUPDATE}" ] ; then + echo "${ZUPDATE}: cannot execute" exit 1 fi @@ -1,5 +1,5 @@ /* Zcat - decompress and concatenate files to standard output - Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2010-2014 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* Zcmp - decompress and compare two files byte by byte - Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2010-2014 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/zcmpdiff.cc b/zcmpdiff.cc index 2308a86..70fa986 100644 --- a/zcmpdiff.cc +++ b/zcmpdiff.cc @@ -1,5 +1,5 @@ /* Common code for zcmp and zdiff - Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2010-2014 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* Zdiff - decompress and compare two files line by line - Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2010-2014 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* Zgrep - search compressed files for a regular expression - Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2010-2014 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* Ztest - verify integrity of compressed files - Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2010-2014 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -164,7 +164,7 @@ int ztest_file( const int infd, int format_index, { if( disable_xz < 0 ) { - std::string command( compressor_name ); command += " -V > /dev/null"; + std::string command( compressor_name ); command += " -V > /dev/null 2>&1"; disable_xz = ( std::system( command.c_str() ) != 0 ); } if( disable_xz ) return 0; // ignore this file if no xz installed @@ -206,7 +206,7 @@ int zupdate_file( const std::string & name, const char * const lzip_name, { if( disable_xz < 0 ) { - std::string command( compressor_name ); command += " -V > /dev/null"; + std::string command( compressor_name ); command += " -V > /dev/null 2>&1"; disable_xz = ( std::system( command.c_str() ) != 0 ); } if( disable_xz ) return 0; // ignore this file if no xz installed @@ -1,5 +1,5 @@ /* Zutils - Utilities dealing with compressed files - Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2009-2014 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* Zutils - Utilities dealing with compressed files - Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2009-2014 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |