From f6aa79c10a1b4295f10d79b23a37f474b6b90cab Mon Sep 17 00:00:00 2001
From: morganamilo <morganamilo@archlinux.org>
Date: Tue, 20 May 2025 12:28:24 +0100
Subject: [PATCH] libalpm: pass handle to alpm_temporary_download_dir_setup

---
 lib/libalpm/be_sync.c | 2 +-
 lib/libalpm/dload.c   | 2 +-
 lib/libalpm/sync.c    | 2 +-
 lib/libalpm/util.c    | 5 +++--
 lib/libalpm/util.h    | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index 240f07be..155c6c54 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -153,7 +153,7 @@ int SYMEXPORT alpm_db_update(alpm_handle_t *handle, alpm_list_t *dbs, int force)
 
 	syncpath = get_sync_dir(handle);
 	ASSERT(syncpath != NULL, return -1);
-	temporary_syncpath = _alpm_temporary_download_dir_setup(syncpath, handle->sandboxuser);
+	temporary_syncpath = _alpm_temporary_download_dir_setup(handle, syncpath);
 	ASSERT(temporary_syncpath != NULL, FREE(syncpath); return -1);
 
 	/* make sure we have a sane umask */
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
index 59ccdcd4..881cc437 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -1304,7 +1304,7 @@ int SYMEXPORT alpm_fetch_pkgurl(alpm_handle_t *handle, const alpm_list_t *urls,
 
 	/* find a valid cache dir to download to */
 	cachedir = _alpm_filecache_setup(handle);
-	temporary_cachedir = _alpm_temporary_download_dir_setup(cachedir, handle->sandboxuser);
+	temporary_cachedir = _alpm_temporary_download_dir_setup(handle, cachedir);
 	ASSERT(temporary_cachedir != NULL, return -1);
 
 	for(i = urls; i; i = i->next) {
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 13cf1cef..1dbd4999 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -780,7 +780,7 @@ static int download_files(alpm_handle_t *handle)
 	alpm_list_t *payloads = NULL;
 
 	cachedir = _alpm_filecache_setup(handle);
-	temporary_cachedir = _alpm_temporary_download_dir_setup(cachedir, handle->sandboxuser);
+	temporary_cachedir = _alpm_temporary_download_dir_setup(handle, cachedir);
 	if(temporary_cachedir == NULL) {
 		ret = -1;
 		goto finish;
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 00cc3734..8577eb42 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -949,12 +949,13 @@ const char *_alpm_filecache_setup(alpm_handle_t *handle)
 /** Create a temporary directory under the supplied directory.
  * The new directory is writable by the download user, and will be
  * removed after the download operation has completed.
+ * @param handle an alpm handle
  * @param dir existing sync or cache directory
- * @param user download user name
  * @return pointer to a sub-directory writable by the download user inside the existing directory.
  */
-char *_alpm_temporary_download_dir_setup(const char *dir, const char *user)
+char *_alpm_temporary_download_dir_setup(alpm_handle_t *handle, const char *dir)
 {
+	const char *user = handle->sandboxuser;
 	uid_t myuid = getuid();
 	struct passwd const *pw = NULL;
 
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h
index 5090c545..f58704fb 100644
--- a/lib/libalpm/util.h
+++ b/lib/libalpm/util.h
@@ -139,7 +139,7 @@ char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename);
 /* Checks whether a file exists in cache */
 int _alpm_filecache_exists(alpm_handle_t *handle, const char *filename);
 const char *_alpm_filecache_setup(alpm_handle_t *handle);
-char *_alpm_temporary_download_dir_setup(const char *dir, const char *user);
+char *_alpm_temporary_download_dir_setup(alpm_handle_t *handle, const char *dir);
 void _alpm_remove_temporary_download_dir(const char *dir);
 
 /* Unlike many uses of alpm_pkgvalidation_t, _alpm_test_checksum expects