lib: extend xbps_transaction_file_get to return old and new files

Author: Duncaen

include/xbps_api_impl.h

@@ -107,7 +107,8 @@ int HIDDEN xbps_transaction_init(struct xbps_handle *);
 int HIDDEN xbps_transaction_files(struct xbps_handle *,
 		xbps_object_iterator_t);
 void HIDDEN xbps_transaction_files_free(struct xbps_handle *);
-const struct xbps_file HIDDEN *xbps_transaction_file_get(struct xbps_handle *xhp, const char *path);
+int HIDDEN xbps_transaction_file_get(struct xbps_handle *xhp, const char *path,
+		const struct xbps_file **oldp, const struct xbps_file **newp);
 int HIDDEN xbps_transaction_fetch(struct xbps_handle *,
 		xbps_object_iterator_t);
 int HIDDEN xbps_transaction_pkg_deps(struct xbps_handle *, xbps_array_t, xbps_dictionary_t);

lib/package_unpack.c

@@ -86,7 +86,7 @@ unpack_archive(struct xbps_handle *xhp,
 	       const char *fname,
 	       struct archive *ar)
 {
-	const struct xbps_file *file;
+	const struct xbps_file *old = NULL, *new = NULL;
 	xbps_dictionary_t binpkg_filesd, pkg_filesd, obsd;
 	xbps_array_t array, obsoletes;
 	xbps_trans_type_t ttype;
@@ -292,19 +292,19 @@ unpack_archive(struct xbps_handle *xhp,
 			continue;
 		}
 
-		file = xbps_transaction_file_get(xhp, entry_pname+1);
-		if (!file) {
+		rv = xbps_transaction_file_get(xhp, entry_pname+1, &old, &new);
+		if (rv < 0) {
 			xbps_error_printf("unknown file in binary package: %s: %s\n",
 			    pkgver, entry_pname+1);
-			rv = EINVAL;
+			rv = -rv;
 			goto out;
 		}
 
 		/*
 		 * Check if current entry is a configuration file,
 		 * that should be kept.
 		 */
-		keep_conf_file = (file->flags & XBPS_FILE_CONF) != 0;
+		keep_conf_file = (new->flags & XBPS_FILE_CONF) != 0;
 
 		/*
 		 * If file to be extracted does not match the file type of
@@ -341,13 +341,13 @@ unpack_archive(struct xbps_handle *xhp,
 					}
 					rv = 0;
 				} else {
-					if (!file->sha256) {
+					if (!new->sha256) {
 						xbps_error_printf("missing checksum in binary package"
 						    ": %s: %s\n", pkgver, entry_pname+1);
 						rv = EINVAL;
 						goto out;
 					}
-					rv = xbps_file_sha256_check(entry_pname, file->sha256);
+					rv = xbps_file_sha256_check(entry_pname, new->sha256);
 					if (rv == -1) {
 						/* error */
 						xbps_dbg_printf(

lib/transaction_files.c

@@ -901,13 +901,19 @@ xbps_transaction_files_free(struct xbps_handle *xhp UNUSED)
 	free(items);
 }
 
-const struct xbps_file HIDDEN *
-xbps_transaction_file_get(struct xbps_handle *xhp UNUSED, const char *path)
+int HIDDEN
+xbps_transaction_file_get(struct xbps_handle *xhp UNUSED, const char *path,
+		const struct xbps_file **oldp,
+		const struct xbps_file **newp)
 {
 	struct item *item;
 
 	item = lookupItem(path);
 	if (!item)
-		return NULL;
-	return &item->new.file;
+		return -ENOENT;
+	if (oldp)
+		*oldp = item->old.pkgver ? &item->old.file : NULL;
+	if (newp && item->new.pkgver)
+		*newp = item->new.pkgver ? &item->new.file : NULL;
+	return 0;
 }