From 5a7a494ba28f0dfaa5792f70585ca4dfe3c3051a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 8 Dec 2022 16:52:49 +0100 Subject: Merging upstream version 1.12~rc1. Signed-off-by: Daniel Baumann --- doc/zcmp.1 | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'doc/zcmp.1') diff --git a/doc/zcmp.1 b/doc/zcmp.1 index 58a0197..73c1b44 100644 --- a/doc/zcmp.1 +++ b/doc/zcmp.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH ZCMP "1" "April 2022" "zutils 1.12-pre2" "User Commands" +.TH ZCMP "1" "December 2022" "zutils 1.12-rc1" "User Commands" .SH NAME zcmp \- decompress and compare two files byte by byte .SH SYNOPSIS @@ -37,6 +37,9 @@ output version information and exit \fB\-b\fR, \fB\-\-print\-bytes\fR print differing bytes .TP +\fB\-H\fR, \fB\-\-hexadecimal\fR +print hexadecimal values instead of octal +.TP \fB\-i\fR, \fB\-\-ignore\-initial=\fR[:] ignore differences in the first bytes .TP @@ -53,16 +56,16 @@ compare at most bytes don't read runtime configuration file .TP \fB\-O\fR, \fB\-\-force\-format\fR=\fI\,[\/\fR][,] -force the formats given (bz2,gz,lz,xz,zst) +force one or both input formats .TP -\fB\-q\fR, \fB\-\-quiet\fR -suppress all messages +\fB\-q\fR, \fB\-\-quiet\fR, \fB\-\-silent\fR +suppress diagnostics written to stderr .TP -\fB\-s\fR, \fB\-\-silent\fR -(same as \fB\-\-quiet\fR) +\fB\-s\fR, \fB\-\-script\fR +suppress messages about file differences .TP \fB\-v\fR, \fB\-\-verbose\fR -verbose mode (same as \fB\-\-list\fR) +verbose mode (opposite of \fB\-\-quiet\fR) .TP \fB\-\-bz2=\fR set compressor and options for bzip2 format @@ -79,8 +82,13 @@ set compressor and options for xz format \fB\-\-zst=\fR set compressor and options for zstd format .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... +Valid formats for options '\-M' and '\-O' are 'bz2', 'gz', 'lz', 'xz', 'zst', +and 'un' for uncompressed. +.PP +Byte counts given as arguments to options may be expressed in decimal, +hexadecimal, or octal (using the same syntax as integer constants in C++), +and 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 -- cgit v1.2.3