lib: add xbps_archive_errno to correctly handle archive_errno returning -1

Author: Duncaen

include/xbps_api_impl.h

@@ -120,6 +120,7 @@ const char HIDDEN *vpkg_user_conf(struct xbps_handle *, const char *);
 struct archive HIDDEN *xbps_archive_read_new(void);
 int HIDDEN xbps_archive_read_open(struct archive *ar, const char *path);
 int HIDDEN xbps_archive_read_open_remote(struct archive *ar, const char *url);
+int HIDDEN xbps_archive_errno(struct archive *ar);
 
 xbps_array_t HIDDEN xbps_get_pkg_fulldeptree(struct xbps_handle *,
 		const char *, bool);

lib/archive.c

@@ -35,6 +35,13 @@
 #include "fetch.h"
 #include "xbps_api_impl.h"
 
+int HIDDEN
+xbps_archive_errno(struct archive *ar)
+{
+	int err = archive_errno(ar);
+	return err == -1 ? EINVAL : err;
+}
+
 char HIDDEN *
 xbps_archive_get_file(struct archive *ar, struct archive_entry *entry)
 {
@@ -58,7 +65,7 @@ xbps_archive_get_file(struct archive *ar, struct archive_entry *entry)
 	for (;;) {
 		ssize_t rd = archive_read_data(ar, buf + used, len - used);
 		if (rd == ARCHIVE_FATAL || rd == ARCHIVE_WARN) {
-			r = -archive_errno(ar);
+			r = -xbps_archive_errno(ar);
 			xbps_error_printf(
 			    "failed to read archive entry: %s: %s\n",
 			    archive_entry_pathname(entry),
@@ -117,7 +124,7 @@ xbps_archive_append_buf(struct archive *ar, const void *buf, const size_t buflen
 
 	entry = archive_entry_new();
 	if (!entry)
-		return -archive_errno(ar);
+		return -xbps_archive_errno(ar);
 
 	archive_entry_set_filetype(entry, AE_IFREG);
 	archive_entry_set_perm(entry, mode);
@@ -128,15 +135,15 @@ xbps_archive_append_buf(struct archive *ar, const void *buf, const size_t buflen
 
 	if (archive_write_header(ar, entry) != ARCHIVE_OK) {
 		archive_entry_free(entry);
-		return -archive_errno(ar);
+		return -xbps_archive_errno(ar);
 	}
 	if (archive_write_data(ar, buf, buflen) != ARCHIVE_OK) {
 		archive_entry_free(entry);
-		return -archive_errno(ar);
+		return -xbps_archive_errno(ar);
 	}
 	if (archive_write_finish_entry(ar) != ARCHIVE_OK) {
 		archive_entry_free(entry);
-		return -archive_errno(ar);
+		return -xbps_archive_errno(ar);
 	}
 	archive_entry_free(entry);
 
@@ -222,7 +229,7 @@ xbps_archive_read_open(struct archive *ar, const char *filename)
 {
 	int r = archive_read_open_filename(ar, filename, 4096);
 	if (r == ARCHIVE_FATAL)
-		return -archive_errno(ar);
+		return -xbps_archive_errno(ar);
 	return 0;
 }
 
@@ -248,8 +255,7 @@ xbps_archive_read_open_remote(struct archive *ar, const char *url)
 	r = archive_read_open(ar, f, fetch_archive_open, fetch_archive_read,
 	    fetch_archive_close);
 	if (r == ARCHIVE_FATAL) {
-		r = -archive_errno(ar);
-		return r;
+		return -xbps_archive_errno(ar);
 	}
 
 	return 0;

lib/package_unpack.c

@@ -418,7 +418,7 @@ unpack_archive(struct xbps_handle *xhp,
 		 * Extract entry from archive.
 		 */
 		if (archive_read_extract(ar, entry, flags) != 0) {
-			error = archive_errno(ar);
+			error = xbps_archive_errno(ar);
 			xbps_set_cb_state(xhp, XBPS_STATE_UNPACK_FAIL,
 			    error, pkgver,
 			    "%s: [unpack] failed to extract file `%s': %s",
@@ -534,7 +534,7 @@ xbps_unpack_binary_pkg(struct xbps_handle *xhp, xbps_dictionary_t pkg_repod)
 		goto out;
 	}
 	if (archive_read_open_fd(ar, pkg_fd, st.st_blksize) == ARCHIVE_FATAL) {
-		rv = archive_errno(ar);
+		rv = xbps_archive_errno(ar);
 		xbps_set_cb_state(xhp, XBPS_STATE_UNPACK_FAIL,
 		    rv, pkgver,
 		    "%s: [unpack] failed to read binary package `%s': %s",

lib/plist_fetch.c

@@ -133,9 +133,9 @@ xbps_archive_fetch_file_into_fd(const char *url, const char *fname, int fd)
 			} else {
 				xbps_error_printf(
 				    "Reading archive entry from: %s: %s\n",
-				    url, strerror(archive_errno(a)));
+				    url, strerror(xbps_archive_errno(a)));
 			}
-			rv = archive_errno(a);
+			rv = xbps_archive_errno(a);
 			break;
 		}
 		bfile = archive_entry_pathname(entry);
@@ -145,7 +145,7 @@ xbps_archive_fetch_file_into_fd(const char *url, const char *fname, int fd)
 		if (strcmp(bfile, fname) == 0) {
 			rv = archive_read_data_into_fd(a, fd);
 			if (rv != ARCHIVE_OK)
-				rv = archive_errno(a);
+				rv = xbps_archive_errno(a);
 			break;
 		}
 		archive_read_data_skip(a);

lib/repo.c

@@ -106,7 +106,7 @@ repo_read_next(struct xbps_repo *repo, struct archive *ar, struct archive_entry
 	if (r == ARCHIVE_FATAL) {
 		xbps_error_printf("failed to read repository: %s: %s\n",
 		    repo->uri, archive_error_string(ar));
-		return -archive_errno(ar);
+		return -xbps_archive_errno(ar);
 	} else if (r == ARCHIVE_WARN) {
 		xbps_warn_printf("reading repository: %s: %s\n",
 		    repo->uri, archive_error_string(ar));
@@ -141,7 +141,7 @@ repo_read_index(struct xbps_repo *repo, struct archive *ar)
 		if (r == ARCHIVE_FATAL) {
 			xbps_error_printf("failed to read repository: %s: archive error: %s\n",
 			    repo->uri, archive_error_string(ar));
-			return -archive_errno(ar);
+			return -xbps_archive_errno(ar);
 		}
 		repo->index = xbps_dictionary_create();
 		return 0;
@@ -193,7 +193,7 @@ repo_read_meta(struct xbps_repo *repo, struct archive *ar)
 		if (r == ARCHIVE_FATAL) {
 			xbps_error_printf("failed to read repository: %s: archive error: %s\n",
 			    repo->uri, archive_error_string(ar));
-			return -archive_errno(ar);
+			return -xbps_archive_errno(ar);
 		}
 		repo->idxmeta = NULL;
 		return 0;

lib/transaction_files.c

@@ -713,7 +713,7 @@ collect_binpkg_files(struct xbps_handle *xhp, xbps_dictionary_t pkg_repod,
 		goto out;
 	}
 	if (archive_read_open_fd(ar, pkg_fd, st.st_blksize) == ARCHIVE_FATAL) {
-		rv = archive_errno(ar);
+		rv = xbps_archive_errno(ar);
 		xbps_set_cb_state(xhp, XBPS_STATE_FILES_FAIL,
 		    rv, pkgver,
 		    "%s: failed to read binary package `%s': %s",

lib/transaction_internalize.c

@@ -123,7 +123,7 @@ internalize_binpkg(struct xbps_handle *xhp, xbps_dictionary_t pkg_repod)
 		goto out;
 	}
 	if (archive_read_open_fd(ar, pkg_fd, st.st_blksize) == ARCHIVE_FATAL) {
-		rv = archive_errno(ar);
+		rv = xbps_archive_errno(ar);
 		xbps_set_cb_state(xhp, XBPS_STATE_FILES_FAIL,
 		    -rv, pkgver,
 		    "%s: failed to read binary package `%s': %s",