From 8884b454543b0fd9bc717a2b093599be420ff298 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 24 Feb 2025 06:02:43 +0100
Subject: [PATCH] Merging upstream version 1.12.

Signed-off-by: Daniel Baumann <daniel@debian.org>
---
 ChangeLog          | 29 ++++++++++-------------------
 INSTALL            |  2 +-
 NEWS               |  2 +-
 README             |  2 +-
 arg_parser.cc      |  2 +-
 arg_parser.h       |  2 +-
 configure          |  6 +++---
 doc/zcat.1         |  4 ++--
 doc/zcmp.1         |  4 ++--
 doc/zdiff.1        |  4 ++--
 doc/zgrep.1        |  4 ++--
 doc/ztest.1        |  4 ++--
 doc/zupdate.1      |  6 +++---
 doc/zutils.info    | 41 +++++++++++++++++++----------------------
 doc/zutils.texi    | 14 ++++++--------
 rc.cc              |  4 ++--
 rc.h               |  2 +-
 recursive.cc       |  2 +-
 testsuite/check.sh |  2 +-
 zcat.cc            |  2 +-
 zcatgrep.cc        |  2 +-
 zcmp.cc            |  2 +-
 zcmpdiff.cc        |  2 +-
 zdiff.cc           |  2 +-
 zgrep.cc           |  2 +-
 ztest.cc           |  2 +-
 zupdate.cc         |  4 ++--
 zutils.cc          |  2 +-
 zutils.h           |  2 +-
 29 files changed, 72 insertions(+), 86 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 90840c5..de510fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-2022-12-05  Antonio Diaz Diaz  <antonio@gnu.org>
+2023-01-07  Antonio Diaz Diaz  <antonio@gnu.org>
 
-	* Version 1.12-rc1 released.
+	* Version 1.12 released.
 	* zutilsrc: Rename to zutils.conf. Search for it in $XDG_CONFIG_HOME.
 	  (Suggested by Adam Tuja).
 	* Allow '-O, --force-format' force also uncompressed format.
@@ -10,29 +10,20 @@
 	  Assign short name '-q' to options '--quiet' and '--silent'.
 	  Separate option '-l, --list' from '-v, --verbose'.
 	  (cmp): Print byte and line in EOF message like GNU cmp.
+	* zgrep.cc: New options '-G, --basic-regexp', '--label=<label>',
+	  '--line-buffered', '-P, --perl-regexp', '--silent',
+	  '-T, --initial-tab', '-U, --binary'. (Reported by Chris Jamboretz).
+	  New option '-Z, --null'. (Reported by Leah Neukirchen).
 	* ztest.cc: Exit with status 2 if a file has wrong extension.
-	* zupdate.cc: New option '-d, --destdir'.
+	* zupdate.cc: New options '-d, --destdir', '-e, --expand-extensions',
+	  '-i, --ignore-errors'. ('-i' suggested by Antoni Sawicki).
 	  (zupdate_file): Pass '-q -s' to zcmp if verbosity < 0.
+	* Support compress'd (.Z) files through gzip in all utilities.
 	* rc.cc (show_version): Print the versions of the compressors used.
 	  (show_option_error): New function showing argument and option name.
 	* zutils.texi: Document that format is detected by its magic bytes.
 	* check.sh: Test tarlz (if available) as compressor for zupdate.
 
-2022-04-12  Antonio Diaz Diaz  <antonio@gnu.org>
-
-	* Version 1.12-pre2 released.
-	* zgrep.cc: Accept option '-Z, --null'. (Reported by Leah Neukirchen).
-	* zupdate.cc: New options '-e, --expand-extensions',
-	  '-i, --ignore-errors'. ('-i' suggested by Antoni Sawicki).
-	* Support compress'd (.Z) files through gzip in all utilities.
-
-2022-03-06  Antonio Diaz Diaz  <antonio@gnu.org>
-
-	* Version 1.12-pre1 released.
-	* zgrep.cc: Accept options '-G, --basic-regexp', '--label=<label>',
-	  '--line-buffered', '-P, --perl-regexp', '--silent',
-	  '-T, --initial-tab', '-U, --binary'. (Reported by Chris Jamboretz).
-
 2022-01-25  Antonio Diaz Diaz  <antonio@gnu.org>
 
 	* Version 1.11 released.
