From owner-svn-src-stable-12@freebsd.org Mon Apr 29 18:25:41 2019
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED7EB1598751;
Mon, 29 Apr 2019 18:25:40 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 3DD9D8FDB9;
Mon, 29 Apr 2019 18:25:40 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 15B3925D8B;
Mon, 29 Apr 2019 18:25:40 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3TIPdHr040243;
Mon, 29 Apr 2019 18:25:39 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3TIPd74040239;
Mon, 29 Apr 2019 18:25:39 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201904291825.x3TIPd74040239@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 29 Apr 2019 18:25:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r346900 - stable/12/usr.bin/ar
X-SVN-Group: stable-12
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/12/usr.bin/ar
X-SVN-Commit-Revision: 346900
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 3DD9D8FDB9
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.95 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.998,0];
NEURAL_HAM_LONG(-1.00)[-1.000,0];
NEURAL_HAM_SHORT(-0.95)[-0.955,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-BeenThere: svn-src-stable-12@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
<svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>,
<mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>,
<mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Apr 2019 18:25:41 -0000
Author: emaste
Date: Mon Apr 29 18:25:39 2019
New Revision: 346900
URL: https://svnweb.freebsd.org/changeset/base/346900
Log:
MFC r339648: ar: report errno on warning/error
Previously ar would report an error like "ar: fatal: Write error"
without including additional errno information. Change warnings and
errors to include archive_errno() so that the user may have some idea
of the reason for the failure.
Sponsored by: The FreeBSD Foundation
Modified:
stable/12/usr.bin/ar/acpyacc.y
stable/12/usr.bin/ar/ar.h
stable/12/usr.bin/ar/read.c
stable/12/usr.bin/ar/write.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/usr.bin/ar/acpyacc.y
==============================================================================
--- stable/12/usr.bin/ar/acpyacc.y Mon Apr 29 18:20:51 2019 (r346899)
+++ stable/12/usr.bin/ar/acpyacc.y Mon Apr 29 18:25:39 2019 (r346900)
@@ -254,7 +254,8 @@ arscp_open(char *fname)
archive_read_support_format_ar(a);
AC(archive_read_open_filename(a, fname, DEF_BLKSZ));
if ((r = archive_read_next_header(a, &entry)))
- bsdar_warnc(bsdar, 0, "%s", archive_error_string(a));
+ bsdar_warnc(bsdar, archive_errno(a), "%s",
+ archive_error_string(a));
AC(archive_read_close(a));
AC(archive_read_free(a));
if (r != ARCHIVE_OK)
Modified: stable/12/usr.bin/ar/ar.h
==============================================================================
--- stable/12/usr.bin/ar/ar.h Mon Apr 29 18:20:51 2019 (r346899)
+++ stable/12/usr.bin/ar/ar.h Mon Apr 29 18:25:39 2019 (r346900)
@@ -52,10 +52,10 @@
/*
* Convenient wrapper for general libarchive error handling.
*/
-#define AC(CALL) do { \
- if ((CALL)) \
- bsdar_errc(bsdar, EX_SOFTWARE, 0, "%s", \
- archive_error_string(a)); \
+#define AC(CALL) do { \
+ if ((CALL)) \
+ bsdar_errc(bsdar, EX_SOFTWARE, archive_errno(a), "%s", \
+ archive_error_string(a)); \
} while (0)
/*
Modified: stable/12/usr.bin/ar/read.c
==============================================================================
--- stable/12/usr.bin/ar/read.c Mon Apr 29 18:20:51 2019 (r346899)
+++ stable/12/usr.bin/ar/read.c Mon Apr 29 18:25:39 2019 (r346900)
@@ -96,7 +96,8 @@ read_archive(struct bsdar *bsdar, char mode)
r = archive_read_next_header(a, &entry);
if (r == ARCHIVE_WARN || r == ARCHIVE_RETRY ||
r == ARCHIVE_FATAL)
- bsdar_warnc(bsdar, 0, "%s", archive_error_string(a));
+ bsdar_warnc(bsdar, archive_errno(a), "%s",
+ archive_error_string(a));
if (r == ARCHIVE_EOF || r == ARCHIVE_FATAL)
break;
if (r == ARCHIVE_RETRY) {
@@ -151,7 +152,7 @@ read_archive(struct bsdar *bsdar, char mode)
if (r == ARCHIVE_WARN || r == ARCHIVE_RETRY ||
r == ARCHIVE_FATAL) {
(void)fprintf(stdout, "\n");
- bsdar_warnc(bsdar, 0, "%s",
+ bsdar_warnc(bsdar, archive_errno(a), "%s",
archive_error_string(a));
}
@@ -205,7 +206,7 @@ read_archive(struct bsdar *bsdar, char mode)
}
if (r)
- bsdar_warnc(bsdar, 0, "%s",
+ bsdar_warnc(bsdar, archive_errno(a), "%s",
archive_error_string(a));
}
}
Modified: stable/12/usr.bin/ar/write.c
==============================================================================
--- stable/12/usr.bin/ar/write.c Mon Apr 29 18:20:51 2019 (r346899)
+++ stable/12/usr.bin/ar/write.c Mon Apr 29 18:25:39 2019 (r346900)
@@ -291,12 +291,13 @@ read_objs(struct bsdar *bsdar, const char *archive, in
for (;;) {
r = archive_read_next_header(a, &entry);
if (r == ARCHIVE_FATAL)
- bsdar_errc(bsdar, EX_DATAERR, 0, "%s",
+ bsdar_errc(bsdar, EX_DATAERR, archive_errno(a), "%s",
archive_error_string(a));
if (r == ARCHIVE_EOF)
break;
if (r == ARCHIVE_WARN || r == ARCHIVE_RETRY)
- bsdar_warnc(bsdar, 0, "%s", archive_error_string(a));
+ bsdar_warnc(bsdar, archive_errno(a), "%s",
+ archive_error_string(a));
if (r == ARCHIVE_RETRY) {
bsdar_warnc(bsdar, 0, "Retrying...");
continue;
@@ -341,7 +342,7 @@ read_objs(struct bsdar *bsdar, const char *archive, in
bsdar_errc(bsdar, EX_SOFTWARE, errno,
"malloc failed");
if (archive_read_data(a, buff, size) != (ssize_t)size) {
- bsdar_warnc(bsdar, 0, "%s",
+ bsdar_warnc(bsdar, archive_errno(a), "%s",
archive_error_string(a));
free(buff);
continue;
@@ -594,7 +595,7 @@ write_data(struct bsdar *bsdar, struct archive *a, con
while (s > 0) {
written = archive_write_data(a, buf, s);
if (written < 0)
- bsdar_errc(bsdar, EX_SOFTWARE, 0, "%s",
+ bsdar_errc(bsdar, EX_SOFTWARE, archive_errno(a), "%s",
archive_error_string(a));
buf = (const char *)buf + written;
s -= written;