Paul Eggert [Sun, 6 Mar 2016 08:17:41 +0000 (00:17 -0800)]
gzip: port zgrep to Solaris 11.2
Problem reported by Assaf Gordon in: http://bugs.gnu.org/22900#11
* zgrep.in: Port to Solaris 11.2 /bin/sh (ksh 93u 2011-02-08),
where $? is 256+SIG when a process was killed with signal SIG, and
where 'exit 257' is equivalent to 'exit 1'. Apparently some other
sh implementations use 256+128+SIG. So, instead of using plain
'exit $?', use the equivalent of 'exit ((128 * (128 <= $?)) + $? %
128)' within the script, and use the equivalent of 'kill -$($? %
128)' at the top level if the exit status is 128 or more.
Paul Eggert [Sun, 6 Mar 2016 01:18:59 +0000 (17:18 -0800)]
gzip: remove --__bindir
* NEWS: Document this.
* gzexe.in, gunzip.in, zcat.in, zcmp.in, zdiff.in, zegrep.in:
* zfgrep.in, zforce.in, zgrep.in, zless.in, zmore.in, znew.in:
Remove support for undocumented --__bindir option. Callers can
set PATH instead; that's less error-prone. This fixes some
'make check' failures on my Solaris 11 box, which occurred
because the test scripts were mistakenly testing the installed
gzip rather than the gzip in the working directory.
* Makefile.am (.in): Don't replace bindir.
(check-local): Set PATH instead of using --__bindir.
* tests/help-version (gunzip_setuphelp, gzexe_setuphelp)
(zcat_setuphelp, zcmp_setuphelp, zdiff_setuphelp)
(zegrep_setuphelp, zfgrep_setuphelp, zforce_setuphelp)
(zgrep_setuphelp, zless_setuphelp, zmore_setuphelp)
(znew_setuphelp): Remove. All uses removed.
(lbracket_setup): Default args to empty.
Jim Meyering [Sat, 5 Mar 2016 01:24:53 +0000 (17:24 -0800)]
tests: fix "make check" failure on AIX 7.1
* tests/Makefile.am (TESTS_ENVIRONMENT): Modernize:
remove unused shell_or_perl_ function, and use an
export_with_values function as grep does, to remove
a lot of duplication.
Reported by Assaf Gordon in http://debbugs.gnu.org/22900
Jim Meyering [Mon, 29 Feb 2016 03:48:38 +0000 (19:48 -0800)]
maint: dist-check.mk: remove .deps dirs before comparing
"make distcheck" with automake-from-trunk would fail like this:
...
Only in /gz/tests/torture/gzip/test/gzip-1.6.42-9d47.old: .deps
Only in /gz/tests/torture/gzip/test/gzip-1.6.42-9d47.old/lib: .deps
Only in /gz/tests/torture/gzip/test/gzip-1.6.42-9d47.old/lib/glthread: .deps
* dist-check.mk (my-distcheck): Remove all .deps directories before
comparing the two hierarchies.
Paul Eggert [Sun, 28 Feb 2016 07:58:54 +0000 (23:58 -0800)]
gzip: new option --synchronous
This follows up on the earlier patch to avoid data loss near the
system crashes. It makes the new behavior optional, with the
default off. See: http://bugs.gnu.org/22768
* NEWS, doc/gzip.texi (Sample, Invoking gzip), gunzip.in (usage):
* gzip.1, zcat.in (usage):
Document this.
* gzip.c (synchronous): New static var.
(SYNCHRONOUS_OPTION): New constant.
(longopts, help, main, treat_file): Add support for --synchronous.
Paul Eggert [Sat, 27 Feb 2016 22:12:46 +0000 (14:12 -0800)]
gzip: fdatasync output dir before unlinking
This follows up on the earlier patch to avoid data loss near
the system crashes. See: http://bugs.gnu.org/22768
* bootstrap.conf (gnulib_modules): Add dirname-lgpl, fdatasync,
openat-safer, unistd-safer, unlinkat.
* gzip.c: Include stddef.h, dirname.h.
Include fcntl--.h instead of fcntl-safer.h.
(RW_USER): Remove; no longer needed.
(dfname, dfd): New static vars.
(dot): New static const.
(atdir_eq, atdir_set): New functions.
(treat_file): Also fdatasync the output directory, if !keep.
(treat_file, create_outfile, open_and_stat):
Use dir fd for unlinkat and openat, if possible.
(open_and_stat): Omit mode argument, since it was always the
same. All callers changed.
* lib/.gitignore, m4/.gitignore: Add new gnulib files.
* tailor.h (PROTO, NO_STDIN_FSTAT, OPEN): Remove. Remove MACOS
section, as this stuff would not work anyway now, and circa 2001
Apple stopped supporting Mac OS 9 and earlier.
* zip.c: Do not include unistd.h and fcntl.h, as this file does
not directly use any symbols defined by those headers.
Jim Meyering [Mon, 2 Nov 2015 05:58:42 +0000 (21:58 -0800)]
maint: avoid three warnings from the very latest gcc-built-from-git
* unzip.c (unzip): Correct two format strings to match the types of the corresponding arguments.
* unlzw.c (unlzw): Cast an "int" to unsigned to match expected type of %x.
Jim Meyering [Mon, 24 Aug 2015 17:08:16 +0000 (10:08 -0700)]
maint: adjust copyright notices in *.in files to be consistent
The copyright year ranges in *.in files were not being updated,
because of a missing ", Inc." suffix. Add that, run
run "make udpate-copyright", and ensure 2010..2015 year
ranges are covered.
* gunzip.in: Update copyright notice and year ranges.
* gzexe.in: Likewise.
* zcat.in: Likewise.
* zdiff.in: Likewise.
* zforce.in: Likewise.
* zgrep.in: Likewise.
* zless.in: Likewise.
* zmore.in: Likewise.
* znew.in: Likewise.
Jim Meyering [Mon, 24 Aug 2015 16:10:51 +0000 (09:10 -0700)]
build: avoid -Wshift-negative-value warning
Configured with --enable-gcc-warnings, a gcc-6.x build would fail with this:
gzip.c:118:32: error: left shift of negative value
#define OFF_T_MIN (~ (off_t) 0 << (sizeof (off_t) * CHAR_BIT - 1))
* gzip.c [OFF_T_MAX]: Define in terms of TYPE_MAXIMUM, not OFF_T_MIN.
[OFF_T_MIN]: Remove now-unused definition.
Include "intprops.h" for definiton of TYPE_MAXIMUM.
* bootstrap.conf (gnulib_modules): Add intprops.
Jim Meyering [Wed, 29 Jul 2015 05:31:30 +0000 (22:31 -0700)]
maint: remove dead code
This package has not been compilable with -DCRYPT
since commit v1.4-82-g9d1b943. Remove final vestiges.
* bits.c (copy_block) [CRYPT]: Remove #ifdef'd code.
* inflate.c (NEXTBYTE) [CRYPT]: Likewise.
Prompted by a report from Flávio Medeiros
that HEADER and T might be used uninitialized.
Paul Eggert [Mon, 16 Mar 2015 21:25:17 +0000 (14:25 -0700)]
gzip: make the GZIP env var obsolescent
* NEWS, gzip.1:
* doc/gzip.texi (Environment, Tapes): Document this.
* gzip.c (args): Remove static var; no longer needed now that
'main' frees it. All uses removed.
(ENV_OPTION, shortopts): New constants.
(main): Warn about nontrivial uses of GZIP. Reject dangerous uses.
* tests/gzip-env: New test case.
* tests/Makefile.am (TESTS): Add it.
* util.c (add_envopt): Create new vector instead of adding to old
one. Only use changed.
Jim Meyering [Mon, 10 Jun 2013 01:35:47 +0000 (18:35 -0700)]
maint: ensure that --version's copyright date is current
* cfg.mk (sc_gzip_copyright_check): Ensure we keep this copyright
year number up to date. Reported by Paul Eggert.
* gzip.c (license_msg): Include only the current year number,
as is done in nearly every other program.
Paul Eggert [Mon, 10 Nov 2014 19:02:38 +0000 (11:02 -0800)]
gzip: adjust -v output when -k is also specified
Problem reported by Eric Benoit in: http://bugs.gnu.org/16401
* gzip.c (treat_file): When keeping a file, don't say it's replaced.
* NEWS: Document this.
* tests/keep: Test this.
Jim Meyering [Tue, 19 Aug 2014 15:59:38 +0000 (08:59 -0700)]
maint: enable more syntax checks
* cfg.mk (local-checks-to-skip): Remove several rule names from this
list, thus enabling the corresponding checks. To fix some, I made
syntactic changes to source files. In other cases, I exempted certain
files from the checks.
Add exemptions for these:
sc_prohibit_atoi_atof = ^(gzip|sample/sub)\.c$$
sc_space_tab = ^lib/match\.c$$
sc_useless_cpp_parens = ^(lib/match\.c|tailor\.h)$$
* configure.ac: Add quotes to fix under-quoting.
* deflate.c: Remove unnecessary cpp parentheses.
* tests/Makefile.am (TEST_ENVIRONMENT): Remove space-before-TAB.
* unlzw.c: Change some TABs to spaces.
Paul Eggert [Sun, 10 Aug 2014 23:29:06 +0000 (16:29 -0700)]
gzip: fix --suffix=z bug (Bug#18239)
* gzip.c (get_suffix): Put --suffix string at the end
of the list of suffixes if it is a suffix of one one them.
* tests/z-suffix: New file.
* tests/Makefile.am (TESTS): Add it.
Paul Eggert [Fri, 13 Jun 2014 01:43:08 +0000 (18:43 -0700)]
zgrep: exit with status 0 if a file matches and there's no trouble
Reported by Pavel Raiskup in: http://bugs.gnu.org/17760
* zgrep.in (res): Treat exit status 0 to be greater than 1.
Also, exit immediately on software configuration error.
Jim Meyering [Sun, 4 May 2014 02:04:12 +0000 (19:04 -0700)]
maint: update gnulib to latest and adapt streamsavedir usage
* gnulib: Update module to latest.
* gzip.c (treat_dir): Gnulib's streamsavedir API has changed:
call it with a new argument, SAVEDIR_SORT_NONE, to retain the
preceding behavior.
Paul Eggert [Fri, 7 Mar 2014 01:31:25 +0000 (17:31 -0800)]
zless: improve gzip failure checking, and port to new -V format
Problem reported by Jaroslaw Weglinski, and LESSOPEN change
suggested by Mark Nudelman, in: http://bugs.gnu.org/16951
This doesn't fix bug 16951 entirely, as 'less' needs to be changed
too, but it's a start.
* zless.in (check_exit_status): New var.
(LESSOPEN): Use it.
(use_input_pipe_on_stdin): Adjust to output format on Fedora 20,
where 'less -V' outputs "less 458 (POSIX regular expressions)"
on the first line.
Paul Eggert [Thu, 24 Oct 2013 07:19:56 +0000 (00:19 -0700)]
gzip: fix permissions issue on Solaris-like systems
I.e., on systems that let users give files away.
* gzip.c (do_chown): New function.
(copy_stat): Use it, to change the group, then the permissions,
then the owner. Idea suggested by Vladimir Marek in
<http://bugs.gnu.org/15672#11>
Paul Eggert [Fri, 4 Oct 2013 04:12:09 +0000 (21:12 -0700)]
znew: avoid denial-of-service issue
Reported by Rich Burridge in <http://bugs.gnu.org/15522>.
* znew.in: Rewrite to avoid the need for a temporary file in /tmp.
That way, we avoid the need for set -C
and worrying about denial of service.
Use touch -r and chmod --reference rather than cpmod.
Assume cp -p works, as it's now universal.
Quote 'echo' args better, while we're at it.
(warn, tmp, cpmod, cpmodarg): Remove.
(GZIP): Unset, so that we needn't test for gzip extension.
(ext): Now always '.gz'.
* znew.1: Document the change of implementation assumptions.
Paul Eggert [Wed, 19 Jun 2013 15:46:29 +0000 (08:46 -0700)]
tests: zgrep-signal race condition fix
* tests/zgrep-signal: Check that Perl supports dup2.
(exec_with_SIGPIPE_SIGDFL): Remove.
(write_to_dangling_pipe): Simplify by moving more of it into Perl.
Fix race condition, where subcommand writes to a pipe before the ":"
command exits. Problem reported by Thorsten Glaser in
<http://lists.gnu.org/archive/html/bug-gzip/2013-06/msg00028.html>.
Paul Eggert [Wed, 12 Jun 2013 18:42:34 +0000 (11:42 -0700)]
zgrep: usage should say which grep options are not supported
* zgrep.in (usage): Document which grep options are not supported.
Problem reported by Liron Paryente in
<http://lists.gnu.org/archive/html/bug-grep/2013-06/msg00005.html>.
Paul Eggert [Wed, 12 Jun 2013 03:34:06 +0000 (20:34 -0700)]
gzip: port util.c to Compaq C V6.5-303
* util.c (crc_32_tab): Move definition to front, since this
compiler doesn't allow declarations of static arrays with
incomplete types. Problem reported by Steven M. Schweda in
<http://lists.gnu.org/archive/html/bug-gzip/2013-06/msg00010.html>.
Paul Eggert [Wed, 12 Jun 2013 03:23:28 +0000 (20:23 -0700)]
tests: zgrep-context assumes grep knows context
* tests/Makefile.am (TESTS_ENVIRONMENT): Pass GREP too.
* tests/zgrep-context: Check that the underlying grep supports
context options. Problem reported by Steven M. Schweda in
<http://lists.gnu.org/archive/html/bug-gzip/2013-06/msg00010.html>.
Paul Eggert [Wed, 12 Jun 2013 00:53:53 +0000 (17:53 -0700)]
maint: port to platforms lacking SIGPIPE
* tailor.h (SIGPIPE): Define to 0 if not defined. This fixes a
porting bug introduced as part of 2012-11-16 syntax-check cleanup.
Problem reported by Bdale Garbee in
<http://lists.gnu.org/archive/html/bug-gzip/2013-06/msg00006.html>.
gzip: add "--keep" option to retain (don't delete) input files
gzip now accepts the --keep (-k) option, for consistency with tools
like xz, lzip and bzip2. With this option, gzip no longer removes
named input files when compressing and decompressing.
* doc/gzip.texi: Document it.
* gzip.1: Likewise.
* gunzip.in: Likewise.
* NEWS: Likewise.
* gzip.c: Add support for "--keep".
Paul Eggert [Mon, 15 Apr 2013 18:03:38 +0000 (11:03 -0700)]
tests: redo patch for non-GNU gzip installed in /usr/local/bin
Problem with previous patch reported by Antonio Diaz Diaz in
<http://lists.gnu.org/archive/html/bug-gzip/2013-04/msg00011.html>.
* tests/help-version (gunzip_setuphelp, gzexe_setuphelp)
(zcat_setuphelp, zcmp_setuphelp, zdiff_setuphelp)
(zegrep_setuphelp, zfgrep_setuphelp, zforce_setuphelp)
(zgrep_setuphelp, zless_setuphelp, zmore_setuphelp)
(znew_setuphelp): New functions, used when testing even --help.
(zdiff_setup, zcat_setup, znew_setup, zgrep_setup, gzexe_setup):
Use gzip_setuphelp to set --__bindir.
Paul Eggert [Wed, 10 Apr 2013 22:26:47 +0000 (15:26 -0700)]
tests: work even if non-GNU gzip is installed in /usr/local/bin
Problem reported by Antonio Diaz Diaz in
<http://lists.gnu.org/archive/html/bug-gzip/2013-04/msg00004.html>.
* tests/help-version (zdiff_setup, zcat_setup, znew_setup, zgrep_setup)
(gzexe_setup): Pass --__bindir so that subsidiary programs are our
own's, not /usr/local/bin's. This requires using 'eval' on the result.
(zcmp_setup, gunzip_setup, zmore_setup, zless_setup, zforce_setup)
(zegrep_setup, zfgrep_setup): Invoke one of the other setup functions,
to make the patterns more obvious and simplify future maintenance.
* zcmp.in, zegrep.in, zfgrep.in: Pass __bindir to subsidiary program.
Paul Eggert [Mon, 25 Feb 2013 19:24:14 +0000 (11:24 -0800)]
gzip: port to DMF file systems
* util.c (read_buffer): When reading a file with O_NONBLOCK, if
the read fails with errno==EAGAIN, clear O_NONBLOCK and try again.
Problem reported by Vitezslav Cizek in
<http://lists.gnu.org/archive/html/bug-gzip/2013-02/msg00030.html>.
Paul Eggert [Tue, 5 Feb 2013 21:37:40 +0000 (13:37 -0800)]
gzip: fix bug where you say "n" and gzip acts as if you said "y"
Problem reported for GCC 4.7 x86-64 -O2 by Allan McRae in
<http://lists.gnu.org/archive/html/bug-gzip/2013-02/msg00000.html>.
* NEWS: Document this. Use consistent format in earlier note.
* gzip.c: Include yesno.h.
* gzip.h (yesno): Remove decl; that's yesno.h's job.
Paul Eggert [Sat, 8 Dec 2012 18:45:18 +0000 (10:45 -0800)]
diagnose unexpected EOF and zero lengths in packed data
Problem reported by Aki Helin.
* NEWS: Mention Aki's reports.
* tests/unpack-invalid: New file,
with test data suggested by Aki.
* tests/Makefile.am (TESTS): Add it.
* unpack.c (read_byte): New function.
(look_bits, read_tree): Use it.
(read_tree): Check against zero bit length Huffman code.
Paul Eggert [Fri, 16 Nov 2012 22:05:34 +0000 (14:05 -0800)]
gzip: diagnose invalid code in packed data
* unpack.c (unpack): When encountering a code out of range, report
it and fail rather than charging ahead with randomish output.
Problem reported by Aki Helin.
Paul Eggert [Fri, 16 Nov 2012 19:44:06 +0000 (11:44 -0800)]
maint: merge build improvements from coreutils
* configure.ac: Invoke gl_ASSERT_NO_GNULIB_POSIXCHECK.
(--enable-gcc-warnings): Change help message.
(gl_GCC_VERSION_IFELSE): New macro.
Do not omit -Wunused-macros for main code.
Adjust other -W options as per coreutils.
* lib/Makefile.am (AM_CFLAGS): Use GNULIB_WARN_CFLAGS, not WARN_CFLAGS.
* unlzw.c (REGISTERS, REG1, REG2, ..., REG16): Remove.
All uses removed. These provoked -Wunused-macros warnings.
This sort of fiddling with registers hasn't been needed for years.
Paul Eggert [Fri, 16 Nov 2012 18:54:23 +0000 (10:54 -0800)]
doc: bring up to date and fix troff typos
* doc/gzip.texi (Overview): Update RFC URLs.
* gzip.1: Likewise. Don't say "SEE ALSO" to programs that almost
nobody has installed anymore.
* gzip.1, zmore.1: Fix some troff typos.
* zdiff.1: Clarify what happens with input files. Don't talk
about temporary file names, as they're rarely used these days.
Paul Eggert [Wed, 24 Oct 2012 22:37:01 +0000 (15:37 -0700)]
tests: exercise the grep -e portability fix
Remove workaround for Solaris, since the bug should be fixed now.
Suggested by Petr Sumbera in
<http://lists.gnu.org/archive/html/bug-gzip/2012-10/msg00005.html>.
* tests/zgrep-context, tests/zgrep-f: All uses removed.
* tests/init.cfg (require_POSIX_grep_): Remove.
Eric Blake [Tue, 23 Oct 2012 09:06:11 +0000 (11:06 +0200)]
build: default to --enable-gcc-warnings in a git tree
Anyone building from cloned sources can be assumed to have a new
enough environment, such that enabling gcc warnings by default will
be useful. Tarballs still default to no warnings, and the default
can still be overridden with --disable-gcc-warnings.
* configure.ac (gl_gcc_warnings): Set default based on environment.
Paul Eggert [Sun, 21 Oct 2012 06:15:26 +0000 (23:15 -0700)]
zgrep: do not assume standard 'grep' has -e
On Solaris 11, /usr/bin/grep -e does not work.
Problem reported by Petr Sumbera in
<http://lists.gnu.org/archive/html/bug-gzip/2012-10/msg00003.html>.
* Makefile.am (.in): Substitute @GREP@.
* configure.ac (AC_PROG_GREP): Invoke.
* zgrep.in (grep): Use @GREP@.
Paul Eggert [Wed, 15 Aug 2012 03:43:16 +0000 (20:43 -0700)]
zgrep: do not assume GNU expr
* zgrep.in: Do not assume '\+' has the GNU behavior in the BRE
given to 'expr', as POSIX does not guarantee that. Come to think
of it, use a shell pattern rather than 'expr', as this is more
efficient.
Paul Eggert [Wed, 20 Jun 2012 00:22:52 +0000 (17:22 -0700)]
zmore: rewrite to fix bugs and assume POSIX
Problem reported for Solaris 9 by Daniel in
<http://lists.gnu.org/archive/html/bug-gzip/2012-06/msg00007.html>.
Rather than figure out what exactly went wrong in Solaris 9
it was easier to rip out all the buggy compatibility and stty cruft.
* zmore.in: Don't use stty or trap; simply pipe the output to 'more'
and let it deal with signals and terminal control.
Use printf, not 'echo', to avoid problems with backslashes.
Don't assume ANS is not 's' in the environment.
Use a 'more'-style header instead of rolling our own style.
Paginate the header, too; the old behavior lost the header.
* NEWS, zmore.1: Document this.
Paul Eggert [Tue, 24 Apr 2012 16:16:17 +0000 (09:16 -0700)]
gzip: port gzip -rf to ZFS
Problem reported privately by Rich Burridge.
* bootstrap.conf: Add savedir.
* gzip.c: Include <savedir.h>.
(_D_EXACT_NAMELEN): Remove.
(treat_dir): Use savedir rather than reading directory entries one
at a time, to avoid revisiting an already-compressed file when using
ZFS and the -rf flags are specified.
* lib/.gitignore, m4/.gitignore: Ignore savedir-related files.
Jim Meyering [Wed, 11 Jan 2012 20:31:50 +0000 (21:31 +0100)]
build: accommodate newer bootstrap from gnulib
* bootstrap.conf (gnulib_tool_option_extras): Add both --symlink
and --makefile-name=gnulib.mk.
* bootstrap: Update from gnulib.
* tests/init.sh: Update from gnulib.
* lib/Makefile.am: Initialize all of the following so that
generated code in gnulib.mk may use += to append to those variables:
AM_CFLAGS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST, MOSTLYCLEANDIRS,
MOSTLYCLEANFILES, SUFFIXES, noinst_LTLIBRARIES.
Paul Eggert [Thu, 22 Dec 2011 00:11:43 +0000 (16:11 -0800)]
zless: decompress stdin too, if less 429 or later
* zless.in: Use LESSOPEN |- feature of less 429 or later.
Problem reported by Jeroen Roovers via Mike Frysinger in
<http://lists.gnu.org/archive/html/bug-gzip/2011-12/msg00006.html>.
Jim Meyering [Tue, 29 Nov 2011 17:33:31 +0000 (18:33 +0100)]
build: accommodate gnulib's new warnings with --enable-gcc-warnings
* configure.ac (WERROR_CFLAGS): Disable two new warnings:
-Wno-format-nonliteral, -Wno-unsuffixed-float-constants.
* gzip.h (bi_reverse): Declare with _GL_ATTRIBUTE_CONST.
(gzip_base_name): Declare with _GL_ATTRIBUTE_PURE.
Jim Meyering [Tue, 29 Nov 2011 17:14:02 +0000 (18:14 +0100)]
tests: use "compare exp out", not "compare out exp"
Likewise, when an empty file is expected, use "compare /dev/null out",
not "compare out /dev/null". I.e., specify the expected/desired contents
via the first file name. Prompted by a suggestion from Bruno Haible
in http://thread.gmane.org/gmane.comp.gnu.grep.bugs/4020/focus=29154