@@ -229,7 +220,7 @@
 	* Version 0.1 released.
 
 
-Copyright (C) 2009-2022 Antonio Diaz Diaz.
+Copyright (C) 2009-2023 Antonio Diaz Diaz.
 
 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
diff --git a/INSTALL b/INSTALL
index 91f1f39..f46086d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -76,7 +76,7 @@ After running 'configure', you can run 'make' and 'make install' as
 explained above.
 
 
-Copyright (C) 2009-2022 Antonio Diaz Diaz.
+Copyright (C) 2009-2023 Antonio Diaz Diaz.
 
 This file is free documentation: you have unlimited permission to copy,
 distribute, and modify it.
diff --git a/NEWS b/NEWS
index b2f8ed9..eeb4662 100644
--- a/NEWS
+++ b/NEWS
@@ -42,7 +42,7 @@ read-only file system to another place without needing to copy or link them
 to the destination directory first.
 
 zupdate now accepts option '-e, --expand-extensions', which makes it expand
-combined file name extensions; tgz -> tar.lz.
+combined file name extensions; tgz --> tar.lz.
 
 zupdate now also accepts option '-i, --ignore-errors', which makes it ignore
 non-fatal errors. (Suggested by Antoni Sawicki).
diff --git a/README b/README
index 430a572..d374574 100644
--- a/README
+++ b/README
@@ -40,7 +40,7 @@ been compressed. Decompressed is used to refer to data which have undergone
 the process of decompression.
 
 
-Copyright (C) 2009-2022 Antonio Diaz Diaz.
+Copyright (C) 2009-2023 Antonio Diaz Diaz.
 
 This file is free documentation: you have unlimited permission to copy,
 distribute, and modify it.
