mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-28 02:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/swap-workspace

Browse source
This commit is contained in:
Fabian Specht 2024-02-09 23:31:09 +01:00 committed by GitHub
parent c0c5ad0b82 88b2abf5f2
commit 311d1a9822
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sway/config.c
View file

@ -352,13 +352,7 @@ static char *config_path(const char *prefix, const char *config_folder) {
if (!prefix || !prefix[0] || !config_folder || !config_folder[0]) {
return NULL;
}
const char *filename = "config";
size_t size = 3 + strlen(prefix) + strlen(config_folder) + strlen(filename);
char *path = calloc(size, sizeof(char));
snprintf(path, size, "%s/%s/%s", prefix, config_folder, filename);
return path;
return format_str("%s/%s/config", prefix, config_folder);
}
static char *get_config_path(void) {
@ -368,10 +362,7 @@ static char *get_config_path(void) {
const char *config_home = getenv("XDG_CONFIG_HOME");
if ((config_home == NULL || config_home[0] == '\0') && home != NULL) {
size_t size_fallback = 1 + strlen(home) + strlen("/.config");
config_home_fallback = calloc(size_fallback, sizeof(char));
if (config_home_fallback != NULL)
snprintf(config_home_fallback, size_fallback, "%s/.config", home);
config_home_fallback = format_str("%s/.config", home);
config_home = config_home_fallback;
}