external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-27 20:35:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add some additional fallbacks when looking for the configuration file

Browse source
This commit is contained in:
bluemonk 2023-02-06 11:14:28 +01:00
parent d1776714ed
commit bb9dfd3d7e
1 changed files with 45 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
main.c
View file

@ -39,7 +39,8 @@ get_config_path_user_config(void)
{ {
struct passwd *passwd = getpwuid(getuid()); struct passwd *passwd = getpwuid(getuid());
if (passwd == NULL) { if (passwd == NULL) {
LOG_ERRNO("failed to lookup user"); LOG_ERRNO("User entry not found in /etc/passwd. Are you using systemd-homed?");
LOG_ERRNO("Please set $XDG_CONFIG_HOME, $HOME or $USER, or use the -c command line option");
return NULL; return NULL;
} }
@ -56,8 +57,10 @@ static char *
get_config_path_xdg(void) get_config_path_xdg(void)
{ {
const char *xdg_config_home = getenv("XDG_CONFIG_HOME"); const char *xdg_config_home = getenv("XDG_CONFIG_HOME");
if (xdg_config_home == NULL) if (xdg_config_home == NULL) {
LOG_ERRNO("$XDG_CONFIG_HOME environment variable not set, falling back to $HOME");
return NULL; return NULL;
}
int len = snprintf(NULL, 0, "%s/yambar/config.yml", xdg_config_home); int len = snprintf(NULL, 0, "%s/yambar/config.yml", xdg_config_home);
char *path = malloc(len + 1); char *path = malloc(len + 1);
@ -65,6 +68,36 @@ get_config_path_xdg(void)
return path; return path;
} }
static char *
get_config_path_user_home(void)
{
const char *user_home = getenv("HOME");
if (user_home == NULL) {
LOG_ERRNO("$HOME environment variable not set, falling back to /home/$USER");
return NULL;
}
int len = snprintf(NULL, 0, "%s/.config/yambar/config.yml", user_home);
char *path = malloc(len + 1);
snprintf(path, len + 1, "%s/.config/yambar/config.yml", user_home);
return path;
}
static char *
get_config_path_user(void)
{
const char *user = getenv("USER");
if (user == NULL) {
LOG_ERRNO("$USER environment variable not set, falling back to search /etc/passwd");
return NULL;
}
int len = snprintf(NULL, 0, "/home/%s/.config/yambar/config.yml", user);
char *path = malloc(len + 1);
snprintf(path, len + 1, "/home/%s/.config/yambar/config.yml", user);
return path;
}
static char * static char *
get_config_path(void) get_config_path(void)
{ {
@ -75,6 +108,16 @@ get_config_path(void)
return config; return config;
free(config); free(config);
config = get_config_path_user_home();
if (config != NULL && stat(config, &st) == 0 && S_ISREG(st.st_mode))
return config;
free(config);
config = get_config_path_user();
if (config != NULL && stat(config, &st) == 0 && S_ISREG(st.st_mode))
return config;
free(config);
/* 'Default' XDG_CONFIG_HOME */ /* 'Default' XDG_CONFIG_HOME */
config = get_config_path_user_config(); config = get_config_path_user_config();
if (config != NULL && stat(config, &st) == 0 && S_ISREG(st.st_mode)) if (config != NULL && stat(config, &st) == 0 && S_ISREG(st.st_mode))