From 156d0e1d08d409225d626e3a0bdade45a57cb696 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Fri, 7 Apr 2023 06:58:36 -0700
Subject: gzip: improve a write-failure diagnostic

* gzip.c (create_outfile): Call write_error, not progerror,
so failure to open for writing gives a better diagnostic:
  gzip: failed to write d/f.gz: Permission denied
rather than this:
  gzip: d/f.gz: Permission denied
* tests/write-error: New file, to test for this.
* tests/Makefile.am (TESTS): Add the file name.
Reported in https://bugs.gnu.org/16876.
---
 gzip.c            |  2 +-
 tests/Makefile.am |  1 +
 tests/write-error | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 tests/write-error

diff --git a/gzip.c b/gzip.c
index 7865a65..6cd8b1b 100644
--- a/gzip.c
+++ b/gzip.c
@@ -1135,7 +1135,7 @@ create_outfile ()
           break;
 
         default:
-          progerror (ofname);
+          write_error ();
           close (ifd);
           return ERROR;
         }
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 80249b1..f6891da 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,6 +34,7 @@ TESTS =					\
   unpack-invalid			\
   unpack-valid				\
   upper-suffix				\
+  write-error				\
   z-suffix				\
   zdiff					\
   zgrep-f				\
diff --git a/tests/write-error b/tests/write-error
new file mode 100644
index 0000000..150c162
--- /dev/null
+++ b/tests/write-error
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Test for improved diagnostics
+
+# Copyright 2023 Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# limit so don't run it by default.
+
+. "${srcdir=.}/init.sh"; path_prepend_ ..
+
+fail=0
+
+mkdir d || framework_failure_
+echo > d/f || framework_failure_
+chmod a-w d || framework_failure_
+
+returns_ 1 gzip d/f > out 2> err || fail=1
+
+Exit $fail
-- 
cgit v1.2.1