From 80d9d5d2b23b8ac219454d6bd8ad82eab16af6fc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 3 Jul 2020 19:56:15 +0200 Subject: Merging upstream version 1.9. Signed-off-by: Daniel Baumann --- doc/zcmp.1 | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'doc/zcmp.1') diff --git a/doc/zcmp.1 b/doc/zcmp.1 index e56b46f..b11d79b 100644 --- a/doc/zcmp.1 +++ b/doc/zcmp.1 @@ -1,31 +1,29 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. -.TH ZCMP "1" "January 2019" "zcmp (zutils) 1.8" "User Commands" +.TH ZCMP "1" "June 2020" "zcmp (zutils) 1.9" "User Commands" .SH NAME zcmp \- decompress and compare two files byte by byte .SH SYNOPSIS .B zcmp [\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 and lines -are numbered starting with 1. If any given file is compressed, its -decompressed content is used. Compressed files are decompressed on the -fly; no temporary files are created. +zcmp compares two files and, if they differ, writes to standard output the +first byte and line number where they differ. Bytes and lines are numbered +starting with 1. A hyphen '\-' used as a file argument means standard input. +If any file given is compressed, its decompressed content is used. Compressed +files are decompressed on the fly; no temporary files are created. .PP -The formats supported are bzip2, gzip, lzip and xz. +The formats supported are bzip2, gzip, lzip, and xz. .PP -Zcmp compares file1 to file2. If file2 is omitted zcmp tries the +zcmp compares file1 to file2. The standard input is used only if file1 or +file2 refers to standard input. If file2 is omitted zcmp tries the following: .IP -1. If file1 is compressed, compares its decompressed contents with +\- If file1 is compressed, compares its decompressed contents with the corresponding uncompressed file (the name of file1 with the extension removed). .IP -2. If file1 is uncompressed, compares it with the decompressed +\- If file1 is uncompressed, compares it with the decompressed contents of file1.[lz|bz2|gz|xz] (the first one that is found). -.IP -3. If no suitable file is found, compares file1 with data read from -standard input. .PP Exit status is 0 if inputs are identical, 1 if different, 2 if trouble. .SH OPTIONS @@ -55,7 +53,7 @@ compare at most bytes don't read runtime configuration file .TP \fB\-O\fR, \fB\-\-force\-format\fR=\fI\,[\/\fR][,] -force given formats (bz2, gz, lz, xz) +force the formats given (bz2, gz, lz, xz) .TP \fB\-q\fR, \fB\-\-quiet\fR suppress all messages @@ -85,7 +83,7 @@ Report bugs to zutils\-bug@nongnu.org .br Zutils home page: http://www.nongnu.org/zutils/zutils.html .SH COPYRIGHT -Copyright \(co 2019 Antonio Diaz Diaz. +Copyright \(co 2020 Antonio Diaz Diaz. License GPLv2+: GNU GPL version 2 or later .br This is free software: you are free to change and redistribute it. -- cgit v1.2.3