[src/trunk]: src/external/bsd/libarchive/dist/tar PR/55962: Andreas Gustafsso...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9c4f0aa74f1c
branches:  trunk
changeset: 950415:9c4f0aa74f1c
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 28 19:42:27 2021 +0000

description:
PR/55962: Andreas Gustafsson: Some tar(1) error messages lack file name and
newline

diffstat:

 external/bsd/libarchive/dist/tar/write.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (23 lines):

diff -r ed3b33f401b6 -r 9c4f0aa74f1c external/bsd/libarchive/dist/tar/write.c
--- a/external/bsd/libarchive/dist/tar/write.c  Thu Jan 28 18:52:43 2021 +0000
+++ b/external/bsd/libarchive/dist/tar/write.c  Thu Jan 28 19:42:27 2021 +0000
@@ -971,16 +971,15 @@
 
        e = archive_write_header(a, entry);
        if (e != ARCHIVE_OK) {
-               if (bsdtar->verbose > 1) {
+               if (bsdtar->verbose > 0) {
                        safe_fprintf(stderr, "a ");
                        list_item_verbose(bsdtar, stderr, entry);
                        lafe_warnc(0, ": %s", archive_error_string(a));
-               } else if (bsdtar->verbose > 0) {
+               } else {
                        lafe_warnc(0, "%s: %s",
                            archive_entry_pathname(entry),
                            archive_error_string(a));
-               } else
-                       fprintf(stderr, ": %s", archive_error_string(a));
+               }
        }
 
        if (e == ARCHIVE_FATAL)