lzip/zutils
1
0
Fork 0
Code Issues Activity

Adding upstream version 1.3.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 05:49:30 +01:00
parent 3e596265aa
commit 8373449c0a
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
28 changed files with 75 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -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. * Version 1.3 released.
* Added two missing #includes.
2014-07-18 Antonio Diaz Diaz <antonio@gnu.org>
* Version 1.3-pre2 released.
* testsuite/check.sh: Fixed two values of expected exit status. * testsuite/check.sh: Fixed two values of expected exit status.
* zutils.texi: Documented that '--format' does not verify format. * zutils.texi: Documented that '--format' does not verify format.
* Added two missing #includes.
2014-06-28 Antonio Diaz Diaz <antonio@gnu.org>
* Version 1.3-pre1 released.
* License changed to GPL version 2 or later. * License changed to GPL version 2 or later.
2014-02-01 Antonio Diaz Diaz <antonio@gnu.org> 2014-02-01 Antonio Diaz Diaz <antonio@gnu.org>
@ -118,7 +110,7 @@
* Version 0.1 released. * 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, 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 but just in case, you have unlimited permission to copy, distribute and

12
INSTALL
View file

@ -1,11 +1,13 @@
Requirements Requirements
------------ ------------
You will need a C++ compiler, (de)compressors for bzip2 and gzip You will need a C++ compiler.
formats, and a compressor for the lzip format. I use gcc 4.9.1 and 3.3.6, but the code should compile with any
I use gcc 4.8.1 and 3.3.6, but the code should compile with any
standards compliant compiler. standards compliant compiler.
Gcc is available at http://gcc.gnu.org. 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 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: 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 5. Type 'make install' to install the programs and any data files and
documentation. 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' typing 'make install-bin', 'make install-info' or 'make install-man'
respectively. respectively.
@ -64,7 +66,7 @@ After running 'configure', you can run 'make' and 'make install' as
explained above. 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, This file is free documentation: you have unlimited permission to copy,
distribute and modify it. distribute and modify it.

4
NEWS
View file

@ -3,10 +3,10 @@ Changes in version 1.3:
Two incomplete values of expected exit status producing sporadic Two incomplete values of expected exit status producing sporadic
failures of the tests have been fixed. 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 It has been documented that the "--format" option does not verify the
format, allowing for example the processing of compress'd (.Z) files format, allowing for example the processing of compress'd (.Z) files
with gzip. with gzip.
Minor fixes. Minor fixes.
The license has been changed to GPL version 2 or later.

2
README
View file

@ -32,7 +32,7 @@ have been compressed. Decompressed is used to refer to data which has
undergone the process of decompression. 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, This file is free documentation: you have unlimited permission to copy,
distribute and modify it. distribute and modify it.

3
arg_parser.cc
View file

