mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-27 01:40:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: use $HOME instead of getpwuid() to retrieve users’s home dir

Browse source 
When searching for foot.ini, use $HOME instead of getpwuid() to
retrieve the user’s home directory.
This commit is contained in:
Daniel Eklöf 2022-05-24 18:18:15 +02:00
parent 7e8b5f9610
commit bc7214cd88
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
config.c
View file

@ -311,15 +311,6 @@ struct config_file {
int fd; /* FD of file, O_RDONLY */
};
static const char *
get_user_home_dir(void)
{
const struct passwd *passwd = getpwuid(getuid());
if (passwd == NULL)
return NULL;
return passwd->pw_dir;
}
static struct config_file
open_config(void)
{
@ -328,7 +319,7 @@ open_config(void)
const char *xdg_config_home = getenv("XDG_CONFIG_HOME");
const char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
const char *home_dir = get_user_home_dir();
const char *home_dir = getenv("HOME");
char *xdg_config_dirs_copy = NULL;
/* First, check XDG_CONFIG_HOME (or .config, if unset) */
@ -756,7 +747,7 @@ parse_section_main(struct context *ctx)
const char *include_path = NULL;
if (value[0] == '~' && value[1] == '/') {
const char *home_dir = get_user_home_dir();
const char *home_dir = getenv("HOME");
if (home_dir == NULL) {
LOG_CONTEXTUAL_ERRNO("failed to expand '~'");