lzip/zutils
1
0
Fork 0
Code Issues Activity

Merging upstream version 1.3~rc1.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 05:49:21 +01:00
parent 62294b7179
commit 04f94acee5
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
15 changed files with 39 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-07-27 Antonio Diaz Diaz <antonio@gnu.org>
* Version 1.3-rc1 released.
* Added two missing #includes.
2014-07-18 Antonio Diaz Diaz <antonio@gnu.org> 2014-07-18 Antonio Diaz Diaz <antonio@gnu.org>
* Version 1.3-pre2 released. * Version 1.3-pre2 released.

2
NEWS
View file

@ -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 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.

5
README
View file

@ -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 makes them safe to use with zutils. Gzip and xz may return ambiguous
warning values, making them less reliable back ends for zutils. 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 LANGUAGE NOTE: Uncompressed = not compressed = plain data; it may never
have been compressed. Decompressed is used to refer to data which has have been compressed. Decompressed is used to refer to data which has
undergone the process of decompression. undergone the process of decompression.

2
configure vendored
View file

@ -6,7 +6,7 @@
# to copy, distribute and modify it. # to copy, distribute and modify it.
pkgname=zutils pkgname=zutils
pkgversion=1.3-pre2 pkgversion=1.3-rc1
srctrigger=doc/${pkgname}.texi srctrigger=doc/${pkgname}.texi
# clear some things potentially inherited from environment. # clear some things potentially inherited from environment.

2
doc/zcat.1
View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. .\" 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 .SH NAME
zcat \- decompress and concatenate files to standard output zcat \- decompress and concatenate files to standard output
.SH SYNOPSIS .SH SYNOPSIS

2
doc/zcmp.1
View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. .\" 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 .SH NAME
zcmp \- decompress and compare two files byte by byte zcmp \- decompress and compare two files byte by byte
.SH SYNOPSIS .SH SYNOPSIS

2
doc/zdiff.1
View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. .\" 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 .SH NAME
zdiff \- decompress and compare two files line by line zdiff \- decompress and compare two files line by line
.SH SYNOPSIS .SH SYNOPSIS

2
doc/zgrep.1
View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. .\" 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 .SH NAME
zgrep \- search compressed files for a regular expression zgrep \- search compressed files for a regular expression
.SH SYNOPSIS .SH SYNOPSIS

2
doc/ztest.1
View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. .\" 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 .SH NAME
ztest \- verify integrity of compressed files ztest \- verify integrity of compressed files
.SH SYNOPSIS .SH SYNOPSIS

2
doc/zupdate.1
View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. .\" 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 .SH NAME
zupdate \- recompress bzip2, gzip, xz files to lzip files zupdate \- recompress bzip2, gzip, xz files to lzip files
.SH SYNOPSIS .SH SYNOPSIS

24
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-pre2, 17 July 2014). This manual is for Zutils (version 1.3-rc1, 27 July 2014).
* Menu: * Menu:
@ -708,17 +708,17 @@ Concept index
 
Tag Table: Tag Table:
Node: Top222 Node: Top222
Node: Introduction1156 Node: Introduction1155
Node: Common options3503 Node: Common options3502
Node: The zutilsrc file4752 Node: The zutilsrc file4751
Node: Zcat5678 Node: Zcat5677
Node: Zcmp7600 Node: Zcmp7599
Node: Zdiff9924 Node: Zdiff9923
Node: Zgrep12427 Node: Zgrep12426
Node: Ztest15395 Node: Ztest15394
Node: Zupdate16619 Node: Zupdate16618
Node: Problems19007 Node: Problems19006
Node: Concept index19541 Node: Concept index19540
 
End Tag Table End Tag Table

4
doc/zutils.texi
View file

@ -6,8 +6,8 @@
@finalout @finalout
@c %**end of header @c %**end of header
@set UPDATED 17 July 2014 @set UPDATED 27 July 2014
@set VERSION 1.3-pre2 @set VERSION 1.3-rc1
@dircategory Data Compression @dircategory Data Compression
@direntry @direntry

7
rc.cc
View file

@ -122,8 +122,8 @@ bool parse_rc_line( const std::string & line,
return false; } return false; }
const std::string name( line, l, i - l ); const std::string name( line, l, i - l );
int format_index = -1; int format_index = -1;
for( int i = 0; i < num_formats; ++i ) for( int j = 0; j < num_formats; ++j )
if( name == format_names[i] ) { format_index = i; break; } if( name == format_names[j] ) { format_index = j; break; }
if( format_index < 0 ) if( format_index < 0 )
{ if( verbosity >= 0 ) { if( verbosity >= 0 )
std::fprintf( stderr, "%s %d: bad format name '%s'\n", 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 ) 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 compressor_names[format_index].c_str();
return 0; return 0;
} }

1
zupdate.cc
View file

@ -32,6 +32,7 @@
#include <unistd.h> #include <unistd.h>
#include <utime.h> #include <utime.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h>
#if defined(__MSVCRT__) || defined(__OS2__) #if defined(__MSVCRT__) || defined(__OS2__)
#include <io.h> #include <io.h>
#endif #endif

1
zutils.cc
View file

@ -18,6 +18,7 @@
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
#include <cerrno> #include <cerrno>
#include <csignal>
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>