@ -1,6 +1,5 @@
/* Arg_parser - POSIX/GNU command line argument parser. (C++ version) /* Arg_parser - POSIX/GNU command line argument parser. (C++ version)
Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Copyright (C) 2006-2014 Antonio Diaz Diaz.
Antonio Diaz Diaz.
This library is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by

3
arg_parser.h
View file

@ -1,6 +1,5 @@
/* Arg_parser - POSIX/GNU command line argument parser. (C++ version) /* Arg_parser - POSIX/GNU command line argument parser. (C++ version)
Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Copyright (C) 2006-2014 Antonio Diaz Diaz.
Antonio Diaz Diaz.
This library is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by

10
configure vendored
View file

@ -1,12 +1,12 @@
#! /bin/sh #! /bin/sh
# configure script for Zutils - Utilities dealing with compressed files # 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 # This configure script is free software: you have unlimited permission
# to copy, distribute and modify it. # to copy, distribute and modify it.
pkgname=zutils pkgname=zutils
pkgversion=1.3-rc1 pkgversion=1.3
srctrigger=doc/${pkgname}.texi srctrigger=doc/${pkgname}.texi
# clear some things potentially inherited from environment. # 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 " CPPFLAGS=OPTIONS command line options for the preprocessor [${CPPFLAGS}]"
echo " CXXFLAGS=OPTIONS command line options for the C++ compiler [${CXXFLAGS}]" echo " CXXFLAGS=OPTIONS command line options for the C++ compiler [${CXXFLAGS}]"
echo " LDFLAGS=OPTIONS command line options for the linker [${LDFLAGS}]" echo " LDFLAGS=OPTIONS command line options for the linker [${LDFLAGS}]"
echo " DIFF=NAME diff program to use with zdiff [diff]" echo " DIFF=NAME diff program to use with zdiff [${DIFF}]"
echo " GREP=NAME grep program to use with zgrep [grep]" echo " GREP=NAME grep program to use with zgrep [${GREP}]"
echo echo
exit 0 ;; exit 0 ;;
--version | -V) --version | -V)
@ -177,7 +177,7 @@ echo "GREP = ${GREP}"
rm -f Makefile rm -f Makefile
cat > Makefile << EOF cat > Makefile << EOF
# Makefile for Zutils - Utilities dealing with compressed files # 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 file was generated automatically by configure. Do not edit.
# #
# This Makefile is free software: you have unlimited permission # This Makefile is free software: you have unlimited permission

6
doc/zcat.1
View file

@ -1,10 +1,10 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1.
.TH ZCAT "1" "July 2014" "zcat (zutils) 1.3-rc1" "User Commands" .TH ZCAT "1" "August 2014" "zcat (zutils) 1.3" "User Commands"
.SH NAME .SH NAME
zcat \- decompress and concatenate files to standard output zcat \- decompress and concatenate files to standard output
.SH SYNOPSIS .SH SYNOPSIS
.B zcat .B zcat
[\fIoptions\fR] [\fIfiles\fR] [\fI\,options\/\fR] [\fI\,files\/\fR]
.SH DESCRIPTION .SH DESCRIPTION
Zcat copies each given file ("\-" means standard input), to standard Zcat copies each given file ("\-" means standard input), to standard
output. If any given file is compressed, its decompressed content is output. If any given file is compressed, its decompressed content is

8
doc/zcmp.1
View file

@ -1,10 +1,10 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1.
.TH ZCMP "1" "July 2014" "zcmp (zutils) 1.3-rc1" "User Commands" .TH ZCMP "1" "August 2014" "zcmp (zutils) 1.3" "User Commands"
.SH NAME .SH NAME
zcmp \- decompress and compare two files byte by byte zcmp \- decompress and compare two files byte by byte
.SH SYNOPSIS .SH SYNOPSIS
.B zcmp .B zcmp
[\fIoptions\fR] \fIfile1 \fR[\fIfile2\fR] [\fI\,options\/\fR] \fI\,file1 \/\fR[\fI\,file2\/\fR]
.SH DESCRIPTION .SH DESCRIPTION
Zcmp compares two files ("\-" means standard input), and if they Zcmp compares two files ("\-" means standard input), and if they
differ, tells the first byte and line number where they differ. Bytes 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 \fB\-b\fR, \fB\-\-print\-bytes\fR
print differing bytes print differing bytes
.TP .TP
\fB\-\-format\fR=\fI[\fR<fmt1>][,<fmt2>] \fB\-\-format\fR=\fI\,[\/\fR<fmt1>][,<fmt2>]
force given formats (bz2, gz, lz, xz) force given formats (bz2, gz, lz, xz)
.TP .TP
\fB\-i\fR, \fB\-\-ignore\-initial=\fR<n>[,<n2>] \fB\-i\fR, \fB\-\-ignore\-initial=\fR<n>[,<n2>]

8
doc/zdiff.1
View file

@ -1,10 +1,10 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1.
.TH ZDIFF "1" "July 2014" "zdiff (zutils) 1.3-rc1" "User Commands" .TH ZDIFF "1" "August 2014" "zdiff (zutils) 1.3" "User Commands"
.SH NAME .SH NAME
zdiff \- decompress and compare two files line by line zdiff \- decompress and compare two files line by line
.SH SYNOPSIS .SH SYNOPSIS
.B zdiff .B zdiff
[\fIoptions\fR] \fIfile1 \fR[\fIfile2\fR] [\fI\,options\/\fR] \fI\,file1 \/\fR[\fI\,file2\/\fR]
.SH DESCRIPTION .SH DESCRIPTION
Zdiff compares two files ("\-" means standard input), and if they Zdiff compares two files ("\-" means standard input), and if they
differ, shows the differences line by line. If any given file is 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 \fB\-E\fR, \fB\-\-ignore\-tab\-expansion\fR
ignore changes due to tab expansion ignore changes due to tab expansion
.TP .TP
\fB\-\-format\fR=\fI[\fR<fmt1>][,<fmt2>] \fB\-\-format\fR=\fI\,[\/\fR<fmt1>][,<fmt2>]
force given formats (bz2, gz, lz, xz) force given formats (bz2, gz, lz, xz)
.TP .TP
\fB\-i\fR, \fB\-\-ignore\-case\fR \fB\-i\fR, \fB\-\-ignore\-case\fR

6
doc/zgrep.1
View file

@ -1,10 +1,10 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1.
.TH ZGREP "1" "July 2014" "zgrep (zutils) 1.3-rc1" "User Commands" .TH ZGREP "1" "August 2014" "zgrep (zutils) 1.3" "User Commands"
.SH NAME .SH NAME
zgrep \- search compressed files for a regular expression zgrep \- search compressed files for a regular expression
.SH SYNOPSIS .SH SYNOPSIS
.B zgrep .B zgrep
[\fIoptions\fR] \fI<pattern> \fR[\fIfiles\fR] [\fI\,options\/\fR] \fI\,<pattern> \/\fR[\fI\,files\/\fR]
.SH DESCRIPTION .SH DESCRIPTION
Zgrep is a front end to the grep program that allows transparent search Zgrep is a front end to the grep program that allows transparent search
on any combination of compressed and uncompressed files. If any given on any combination of compressed and uncompressed files. If any given

6
doc/ztest.1
View file

@ -1,10 +1,10 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1.
.TH ZTEST "1" "July 2014" "ztest (zutils) 1.3-rc1" "User Commands" .TH ZTEST "1" "August 2014" "ztest (zutils) 1.3" "User Commands"
.SH NAME .SH NAME
ztest \- verify integrity of compressed files ztest \- verify integrity of compressed files
.SH SYNOPSIS .SH SYNOPSIS
.B ztest .B ztest
[\fIoptions\fR] [\fIfiles\fR] [\fI\,options\/\fR] [\fI\,files\/\fR]
.SH DESCRIPTION .SH DESCRIPTION
Ztest verifies the integrity of the specified compressed files. Ztest verifies the integrity of the specified compressed files.
Uncompressed files are ignored. If no files are specified, the integrity Uncompressed files are ignored. If no files are specified, the integrity

6
doc/zupdate.1
View file

@ -1,10 +1,10 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1.
.TH ZUPDATE "1" "July 2014" "zupdate (zutils) 1.3-rc1" "User Commands" .TH ZUPDATE "1" "August 2014" "zupdate (zutils) 1.3" "User Commands"
.SH NAME .SH NAME
zupdate \- recompress bzip2, gzip, xz files to lzip files zupdate \- recompress bzip2, gzip, xz files to lzip files
.SH SYNOPSIS .SH SYNOPSIS
.B zupdate .B zupdate
[\fIoptions\fR] [\fIfiles\fR] [\fI\,options\/\fR] [\fI\,files\/\fR]
.SH DESCRIPTION .SH DESCRIPTION
Zupdate recompresses files from bzip2, gzip, and xz formats to lzip format. Zupdate recompresses files from bzip2, gzip, and xz formats to lzip format.
The originals are compared with the new files and then deleted. The originals are compared with the new files and then deleted.

26
doc/zutils.info
View file

@ -12,7 +12,7 @@ File: zutils.info, Node: Top, Next: Introduction, Up: (dir)
Zutils Manual 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: * Menu:
@ -29,7 +29,7 @@ This manual is for Zutils (version 1.3-rc1, 27 July 2014).
* Concept index:: Index of concepts * 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 This manual is free documentation: you have unlimited permission to
copy, distribute and modify it. copy, distribute and modify it.
@ -708,17 +708,17 @@ Concept index
 
Tag Table: Tag Table:
Node: Top222 Node: Top222
Node: Introduction1155 Node: Introduction1128
Node: Common options3502 Node: Common options3475
Node: The zutilsrc file4751 Node: The zutilsrc file4724
Node: Zcat5677 Node: Zcat5650
Node: Zcmp7599 Node: Zcmp7572
Node: Zdiff9923 Node: Zdiff9896
Node: Zgrep12426 Node: Zgrep12399
Node: Ztest15394 Node: Ztest15367
Node: Zupdate16618 Node: Zupdate16591
Node: Problems19006 Node: Problems18979
Node: Concept index19540 Node: Concept index19513
 
End Tag Table End Tag Table

7
doc/zutils.texi
View file

@ -6,8 +6,8 @@
@finalout @finalout
@c %**end of header @c %**end of header
@set UPDATED 27 July 2014 @set UPDATED 30 August 2014
@set VERSION 1.3-rc1 @set VERSION 1.3
@dircategory Data Compression @dircategory Data Compression
@direntry @direntry
@ -49,8 +49,7 @@ This manual is for Zutils (version @value{VERSION}, @value{UPDATED}).
@end menu @end menu
@sp 1 @sp 1
Copyright @copyright{} 2009, 2010, 2011, 2012, 2013, 2014 Copyright @copyright{} 2009-2014 Antonio Diaz Diaz.
Antonio Diaz Diaz.
This manual is free documentation: you have unlimited permission This manual is free documentation: you have unlimited permission
to copy, distribute and modify it. to copy, distribute and modify it.

5
rc.cc
View file

@ -1,5 +1,5 @@
/* Zutils - Utilities dealing with compressed files /* 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 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 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 ) 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() ) compressor_names[format_index].size() &&
compressor_names[format_index][0] != '-' )
return compressor_names[format_index].c_str(); return compressor_names[format_index].c_str();
return 0; return 0;
} }

2
rc.h
View file

@ -1,5 +1,5 @@
/* Zutils - Utilities dealing with compressed files /* 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 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 it under the terms of the GNU General Public License as published by

2
recursive.cc
View file

@ -1,5 +1,5 @@
/* Zutils - Utilities dealing with compressed files /* 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 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 it under the terms of the GNU General Public License as published by

6
testsuite/check.sh
View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# check script for Zutils - Utilities dealing with compressed files # 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 # This script is free software: you have unlimited permission
# to copy, distribute and modify it. # 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 ; } compressor_needed() { echo "${compressors} are needed to run tests" ; exit 1 ; }
framework_failure() { echo "failure in testing framework" ; exit 1 ; } framework_failure() { echo "failure in testing framework" ; exit 1 ; }
if [ ! -f "${ZCAT}" ] || [ ! -x "${ZCAT}" ] ; then if [ ! -f "${ZUPDATE}" ] || [ ! -x "${ZUPDATE}" ] ; then
echo "${ZCAT}: cannot execute" echo "${ZUPDATE}: cannot execute"
exit 1 exit 1
fi fi

2
zcat.cc
View file

@ -1,5 +1,5 @@
/* Zcat - decompress and concatenate files to standard output /* 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 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 it under the terms of the GNU General Public License as published by

2
zcmp.cc
View file

@ -1,5 +1,5 @@
/* Zcmp - decompress and compare two files byte by byte /* 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 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 it under the terms of the GNU General Public License as published by

2
zcmpdiff.cc
View file

@ -1,5 +1,5 @@
/* Common code for zcmp and zdiff /* 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 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 it under the terms of the GNU General Public License as published by

2
zdiff.cc
View file

@ -1,5 +1,5 @@
/* Zdiff - decompress and compare two files line by line /* 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 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 it under the terms of the GNU General Public License as published by

2
zgrep.cc
View file

@ -1,5 +1,5 @@
/* Zgrep - search compressed files for a regular expression /* 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 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 it under the terms of the GNU General Public License as published by

4
ztest.cc
View file

@ -1,5 +1,5 @@
/* Ztest - verify integrity of compressed files /* 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 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 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 ) 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 ); disable_xz = ( std::system( command.c_str() ) != 0 );
} }
if( disable_xz ) return 0; // ignore this file if no xz installed if( disable_xz ) return 0; // ignore this file if no xz installed

2
zupdate.cc
View file

@ -206,7 +206,7 @@ int zupdate_file( const std::string & name, const char * const lzip_name,
{ {
if( disable_xz < 0 ) 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 ); disable_xz = ( std::system( command.c_str() ) != 0 );
} }
if( disable_xz ) return 0; // ignore this file if no xz installed if( disable_xz ) return 0; // ignore this file if no xz installed

2
zutils.cc
View file

@ -1,5 +1,5 @@
/* Zutils - Utilities dealing with compressed files /* 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 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 it under the terms of the GNU General Public License as published by

2
zutils.h
View file

@ -1,5 +1,5 @@
/* Zutils - Utilities dealing with compressed files /* 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 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 it under the terms of the GNU General Public License as published by