diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2025-10-16 17:36:33 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2025-10-16 17:41:19 +0000 |
| commit | 8f38cbcd9c4a4f27bdccf2e75a7e20026cff5181 (patch) | |
| tree | d6d99051589c097001ba225066098ae579a57bcc /libarchive/archive_read_disk_entry_from_file.c | |
| parent | 76141d3306dea42228646b9a4a5e97ccba59fe2a (diff) | |
Diffstat (limited to 'libarchive/archive_read_disk_entry_from_file.c')
| -rw-r--r-- | libarchive/archive_read_disk_entry_from_file.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c index 19d049770b78..42af4034b07e 100644 --- a/libarchive/archive_read_disk_entry_from_file.c +++ b/libarchive/archive_read_disk_entry_from_file.c @@ -338,7 +338,7 @@ setup_mac_metadata(struct archive_read_disk *a, int ret = ARCHIVE_OK; void *buff = NULL; int have_attrs; - const char *name, *tempdir; + const char *name; struct archive_string tempfile; (void)fd; /* UNUSED */ @@ -357,13 +357,11 @@ setup_mac_metadata(struct archive_read_disk *a, if (have_attrs == 0) return (ARCHIVE_OK); - tempdir = NULL; - if (issetugid() == 0) - tempdir = getenv("TMPDIR"); - if (tempdir == NULL) - tempdir = _PATH_TMP; archive_string_init(&tempfile); - archive_strcpy(&tempfile, tempdir); + if (__archive_get_tempdir(&tempfile) != ARCHIVE_OK) { + ret = ARCHIVE_WARN; + goto cleanup; + } archive_strcat(&tempfile, "tar.md.XXXXXX"); tempfd = mkstemp(tempfile.s); if (tempfd < 0) { |