diff --git a/arg_parser.cc b/arg_parser.cc
index 59998ac..5d46a9d 100644
--- a/arg_parser.cc
+++ b/arg_parser.cc
@@ -1,5 +1,5 @@
 /* Arg_parser - POSIX/GNU command line argument parser. (C++ version)
-   Copyright (C) 2006-2022 Antonio Diaz Diaz.
+   Copyright (C) 2006-2023 Antonio Diaz Diaz.
 
    This library is free software. Redistribution and use in source and
    binary forms, with or without modification, are permitted provided
diff --git a/arg_parser.h b/arg_parser.h
index e854838..272e919 100644
--- a/arg_parser.h
+++ b/arg_parser.h
@@ -1,5 +1,5 @@
 /* Arg_parser - POSIX/GNU command line argument parser. (C++ version)
-   Copyright (C) 2006-2022 Antonio Diaz Diaz.
+   Copyright (C) 2006-2023 Antonio Diaz Diaz.
 
    This library is free software. Redistribution and use in source and
    binary forms, with or without modification, are permitted provided
diff --git a/configure b/configure
index 305b61d..2756f5a 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
 #! /bin/sh
 # configure script for Zutils - Utilities dealing with compressed files
-# Copyright (C) 2009-2022 Antonio Diaz Diaz.
+# Copyright (C) 2009-2023 Antonio Diaz Diaz.
 #
 # This configure script is free software: you have unlimited permission
 # to copy, distribute, and modify it.
 
 pkgname=zutils
-pkgversion=1.12-rc1
+pkgversion=1.12
 srctrigger=doc/${pkgname}.texi
 
 # clear some things potentially inherited from environment.
@@ -183,7 +183,7 @@ echo "GREP = ${GREP}"
 rm -f Makefile
 cat > Makefile << EOF
 # Makefile for Zutils - Utilities dealing with compressed files
-# Copyright (C) 2009-2022 Antonio Diaz Diaz.
+# Copyright (C) 2009-2023 Antonio Diaz Diaz.
 # This file was generated automatically by configure. Don't edit.
 #
 # This Makefile is free software: you have unlimited permission
diff --git a/doc/zcat.1 b/doc/zcat.1
index 84cb6f4..8fc6d51 100644
--- a/doc/zcat.1
+++ b/doc/zcat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH ZCAT "1" "December 2022" "zutils 1.12-rc1" "User Commands"
+.TH ZCAT "1" "January 2023" "zutils 1.12" "User Commands"
 .SH NAME
 zcat \- decompress and concatenate files to standard output
 .SH SYNOPSIS
@@ -102,7 +102,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2022 Antonio Diaz Diaz.
+Copyright \(co 2023 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zcmp.1 b/doc/zcmp.1
index 73c1b44..9071c36 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" "December 2022" "zutils 1.12-rc1" "User Commands"
+.TH ZCMP "1" "January 2023" "zutils 1.12" "User Commands"
 .SH NAME
 zcmp \- decompress and compare two files byte by byte
 .SH SYNOPSIS
@@ -94,7 +94,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2022 Antonio Diaz Diaz.
+Copyright \(co 2023 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zdiff.1 b/doc/zdiff.1
index a5ff42b..05a95cd 100644
--- a/doc/zdiff.1
+++ b/doc/zdiff.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH ZDIFF "1" "December 2022" "zutils 1.12-rc1" "User Commands"
+.TH ZDIFF "1" "January 2023" "zutils 1.12" "User Commands"
 .SH NAME
 zdiff \- decompress and compare two files line by line
 .SH SYNOPSIS
@@ -125,7 +125,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2022 Antonio Diaz Diaz.
+Copyright \(co 2023 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zgrep.1 b/doc/zgrep.1
index 79acdf2..19d6909 100644
--- a/doc/zgrep.1
+++ b/doc/zgrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH ZGREP "1" "December 2022" "zutils 1.12-rc1" "User Commands"
+.TH ZGREP "1" "January 2023" "zutils 1.12" "User Commands"
 .SH NAME
 zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
@@ -175,7 +175,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2022 Antonio Diaz Diaz.
+Copyright \(co 2023 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/ztest.1 b/doc/ztest.1
index 5eb3bb4..73f3f8c 100644
--- a/doc/ztest.1
+++ b/doc/ztest.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH ZTEST "1" "December 2022" "zutils 1.12-rc1" "User Commands"
+.TH ZTEST "1" "January 2023" "zutils 1.12" "User Commands"
 .SH NAME
 ztest \- verify the integrity of compressed files
 .SH SYNOPSIS
@@ -83,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 2022 Antonio Diaz Diaz.
+Copyright \(co 2023 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zupdate.1 b/doc/zupdate.1
index 4a8c0b1..5731862 100644
--- a/doc/zupdate.1
+++ b/doc/zupdate.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH ZUPDATE "1" "December 2022" "zutils 1.12-rc1" "User Commands"
+.TH ZUPDATE "1" "January 2023" "zutils 1.12" "User Commands"
 .SH NAME
 zupdate \- recompress bzip2, gzip, xz, zstd files to lzip format
 .SH SYNOPSIS
@@ -47,7 +47,7 @@ output version information and exit
 write recompressed files into <dir>
 .TP
 \fB\-e\fR, \fB\-\-expand\-extensions\fR
-expand combined extensions; tgz \-> tar.lz
+expand combined extensions; tgz \fB\-\-\fR> tar.lz
 .TP
 \fB\-f\fR, \fB\-\-force\fR
 don't skip a file even if the .lz exists
@@ -103,7 +103,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2022 Antonio Diaz Diaz.
+Copyright \(co 2023 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zutils.info b/doc/zutils.info
index ea12cc3..a344507 100644
--- a/doc/zutils.info
+++ b/doc/zutils.info
@@ -11,7 +11,7 @@ File: zutils.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Zutils Manual
 *************
 
-This manual is for Zutils (version 1.12-rc1, 5 December 2022).
+This manual is for Zutils (version 1.12, 7 January 2023).
 
 * Menu:
 
@@ -28,7 +28,7 @@ This manual is for Zutils (version 1.12-rc1, 5 December 2022).
 * Concept index::       Index of concepts
 
 
-   Copyright (C) 2009-2022 Antonio Diaz Diaz.
+   Copyright (C) 2009-2023 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to copy,
 distribute, and modify it.
@@ -825,10 +825,6 @@ the original file is not deleted. The operation of 'zupdate' is meant to be
 safe and not cause any data loss. Therefore, existing lzip compressed files
 are never overwritten nor deleted.
 
-   Recompressing files from a read-only file system to another place can be
-done by first linking the files from the destination directory and then
-compressing the links: 'ln -s /src/foo.gz . && zupdate foo.gz'
-
    Combining the options '--force' and '--keep', as in
 'zupdate -f -k *.gz', verifies that there are no differences between each
 pair of files in a multiformat set of files.
@@ -838,7 +834,7 @@ extensions:
 '.bz2', '.gz', '.xz', '.zst', or '.Z', which are recompressed to '.lz';
 '.tbz', '.tbz2', '.tgz', '.txz', or '.tzst', which are recompressed to
 '.tlz'.
-Keeping the combined extensions ('.tgz' -> '.tlz') may be useful when
+Keeping the combined extensions ('.tgz' --> '.tlz') may be useful when
 recompressing Slackware packages, for example.
 
    Bzip2, gzip, and lzip are the primary formats. Xz and zstd are optional.
@@ -899,7 +895,8 @@ compressor can't be run, or comparison fails).
 '-k'
 '--keep'
      Keep (don't delete) the input file after comparing it with the lzip
-     file.
+     file. Use it when recompressing files from a read-only file system.
+     (See option '--destdir' above).
 
 '-l'
 '--lzip-verbose'
@@ -987,20 +984,20 @@ Concept index
 
 Tag Table:
 Node: Top217
-Node: Introduction1156
-Node: Common options4003
-Ref: version4489
-Ref: compressor-requirements6440
-Node: Configuration6835
-Node: Zcat7868
-Node: Zcmp10568
-Node: Zdiff14825
-Node: Zgrep18008
-Node: Ztest24116
-Node: Zupdate26915
-Ref: lz-compressor32442
-Node: Problems33143
-Node: Concept index33677
+Node: Introduction1151
+Node: Common options3998
+Ref: version4484
+Ref: compressor-requirements6435
+Node: Configuration6830
+Node: Zcat7863
+Node: Zcmp10563
+Node: Zdiff14820
+Node: Zgrep18003
+Node: Ztest24111
+Node: Zupdate26910
+Ref: lz-compressor32325
+Node: Problems33026
+Node: Concept index33560
 
 End Tag Table
 
diff --git a/doc/zutils.texi b/doc/zutils.texi
index 459d38d..a263099 100644
--- a/doc/zutils.texi
+++ b/doc/zutils.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 5 December 2022
-@set VERSION 1.12-rc1
+@set UPDATED 7 January 2023
+@set VERSION 1.12
 
 @dircategory Compression
 @direntry
@@ -50,7 +50,7 @@ This manual is for Zutils (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2009-2022 Antonio Diaz Diaz.
+Copyright @copyright{} 2009-2023 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission to copy,
 distribute, and modify it.
@@ -906,10 +906,6 @@ file is not deleted. The operation of @command{zupdate} is meant to be safe
 and not cause any data loss. Therefore, existing lzip compressed files are
 never overwritten nor deleted.
 
-Recompressing files from a read-only file system to another place can be
-done by first linking the files from the destination directory and then
-compressing the links: @w{@samp{ln -s /src/foo.gz . && zupdate foo.gz}}
-
 Combining the options @option{--force} and @option{--keep}, as in
 @w{@samp{zupdate -f -k *.gz}}, verifies that there are no differences
 between each pair of files in a multiformat set of files.
@@ -919,7 +915,7 @@ The names of the original files must have one of the following extensions:@*
 recompressed to @samp{.lz};@*
 @samp{.tbz}, @samp{.tbz2}, @samp{.tgz}, @samp{.txz}, or @samp{.tzst}, which
 are recompressed to @samp{.tlz}.@*
-Keeping the combined extensions @w{(@samp{.tgz} --> @samp{.tlz})} may be
+Keeping the combined extensions @w{(@samp{.tgz} ---> @samp{.tlz})} may be
 useful when recompressing Slackware packages, for example.
 
 Bzip2, gzip, and lzip are the primary formats. Xz and zstd are optional. If
@@ -984,6 +980,8 @@ Ignore non-fatal errors. (See exit status above).
 @item -k
 @itemx --keep
 Keep (don't delete) the input file after comparing it with the lzip file.
+Use it when recompressing files from a read-only file system. (See option
+@option{--destdir} above).
 
 @item -l
 @itemx --lzip-verbose
diff --git a/rc.cc b/rc.cc
index 4f9e5ee..5a5c5b4 100644
--- a/rc.cc
+++ b/rc.cc
@@ -1,5 +1,5 @@
 /* Zutils - Utilities dealing with compressed files
-   Copyright (C) 2009-2022 Antonio Diaz Diaz.
+   Copyright (C) 2009-2023 Antonio Diaz Diaz.
 
    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
@@ -37,7 +37,7 @@ int verbosity = 0;
 namespace {
 
 const char * const config_file_name = "zutils.conf";
-const char * const     program_year = "2022";
+const char * const     program_year = "2023";
 
 std::string compressor_names[num_formats] =
   { "bzip2", "gzip", "lzip", "xz", "zstd" };	// default compressor names
diff --git a/rc.h b/rc.h
index ab71fc9..8de5eeb 100644
--- a/rc.h
+++ b/rc.h
@@ -1,5 +1,5 @@
 /* Zutils - Utilities dealing with compressed files
-   Copyright (C) 2009-2022 Antonio Diaz Diaz.
+   Copyright (C) 2009-2023 Antonio Diaz Diaz.
 
    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
diff --git a/recursive.cc b/recursive.cc
index a0cdaa4..fd87010 100644
--- a/recursive.cc
+++ b/recursive.cc
@@ -1,5 +1,5 @@
 /* Zutils - Utilities dealing with compressed files
-   Copyright (C) 2009-2022 Antonio Diaz Diaz.
+   Copyright (C) 2009-2023 Antonio Diaz Diaz.
 
    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
diff --git a/testsuite/check.sh b/testsuite/check.sh
index 6d79f20..833eab7 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # check script for Zutils - Utilities dealing with compressed files
-# Copyright (C) 2009-2022 Antonio Diaz Diaz.
+# Copyright (C) 2009-2023 Antonio Diaz Diaz.
 #
 # This script is free software: you have unlimited permission
 # to copy, distribute, and modify it.
diff --git a/zcat.cc b/zcat.cc
index 2a72364..dc5099b 100644
--- a/zcat.cc
+++ b/zcat.cc
@@ -1,5 +1,5 @@
 /* Zcat - decompress and concatenate files to standard output
-   Copyright (C) 2010-2022 Antonio Diaz Diaz.
+   Copyright (C) 2010-2023 Antonio Diaz Diaz.
 
    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
diff --git a/zcatgrep.cc b/zcatgrep.cc
index ecbf359..19e7a8d 100644
--- a/zcatgrep.cc
+++ b/zcatgrep.cc
@@ -1,5 +1,5 @@
 /* Common code for zcat and zgrep
-   Copyright (C) 2010-2022 Antonio Diaz Diaz.
+   Copyright (C) 2010-2023 Antonio Diaz Diaz.
 
    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
diff --git a/zcmp.cc b/zcmp.cc
index e0f7ba5..b118840 100644
--- a/zcmp.cc
+++ b/zcmp.cc
@@ -1,5 +1,5 @@
 /* Zcmp - decompress and compare two files byte by byte
-   Copyright (C) 2010-2022 Antonio Diaz Diaz.
+   Copyright (C) 2010-2023 Antonio Diaz Diaz.
 
    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
diff --git a/zcmpdiff.cc b/zcmpdiff.cc
index 31b3f86..bbbc87e 100644
--- a/zcmpdiff.cc
+++ b/zcmpdiff.cc
@@ -1,5 +1,5 @@
 /* Common code for zcmp and zdiff
-   Copyright (C) 2010-2022 Antonio Diaz Diaz.
+   Copyright (C) 2010-2023 Antonio Diaz Diaz.
 
    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
diff --git a/zdiff.cc b/zdiff.cc
index 6619517..89b598b 100644
--- a/zdiff.cc
+++ b/zdiff.cc
@@ -1,5 +1,5 @@
 /* Zdiff - decompress and compare two files line by line
-   Copyright (C) 2010-2022 Antonio Diaz Diaz.
+   Copyright (C) 2010-2023 Antonio Diaz Diaz.
 
    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
diff --git a/zgrep.cc b/zgrep.cc
index 3df7b58..e2c436b 100644
--- a/zgrep.cc
+++ b/zgrep.cc
@@ -1,5 +1,5 @@
 /* Zgrep - search compressed files for a regular expression
-   Copyright (C) 2010-2022 Antonio Diaz Diaz.
+   Copyright (C) 2010-2023 Antonio Diaz Diaz.
 
    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
diff --git a/ztest.cc b/ztest.cc
index 40d1a79..204fee8 100644
--- a/ztest.cc
+++ b/ztest.cc
@@ -1,5 +1,5 @@
 /* Ztest - verify the integrity of compressed files
-   Copyright (C) 2010-2022 Antonio Diaz Diaz.
+   Copyright (C) 2010-2023 Antonio Diaz Diaz.
 
    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
diff --git a/zupdate.cc b/zupdate.cc
index ca5b9d3..6497a5e 100644
--- a/zupdate.cc
+++ b/zupdate.cc
@@ -1,5 +1,5 @@
 /* Zupdate - recompress bzip2, gzip, xz, zstd files to lzip format
-   Copyright (C) 2013-2022 Antonio Diaz Diaz.
+   Copyright (C) 2013-2023 Antonio Diaz Diaz.
 
    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
@@ -79,7 +79,7 @@ void show_help()
                "  -h, --help                   display this help and exit\n"
                "  -V, --version                output version information and exit\n"
                "  -d, --destdir=<dir>          write recompressed files into <dir>\n"
-               "  -e, --expand-extensions      expand combined extensions; tgz -> tar.lz\n"
+               "  -e, --expand-extensions      expand combined extensions; tgz --> tar.lz\n"
                "  -f, --force                  don't skip a file even if the .lz exists\n"
                "  -i, --ignore-errors          ignore non-fatal errors\n"
                "  -k, --keep                   keep (don't delete) input files\n"
diff --git a/zutils.cc b/zutils.cc
index 01a8406..48e4a56 100644
--- a/zutils.cc
+++ b/zutils.cc
@@ -1,5 +1,5 @@
 /* Zutils - Utilities dealing with compressed files
-   Copyright (C) 2009-2022 Antonio Diaz Diaz.
+   Copyright (C) 2009-2023 Antonio Diaz Diaz.
 
    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
diff --git a/zutils.h b/zutils.h
index 0121ad3..b2e2c45 100644
--- a/zutils.h
+++ b/zutils.h
@@ -1,5 +1,5 @@
 /* Zutils - Utilities dealing with compressed files
-   Copyright (C) 2009-2022 Antonio Diaz Diaz.
+   Copyright (C) 2009-2023 Antonio Diaz Diaz.
 
    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