Module Name: src
Committed By: christos
Date: Thu Jan 28 19:42:27 UTC 2021
Modified Files:
src/external/bsd/libarchive/dist/tar: write.c
Log Message:
PR/55962: Andreas Gustafsson: Some tar(1) error messages lack file name and
newline
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/libarchive/dist/tar/write.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/tar/write.c
diff -u src/external/bsd/libarchive/dist/tar/write.c:1.1.1.5 src/external/bsd/libarchive/dist/tar/write.c:1.2
--- src/external/bsd/libarchive/dist/tar/write.c:1.1.1.5 Wed Jul 24 09:50:41 2019
+++ src/external/bsd/libarchive/dist/tar/write.c Thu Jan 28 14:42:27 2021
@@ -971,16 +971,15 @@ write_entry(struct bsdtar *bsdtar, struc
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)
