Page MenuHomeFreeBSD
Files F167515268

D17650.id49457.diff
No OneTemporary
Actions

D17650.id49457.diff
View Options

Index: usr.bin/ar/acpyacc.y
===================================================================
--- usr.bin/ar/acpyacc.y
+++ usr.bin/ar/acpyacc.y
@@ -254,7 +254,8 @@
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)
Index: usr.bin/ar/ar.h
===================================================================
--- usr.bin/ar/ar.h
+++ usr.bin/ar/ar.h
@@ -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)
/*
Index: usr.bin/ar/read.c
===================================================================
--- usr.bin/ar/read.c
+++ usr.bin/ar/read.c
@@ -96,7 +96,8 @@
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 @@
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 @@
}
if (r)
- bsdar_warnc(bsdar, 0, "%s",
+ bsdar_warnc(bsdar, archive_errno(a), "%s",
archive_error_string(a));
}
}
Index: usr.bin/ar/write.c
===================================================================
--- usr.bin/ar/write.c
+++ usr.bin/ar/write.c
@@ -291,12 +291,13 @@
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 @@
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 @@
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;

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 23, 10:09 AM (15 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37132311
Default Alt Text
D17650.id49457.diff (3 KB)

Event Timeline