bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libalpm: set errno and log when setting up temp download dir

Browse source 
Before:
	% pacman -Syy
	:: Synchronising package databases...
	error: failed to synchronize all databases (unexpected error)

After:
	% pacman -Syy
	:: Synchronising package databases...
	error: failed to create temporary download directory /var/lib/pacman/sync/download-P77oXs: Permission denied
	error: failed to synchronize all databases (failed to retrieve some files)
This commit is contained in:
morganamilo 2025-05-20 13:20:45 +01:00
parent f6aa79c10a
commit a1ff7d8c72
No known key found for this signature in database
GPG key ID: E48D0A8326DE47C5
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/libalpm/util.c
View file

@ -23,6 +23,7 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <ctype.h> #include <ctype.h>
#include <dirent.h> #include <dirent.h>
@ -959,24 +960,43 @@ char *_alpm_temporary_download_dir_setup(alpm_handle_t *handle, const char *dir)
uid_t myuid = getuid(); uid_t myuid = getuid();
struct passwd const *pw = NULL; struct passwd const *pw = NULL;
ASSERT(dir != NULL, return NULL); ASSERT(dir != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL));
if(myuid == 0 && user != NULL) { if(myuid == 0 && user != NULL) {
ASSERT((pw = getpwnam(user)) != NULL, return NULL); errno = 0;
pw = getpwnam(user);
if(pw == NULL) {
if(errno == 0) {
_alpm_log(handle, ALPM_LOG_ERROR,
_("download user '%s' does not exist\n"), user);
} else {
_alpm_log(handle, ALPM_LOG_ERROR,
_("failed to get download user '%s': %s\n"),
user, strerror(errno));
}
RET_ERR(handle, ALPM_ERR_RETRIEVE, NULL);
}
} }
const char template[] = "download-XXXXXX"; const char template[] = "download-XXXXXX";
size_t newdirlen = strlen(dir) + sizeof(template) + 1; size_t newdirlen = strlen(dir) + sizeof(template) + 1;
char *newdir = NULL; char *newdir = NULL;
MALLOC(newdir, newdirlen, return NULL); MALLOC(newdir, newdirlen, RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
snprintf(newdir, newdirlen - 1, "%s%s", dir, template); snprintf(newdir, newdirlen - 1, "%s%s", dir, template);
if(mkdtemp(newdir) == NULL) { if(mkdtemp(newdir) == NULL) {
_alpm_log(handle, ALPM_LOG_ERROR,
_("failed to create temporary download directory %s: %s\n"),
newdir, strerror(errno));
free(newdir); free(newdir);
return NULL; RET_ERR(handle, ALPM_ERR_RETRIEVE, NULL);
} }
if(pw != NULL) { if(pw != NULL) {
if(chown(newdir, pw->pw_uid, pw->pw_gid) == -1) { if(chown(newdir, pw->pw_uid, pw->pw_gid) == -1) {
_alpm_log(handle, ALPM_LOG_ERROR,
_("failed to chown temporary download directory %s: %s\n"),
newdir, strerror(errno));
free(newdir); free(newdir);
return NULL; RET_ERR(handle, ALPM_ERR_RETRIEVE, NULL);
} }
} }
newdir[newdirlen-2] = '/'; newdir[newdirlen-2] = '/';