From 6fd4f244f5afa76bace5ac1a74d71ba9a47f8a06 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 4 May 2023 16:44:37 +0000 Subject: [PATCH] util: Drop function to fetch user home directory Signed-off-by: Michael Tremer --- src/libpakfire/include/pakfire/util.h | 1 - src/libpakfire/pakfire.c | 6 +----- src/libpakfire/util.c | 8 -------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h index 661fff4d1..af56678e3 100644 --- a/src/libpakfire/include/pakfire/util.h +++ b/src/libpakfire/include/pakfire/util.h @@ -52,7 +52,6 @@ const char* pakfire_dirname(const char* path); char* pakfire_remove_trailing_newline(char* str); const char* pakfire_hostname(void); -const char* pakfire_get_home(struct pakfire* pakfire, uid_t uid); int pakfire_read_file_into_buffer(FILE* f, char** buffer, size_t* len); diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c index bb2831ab2..afe5141c2 100644 --- a/src/libpakfire/pakfire.c +++ b/src/libpakfire/pakfire.c @@ -737,12 +737,8 @@ static int pakfire_set_cache_path(struct pakfire* pakfire) { // Fetch the path from the configuration file const char* path = pakfire_config_get(pakfire->config, "general", "cache_path", NULL); if (!path) { - const char* home = pakfire_get_home(pakfire, pakfire->user.uid); - if (!home) - return 1; - // Append a suffix to the home directory - r = pakfire_string_format(basepath, "%s/.pakfire/cache", home); + r = pakfire_string_format(basepath, "%s/.pakfire/cache", pakfire->user.home); if (r) return 1; diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c index 05795e765..12a8666e3 100644 --- a/src/libpakfire/util.c +++ b/src/libpakfire/util.c @@ -377,14 +377,6 @@ const char* pakfire_hostname() { return __hostname; } -const char* pakfire_get_home(struct pakfire* pakfire, uid_t uid) { - struct passwd* entry = getpwuid(uid); - if (!entry) - return NULL; - - return entry->pw_dir; -} - int pakfire_read_file_into_buffer(FILE* f, char** buffer, size_t* len) { if (!f) return -EBADF; -- 2.39.5