lzip/zutils
1
0
Fork 0
Code Issues Activity

Merging upstream version 0.8.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 05:04:07 +01:00
parent 98e6c48a6e
commit b0726a989b
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
32 changed files with 3798 additions and 1551 deletions
Download patch file Download diff file Expand all files Collapse all files

100
doc/zdiff.1
View file

@ -1,27 +1,29 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
.TH ZDIFF "1" "December 2009" "Zdiff (zutils) 0.8-rc1" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
.TH ZDIFF "1" "November 2010" "Zdiff (zutils) 0.8" "User Commands"
.SH NAME
Zdiff \- compare compressed files
Zdiff \- decompress and compare two files line by line
.SH SYNOPSIS
.B zdiff
[\fIOPTIONS\fR] [\fIDIFF_OPTIONS\fR] \fIFILE1 \fR[\fIFILE2\fR]
[\fIoptions\fR] \fIfile1 \fR[\fIfile2\fR]
.SH DESCRIPTION
Zdiff \- Diff/cmp wrapper for compressed files.
Zdiff compares two files ("\-" means standard input), and if they
differ, shows the differences line by line. If any given file is
compressed, its uncompressed content is used. Zdiff is a front end to
the diff program and has the limitation that messages from diff refer to
temporary filenames instead of those specified.
The supported compressors are bzip2, gzip, lzip and xz.
.PP
Zdiff is a wrapper script around the diff and cmp commands that allows
transparent comparison of any combination of compressed and
non\-compressed files. If any given file is compressed, its uncompressed
content is used. The supported compressors are bzip2, gzip, lzip and xz.
Compares <file1> to <file2>. If <file2> is omitted zdiff tries the
following:
If <file1> is compressed, compares <file1> to the file with the
corresponding decompressed file name (removes the extension from
<file1>).
If <file1> is not compressed, compares <file1> to the uncompressed
contents of <file1>.[bz2|gz|lz|xz] (the first one that is found).
If no suitable file is found, compares <file1> to data read from
standard input.
.PP
Zcmp is a shortcut for "zdiff \fB\-\-cmp\fR"
.PP
Compares FILE1 to FILE2. If FILE2 is omitted and FILE1 is compressed,
compares FILE1 to the file with the corresponding decompressed file
name (removes the extension from FILE1). If FILE2 is omitted and FILE1
is not compressed, compares FILE1 to the uncompressed contents of
FILE1.[bz2|gz|lz|xz] (the first one that is found).
DIFF_OPTIONS are passed directly to diff or cmp.
The exit status from diff or cmp is preserved.
Exit status is 0 if inputs are identical, 1 if different, 2 if trouble.
.SH OPTIONS
.TP
\fB\-h\fR, \fB\-\-help\fR
@ -30,15 +32,63 @@ display this help and exit
\fB\-V\fR, \fB\-\-version\fR
output version information and exit
.TP
\fB\-\-diff\fR
use diff to compare files (default)
\fB\-a\fR, \fB\-\-text\fR
treat all files as text
.TP
\fB\-\-cmp\fR
use cmp to compare files
\fB\-b\fR, \fB\-\-ignore\-space\-change\fR
ignore changes in the amount of white space
.TP
\fB\-B\fR, \fB\-\-ignore\-blank\-lines\fR
ignore changes whose lines are all blank
.TP
\fB\-c\fR
use the context output format
.TP
\fB\-C\fR, \fB\-\-context=\fR<n>
same as \fB\-c\fR but use <n> lines of context
.TP
\fB\-d\fR, \fB\-\-minimal\fR
try hard to find a smaller set of changes
.TP
\fB\-E\fR, \fB\-\-ignore\-tab\-expansion\fR
ignore changes due to tab expansion
.TP
\fB\-i\fR, \fB\-\-ignore\-case\fR
ignore case differences in file contents
.TP
\fB\-p\fR, \fB\-\-show\-c\-function\fR
show which C function each change is in
.TP
\fB\-q\fR, \fB\-\-brief\fR
output only whether files differ
.TP
\fB\-s\fR, \fB\-\-report\-identical\-files\fR
report when two files are identical
.TP
\fB\-t\fR, \fB\-\-expand\-tabs\fR
expand tabs to spaces in output
.TP
\fB\-T\fR, \fB\-\-initial\-tab\fR
make tabs line up by prepending a tab
.TP
\fB\-u\fR
use the unified output format
.TP
\fB\-U\fR, \fB\-\-unified=\fR<n>
same as \fB\-u\fR but use <n> lines of context
.TP
\fB\-w\fR, \fB\-\-ignore\-all\-space\fR
ignore all white space
.PP
Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,
Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...
.SH "REPORTING BUGS"
Report bugs to zutils\-bug@nongnu.org
.br
Zutils home page: http://www.nongnu.org/zutils/zutils.html
.SH COPYRIGHT
Copyright \(co 2009 Antonio Diaz Diaz.
This script is free software: you have unlimited permission
to copy, distribute and modify it.
Copyright \(co 2010 Antonio Diaz Diaz.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
.br
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.